267 files changed, 104644 insertions, 40735 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..9cab73c70
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+*~
+autom4te.cache
+config.guess
+config.h
+config.log
+config.status
+config.sub
+Makefile
+stamp-h1
diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644
index 000000000..e32d52d2b
--- /dev/null
+++ b/ABOUT-NLS
@@ -0,0 +1,996 @@
+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.  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 country 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://www.iro.umontreal.ca/contrib/po/HTML/', in the "National 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 `translation@iro.umontreal.ca' 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 skill are praised more than
+programming skill, 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 2005.
+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 az be bg bs ca cs cy da de el en en_GB
+                        +-------------------------------------------------+
+     GNUnet             |                                                 |
+     a2ps               |             []                [] [] []     []   |
+     aegis              |                                  ()             |
+     ant-phone          |                                  ()             |
+     anubis             |                                  []             |
+     ap-utils           |                                                 |
+     aspell             |                         []    [] []        []   |
+     bash               |                      []          []             |
+     batchelor          |                                  []             |
+     bfd                |                                                 |
+     bibshelf           |                                  []             |
+     binutils           |                               []                |
+     bison              |                               [] []             |
+     bluez-pin          | []                      []       [] []          |
+     clisp              |                                  []    []       |
+     console-tools      |                         []       []             |
+     coreutils          |                []    []       [] []             |
+     cpio               |                                                 |
+     cpplib             |                      []       [] []             |
+     darkstat           |                []             () []             |
+     dialog             |                      [] [] [] [] [] []          |
+     diffutils          |                      [] []    [] [] []          |
+     doodle             |                                  []             |
+     e2fsprogs          |                         []       []             |
+     enscript           |                      []       [] []        []   |
+     error              |                      []       [] []        []   |
+     fetchmail          |                      []       [] () []          |
+     fileutils          |                               [] []             |
+     findutils          |                      []       []    []          |
+     flex               |                      []       [] []             |
+     fslint             |                                  []             |
+     gas                |                                                 |
+     gawk               |                      []       [] []             |
+     gbiff              |                                  []             |
+     gcal               |                      []                         |
+     gcc                |                                  []             |
+     gettext-examples   | []                   []          [] []          |
+     gettext-runtime    |             []       []       [] []             |
+     gettext-tools      |                      []          []             |
+     gimp-print         |                         []    [] []        []   |
+     gip                |                                                 |
+     gliv               |                                  []             |
+     glunarclock        |                                                 |
+     gmult              | []                               []             |
+     gnubiff            |                                  ()             |
+     gnucash            |                         []       () ()     []   |
+     gnucash-glossary   |                               [] ()             |
+     gpe-aerial         |                         []       []             |
+     gpe-beam           |                         []       []             |
+     gpe-calendar       |                         []       []             |
+     gpe-clock          |                         []       []             |
+     gpe-conf           |                         []       []             |
+     gpe-contacts       |                                                 |
+     gpe-edit           |                         []                      |
+     gpe-go             |                         []                      |
+     gpe-login          |                         []       []             |
+     gpe-ownerinfo      |                         []       []             |
+     gpe-sketchbook     |                         []       []             |
+     gpe-su             |                         []       []             |
+     gpe-taskmanager    |                         []       []             |
+     gpe-timesheet      |                         []                      |
+     gpe-today          |                         []       []             |
+     gpe-todo           |                         []       []             |
+     gphoto2            |                         []    [] []        []   |
+     gprof              |                               [] []             |
+     gpsdrive           |                                  ()    ()       |
+     gramadoir          | []                               []             |
+     grep               | []          [] []    []          [] []          |
+     gretl              |                                                 |
+     gsasl              |                                  []             |
+     gss                |                                                 |
+     gst-plugins        | []       []          [] []       []        []   |
+     gstreamer          | []                   [] []       []        []   |
+     gtick              | []                               ()             |
+     gtkspell           |             []                   [] []          |
+     hello              |                      []       [] [] []          |
+     id-utils           |                               [] []             |
+     impost             |                                                 |
+     indent             |                      []          []             |
+     iso_3166           |                                                 |
+     iso_3166_1         |                      [] []    [] [] []          |
+     iso_3166_2         |                                                 |
+     iso_3166_3         |                                  []             |
+     iso_4217           |                                                 |
+     iso_639            |                                                 |
+     jpilot             |                         []                      |
+     jtag               |                                                 |
+     jwhois             |                                                 |
+     kbd                |                         []    [] [] []          |
+     latrine            |                                  ()             |
+     ld                 |                               []                |
+     libc               |                      [] []    [] [] []          |
+     libextractor       |                                                 |
+     libgpewidget       |                         []    [] []             |
+     libgphoto2         |                                  []             |
+     libgphoto2_port    |                                  []             |
+     libgsasl           |                                                 |
+     libiconv           | []                   []       [] [] []          |
+     libidn             |                                                 |
+     lifelines          |                               [] ()             |
+     lilypond           |                                  []             |
+     lingoteach         |                                                 |
+     lynx               |                      [] []    [] []             |
+     m4                 |                         []    [] [] []          |
+     mailutils          |                      []                         |
+     make               |                               [] []             |
+     man-db             |                      [] ()    [] []             |
+     minicom            |                         []       []             |
+     mysecretdiary      |                               [] []             |
+     nano               |                      [] ()       []             |
+     nano_1_0           |                      [] ()    [] []             |
+     opcodes            |                                  []             |
+     parted             |                      [] []    [] []             |
+     psmisc             |                                                 |
+     ptx                |                      []       [] []             |
+     pwdutils           |                                                 |
+     python             |                                                 |
+     radius             |                      []                         |
+     recode             |             []       []       [] [] []          |
+     rpm                |                         []    []                |
+     screem             |                                                 |
+     scrollkeeper       |          [] []       [] [] [] [] []        []   |
+     sed                |                      []          []             |
+     sh-utils           |                               [] []             |
+     shared-mime-info   |                []       []                      |
+     sharutils          |                      [] []    [] [] []          |
+     silky              |                                                 |
+     skencil            |                               [] ()             |
+     sketch             |                               [] ()             |
+     solfege            |                                  []             |
+     soundtracker       |                               [] []             |
+     sp                 |                                  []             |
+     stardict           |                         []                      |
+     tar                |                                                 |
+     texinfo            |                               [] []             |
+     textutils          |                      []       [] []             |
+     tin                |                                  ()        ()   |
+     tp-robot           |                                  []             |
+     tuxpaint           | []                   [] []    [] [] []     []   |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux         |                      [] []    [] []             |
+     vorbis-tools       |             []          []    []           []   |
+     wastesedge         |                                  ()             |
+     wdiff              |                      []       [] []        []   |
+     wget               |                                                 |
+     xchat              |                []    []          [] []     []   |
+     xkeyboard-config   |                                                 |
+     xpad               |                                                 |
+                        +-------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB
+                          10  0  0  2  7  5  0 40 43  2 51 91 19  1  14
+
+                          eo es et eu fa fi fr  ga gl he hi hr hu id is
+                        +-----------------------------------------------+
+     GNUnet             |                                               |
+     a2ps               |       []       [] []                          |
+     aegis              |                                               |
+     ant-phone          |                   []                          |
+     anubis             |                   []                          |
+     ap-utils           |                   []                          |
+     aspell             |                   []  []                      |
+     bash               | [] []             []                 []       |
+     batchelor          |                   []  []                      |
+     bfd                |    []                                         |
+     bibshelf           |    []                 []                      |
+     binutils           |    []             []                          |
+     bison              |    [] []          []  []                []    |
+     bluez-pin          | []             [] []  []             [] []    |
+     clisp              |    []             []                          |
+     console-tools      |                                               |
+     coreutils          |    [] []       [] []  []                      |
+     cpio               |    []             []                          |
+     cpplib             |    []             []                          |
+     darkstat           |    []             ()  []             [] []    |
+     dialog             |    [] [] []    [] []  []             []       |
+     diffutils          | [] []          [] []  [] [] []       [] []    |
+     doodle             |                       []                      |
+     e2fsprogs          |    []             []                          |
+     enscript           |                   []              []          |
+     error              |    []          [] []  []             []       |
+     fetchmail          |    []                                         |
+     fileutils          |    [] []          []  []             []       |
+     findutils          |    [] []          []  []                      |
+     flex               |    []             []  []                      |
+     fslint             |                   []                          |
+     gas                |    []             []                          |
+     gawk               |    []             []  []    []                |
+     gbiff              |                   []                          |
+     gcal               |    []             []                          |
+     gcc                |    []                                         |
+     gettext-examples   |    []             []  []                      |
+     gettext-runtime    |    []          [] []  []                []    |
+     gettext-tools      |    []             []                          |
+     gimp-print         |    []             []                          |
+     gip                |    []    []       []                          |
+     gliv               |                   ()                          |
+     glunarclock        |                []     []             []       |
+     gmult              |          []       []                          |
+     gnubiff            |                   ()                          |
+     gnucash            |    []                                ()       |
+     gnucash-glossary   |    []                                         |
+     gpe-aerial         |    []             []                          |
+     gpe-beam           |    []             []                          |
+     gpe-calendar       |    []             []                 [] []    |
+     gpe-clock          |    []          [] []                          |
+     gpe-conf           |                   []                          |
+     gpe-contacts       |                   []                          |
+     gpe-edit           |                   []                    []    |
+     gpe-go             |    []             []                          |
+     gpe-login          |    []             []                 []       |
+     gpe-ownerinfo      |    []          [] []                 [] []    |
+     gpe-sketchbook     |    []             []                          |
+     gpe-su             |    []          [] []                          |
+     gpe-taskmanager    |    []          [] []                          |
+     gpe-timesheet      |    []             []  []                []    |
+     gpe-today          |    []          [] []  []                      |
+     gpe-todo           |    []             []                    []    |
+     gphoto2            |    []          [] []                 []       |
+     gprof              |    []             []                    []    |
+     gpsdrive           |    ()             ()                 []       |
+     gramadoir          |                   []  []                      |
+     grep               |    [] [] []    [] []  [] [] []    [] [] []    |
+     gretl              |    []             []                          |
+     gsasl              |          []       []  []                      |
+     gss                |                   []                          |
+     gst-plugins        |                   []                 []       |
+     gstreamer          |                                               |
+     gtick              |          []    [] []  []                      |
+     gtkspell           | [] []    []       []  []                      |
+     hello              | [] [] [] [] [] [] []  [] [] []    [] [] []    |
+     id-utils           |                   []                 [] []    |
+     impost             |                   []  []                      |
+     indent             | [] [] [] []    [] []  [] []          [] []    |
+     iso_3166           | []             [] []                          |
+     iso_3166_1         |    []    []    [] []  []             [] []    |
+     iso_3166_2         |                   []                          |
+     iso_3166_3         |                   []                          |
+     iso_4217           |       []       []        []                   |
+     iso_639            | []          [] [] []                          |
+     jpilot             |    []             []                          |
+     jtag               |                   []                          |
+     jwhois             |    []             []                 [] []    |
+     kbd                |    []             []                          |
+     latrine            |                   []  []                      |
+     ld                 |    []             []                          |
+     libc               |    []          [] []     []          []       |
+     libextractor       |                                               |
+     libgpewidget       |    []             []  []             [] []    |
+     libgphoto2         |    []             []                 []       |
+     libgphoto2_port    |                   []                          |
+     libgsasl           |                   []  []                      |
+     libiconv           | [] [] []       [] []  [] []       [] [] []    |
+     libidn             | []                []                          |
+     lifelines          |                   ()                          |
+     lilypond           |                                               |
+     lingoteach         |                   []                    []    |
+     lynx               |       []                             []       |
+     m4                 |                   []  [] []             []    |
+     mailutils          |    []             []                          |
+     make               |    []          [] []  [] [] []    []          |
+     man-db             |    ()                                         |
+     minicom            |    []          [] []                 []       |
+     mysecretdiary      |    []             []                    []    |
+     nano               |    []    []    () []                          |
+     nano_1_0           |    []             []     []             []    |
+     opcodes            |    []          [] []                          |
+     parted             |    []             []     []                   |
+     psmisc             |          []                                   |
+     ptx                | [] [] []       [] []  [] []          [] []    |
+     pwdutils           |                                               |
+     python             |                                               |
+     radius             |    []             []                          |
+     recode             | [] []             []     [] []       [] []    |
+     rpm                |                   []                          |
+     screem             |                                               |
+     scrollkeeper       |    []          []                    []       |
+     sed                | [] [] []          []  []             []       |
+     sh-utils           |    [] []       [] []  []             []       |
+     shared-mime-info   | [] []    []    [] []                 []       |
+     sharutils          |    [] []       [] []     []          []       |
+     silky              |                   []                          |
+     skencil            |    []             []                          |
+     sketch             |    []             []                          |
+     solfege            |                                               |
+     soundtracker       |    []             []                          |
+     sp                 |                   []                          |
+     stardict           |                                      []       |
+     tar                |    [] []          []  []                      |
+     texinfo            | []                []        []                |
+     textutils          |    []             []  [] []          []       |
+     tin                |       []          ()                          |
+     tp-robot           |                   []                 []       |
+     tuxpaint           |    []          [] []  []    []       [] [] [] |
+     unicode-han-tra... |                                               |
+     unicode-transla... |                   []  []                      |
+     util-linux         |    [] []       [] []                 []       |
+     vorbis-tools       |    []             []                          |
+     wastesedge         |                   ()                          |
+     wdiff              |    [] []          []  [] []          [] []    |
+     wget               |       [] []           []          []          |
+     xchat              |    []    []    [] []           []             |
+     xkeyboard-config   |                                               |
+     xpad               |    []                 []             []       |
+                        +-----------------------------------------------+
+                          eo es et eu fa fi fr  ga gl he hi hr hu id is
+                          15 85 21 15  2 35 115 45 16  8  1  6 40 27  1
+
+                          it ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               | ()    ()                   []       []    ()     |
+     aegis              |                                     ()           |
+     ant-phone          |                                     []           |
+     anubis             |                            []    [] []           |
+     ap-utils           |                                                  |
+     aspell             |                         []          []           |
+     bash               |                                     []           |
+     batchelor          |                                     []           |
+     bfd                |                                                  |
+     bibshelf           | []                                               |
+     binutils           |                                                  |
+     bison              | []                         []    [] []           |
+     bluez-pin          |          []                         []           |
+     clisp              |                                     []           |
+     console-tools      |                                                  |
+     coreutils          |    []                               []           |
+     cpio               |                                                  |
+     cpplib             |                                     []           |
+     darkstat           |                            []       []           |
+     dialog             | []                                  []           |
+     diffutils          | [] []                      []       []           |
+     doodle             | []                                               |
+     e2fsprogs          | []                                               |
+     enscript           |                                     []           |
+     error              |                                     []           |
+     fetchmail          |    []                               []           |
+     fileutils          | [] []       []                                   |
+     findutils          | []                                  []           |
+     flex               |       []                            []           |
+     fslint             |                                     []           |
+     gas                |                                                  |
+     gawk               |    []                               []           |
+     gbiff              |                                     []           |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gettext-examples   | [] []                               []           |
+     gettext-runtime    | [] [] []                            []           |
+     gettext-tools      | [] [] []                                         |
+     gimp-print         |    []                               []           |
+     gip                |                                     []           |
+     gliv               |                                     []           |
+     glunarclock        |                            []       []           |
+     gmult              | [] []                                            |
+     gnubiff            | ()                                               |
+     gnucash            | [] ()                            () []           |
+     gnucash-glossary   | []                                  []           |
+     gpe-aerial         |                                     []           |
+     gpe-beam           |                                     []           |
+     gpe-calendar       |                                     []           |
+     gpe-clock          |                                     []           |
+     gpe-conf           |                                     []           |
+     gpe-contacts       |                                                  |
+     gpe-edit           |                                     []           |
+     gpe-go             |                                     []           |
+     gpe-login          |                                     []           |
+     gpe-ownerinfo      |                                     []           |
+     gpe-sketchbook     |                                     []           |
+     gpe-su             |                                     []           |
+     gpe-taskmanager    |          []                         []           |
+     gpe-timesheet      |                                     []           |
+     gpe-today          |                                     []           |
+     gpe-todo           |                                     []           |
+     gphoto2            | [] []                               []           |
+     gprof              |                                                  |
+     gpsdrive           | () ()                               ()    ()     |
+     gramadoir          |                                     ()           |
+     grep               | [] []                            [] []           |
+     gretl              | []                                               |
+     gsasl              |                                     []           |
+     gss                |                                                  |
+     gst-plugins        | []                                  []           |
+     gstreamer          | []                                  []           |
+     gtick              | []                                  []           |
+     gtkspell           | []                      []          []           |
+     hello              | [] [] []          []       []    [] [] [] []     |
+     id-utils           | []                                  []           |
+     impost             |                                                  |
+     indent             | [] []                               []           |
+     iso_3166           |                                     []           |
+     iso_3166_1         |                                     []    []     |
+     iso_3166_2         |                                     []           |
+     iso_3166_3         |                                     []           |
+     iso_4217           |    []                   []          []           |
+     iso_639            |    []                               [] []        |
+     jpilot             |    ()                               ()    ()     |
+     jtag               |                                                  |
+     jwhois             | []                                  []           |
+     kbd                |                                     []           |
+     latrine            | []                                  []           |
+     ld                 |                                                  |
+     libc               |    [] []                         [] []    []     |
+     libextractor       |                                                  |
+     libgpewidget       |                                     []           |
+     libgphoto2         | [] []                                            |
+     libgphoto2_port    | [] []                                            |
+     libgsasl           |                                     []           |
+     libiconv           | []                                  []           |
+     libidn             | []                                               |
+     lifelines          |                                     []           |
+     lilypond           |                                                  |
+     lingoteach         | []                                  []           |
+     lynx               | [] []                               []           |
+     m4                 |    []                               []           |
+     mailutils          |                                                  |
+     make               |    [] []                            []           |
+     man-db             |    ()                                            |
+     minicom            |    []                                            |
+     mysecretdiary      |                                     []           |
+     nano               | []                         []    []              |
+     nano_1_0           | []                         []    []    []        |
+     opcodes            |                                     []           |
+     parted             | [] []                               [] []        |
+     psmisc             | []                               [] []           |
+     ptx                |                                  [] []    []     |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     radius             |                                                  |
+     recode             | []                                  []           |
+     rpm                |    [] []                                         |
+     screem             |    []                                            |
+     scrollkeeper       |                                  [] [] []        |
+     sed                |    []                               []           |
+     sh-utils           | [] []                            []              |
+     shared-mime-info   |       []                         [] [] []        |
+     sharutils          | [] []                               []           |
+     silky              |                                     []           |
+     skencil            |                                                  |
+     sketch             |                                                  |
+     solfege            | []                                  []    []     |
+     soundtracker       | []                                               |
+     sp                 |    ()                                            |
+     stardict           |                      []             []           |
+     tar                | [] []                               []           |
+     texinfo            |    []                            [] []           |
+     textutils          |    [] []                         []              |
+     tin                |                                                  |
+     tp-robot           |                                     []           |
+     tuxpaint           | [] [] []       []          []       [] []        |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         | [] []                               []           |
+     vorbis-tools       |                                     []           |
+     wastesedge         |                                     []           |
+     wdiff              | []                         []    []              |
+     wget               |    []                                            |
+     xchat              | []    []          [] []             []           |
+     xkeyboard-config   |                                     []           |
+     xpad               |                                     []           |
+                        +--------------------------------------------------+
+                          it ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+                          46 35 11  2  1  1  2  2  3 11  0 15 96  7  5  0
+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv
+                        +----------------------------------------------+
+     GNUnet             |                                              |
+     a2ps               |       ()     []      [] []       []    [] [] |
+     aegis              |                      () ()                   |
+     ant-phone          |                      []                      |
+     anubis             |       []             [] []                   |
+     ap-utils           |       ()                                     |
+     aspell             |                      [] []                   |
+     bash               |              []      [] []                   |
+     batchelor          |                      []                      |
+     bfd                |                                              |
+     bibshelf           |                                              |
+     binutils           |                         []                [] |
+     bison              |       []     []      [] []                [] |
+     bluez-pin          |       []     []   [] [] []    []       [] [] |
+     clisp              |                         []                   |
+     console-tools      |                         []                   |
+     coreutils          |       []                []       []       [] |
+     cpio               |       []                                  [] |
+     cpplib             |                                              |
+     darkstat           |       []     []      []       []       [] [] |
+     dialog             |       [] []  []   [] [] [] []                |
+     diffutils          |       []     []      [] []             [] [] |
+     doodle             |                                     []       |
+     e2fsprogs          |       []                                  [] |
+     enscript           |              []      [] []                [] |
+     error              |              []      []       []             |
+     fetchmail          |       []                []    []    []       |
+     fileutils          |       []             [] []       []       [] |
+     findutils          |       [] []          []       []       [] [] |
+     flex               |       []     []      [] []                [] |
+     fslint             |              []      []                []    |
+     gas                |                                              |
+     gawk               |       []     []      []                   [] |
+     gbiff              |                      []                      |
+     gcal               |                                           [] |
+     gcc                |                                              |
+     gettext-examples   |       []             [] []    []       [] [] |
+     gettext-runtime    |       []             [] []    [] []    [] [] |
+     gettext-tools      |       []             [] []    [] []    [] [] |
+     gimp-print         |                               []          [] |
+     gip                |                   []          []       []    |
+     gliv               |              []      []       []             |
+     glunarclock        |              []      [] []    []       [] [] |
+     gmult              |              []   [] []                []    |
+     gnubiff            |                      ()                   [] |
+     gnucash            |       () []             []    []          [] |
+     gnucash-glossary   |          []                   []          [] |
+     gpe-aerial         |          []  []      [] []             [] [] |
+     gpe-beam           |          []  []      [] []             [] [] |
+     gpe-calendar       |          []  []      [] []    []       [] [] |
+     gpe-clock          |          []  []      [] []    []       [] [] |
+     gpe-conf           |          []  []      [] []    []          [] |
+     gpe-contacts       |                      [] []             [] [] |
+     gpe-edit           |          []  []      [] []    []       [] [] |
+     gpe-go             |              []      [] []             [] [] |
+     gpe-login          |          []  []      [] []    []       [] [] |
+     gpe-ownerinfo      |          []  []      [] []    []       [] [] |
+     gpe-sketchbook     |          []  []      [] []    []       [] [] |
+     gpe-su             |          []  []      [] []    []       [] [] |
+     gpe-taskmanager    |          []  []      [] []    []       [] [] |
+     gpe-timesheet      |          []  []      [] []    []       [] [] |
+     gpe-today          |          []  []      [] []    []       [] [] |
+     gpe-todo           |    []    []  []      [] []    []       [] [] |
+     gphoto2            |                      []       []       [] [] |
+     gprof              |              []      []                   [] |
+     gpsdrive           |    []                []                      |
+     gramadoir          |                               []             |
+     grep               |       [] []  []      [] []       []    []    |
+     gretl              |       []                                     |
+     gsasl              |       []             []             [] [] [] |
+     gss                |       []             []                   [] |
+     gst-plugins        | []                                  [] [] [] |
+     gstreamer          |                         []          [] [] [] |
+     gtick              |                      [] []                [] |
+     gtkspell           |              []   [] [] []    []       []    |
+     hello              |       []     []      [] []    []       [] [] |
+     id-utils           |              []      [] []                [] |
+     impost             |                                              |
+     indent             |              []      [] []    []       [] [] |
+     iso_3166           |          []                []       [] [] [] |
+     iso_3166_1         |                               [] [] [] []    |
+     iso_3166_2         |                                              |
+     iso_3166_3         |                      []    []          []    |
+     iso_4217           |                            []          []    |
+     iso_639            |                            []          [] [] |
+     jpilot             |                                              |
+     jtag               |                               []             |
+     jwhois             |       []     []      [] ()                () |
+     kbd                |       []             []                   [] |
+     latrine            |                      []                   [] |
+     ld                 |                                           [] |
+     libc               |       []     []         []    []          [] |
+     libextractor       |                      []                      |
+     libgpewidget       |          []  []      []       []       [] [] |
+     libgphoto2         |                         []                [] |
+     libgphoto2_port    |                         []                   |
+     libgsasl           |       []             []                []    |
+     libiconv           |       []     []   [] [] []    [] [] [] [] [] |
+     libidn             |       []                                  () |
+     lifelines          |       []                                  [] |
+     lilypond           |                                              |
+     lingoteach         |              []                              |
+     lynx               |              []         []                [] |
+     m4                 |       []     []      [] []                [] |
+     mailutils          |       []             [] []                   |
+     make               |       []     []         []                [] |
+     man-db             |                      []                   [] |
+     minicom            |       []     []      [] []                   |
+     mysecretdiary      |              []      [] []                [] |
+     nano               |              []      []                   [] |
+     nano_1_0           |       []             [] []                [] |
+     opcodes            |                      []                   [] |
+     parted             |       [] []  []                           [] |
+     psmisc             |       []             []                      |
+     ptx                |       [] []  []      [] []                [] |
+     pwdutils           |       []                                     |
+     python             |                                              |
+     radius             |       []                []                   |
+     recode             |       []     []      [] []       []       [] |
+     rpm                |       [] []             []                [] |
+     screem             |                                              |
+     scrollkeeper       |       []             [] []    []    [] [] [] |
+     sed                |       [] []  []      [] []    []       [] [] |
+     sh-utils           |                         []       []    []    |
+     shared-mime-info   |          []  []         []          [] [] [] |
+     sharutils          |                         []             [] [] |
+     silky              |                               []             |
+     skencil            |          []  []                           [] |
+     sketch             |          []  []                           [] |
+     solfege            |                                              |
+     soundtracker       |                               []          [] |
+     sp                 |                                              |
+     stardict           |                         []    []             |
+     tar                |       []             [] []                [] |
+     texinfo            |       []             [] []                [] |
+     textutils          |                         []       []       [] |
+     tin                |                                              |
+     tp-robot           |                         []                   |
+     tuxpaint           |       [] []  []      []       []    [] [] [] |
+     unicode-han-tra... |                                              |
+     unicode-transla... |                                              |
+     util-linux         |              []         []                [] |
+     vorbis-tools       |                      [] []                   |
+     wastesedge         |                                              |
+     wdiff              |       []     []      [] []    []          [] |
+     wget               |                                              |
+     xchat              |    []                   []    [] [] [] [] [] |
+     xkeyboard-config   |                                              |
+     xpad               |                                              |
+                        +----------------------------------------------+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv
+                           1  3 47 29  57    6 78 73  5 44 12 12 50 85
+
+                          ta tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+                        +-----------------------------------------------+
+     GNUnet             |                                               |  0
+     a2ps               |             [] []     []                      | 19
+     aegis              |                                               |  0
+     ant-phone          |             []        []                      |  5
+     anubis             |             [] []     []                      | 11
+     ap-utils           |                ()     []                      |  2
+     aspell             |                []     [] []                   | 13
+     bash               |                       []                      | 11
+     batchelor          |             []        []                      |  7
+     bfd                |                                               |  1
+     bibshelf           |                       []                      |  5
+     binutils           |             []                                |  6
+     bison              |             []        []                      | 18
+     bluez-pin          |             [] []     [] []     []            | 25
+     clisp              |                                               |  7
+     console-tools      |             []        []                      |  5
+     coreutils          |             []        []                      | 17
+     cpio               |             [] []     []                      |  7
+     cpplib             |             []        []                      |  8
+     darkstat           |                       []        ()    ()      | 15
+     dialog             |             [] []     []                      | 25
+     diffutils          |             []        []        []    []      | 28
+     doodle             |                       []                      |  5
+     e2fsprogs          |             []                                |  8
+     enscript           |             []                                | 12
+     error              |             []        []              []      | 16
+     fetchmail          |             []                                | 12
+     fileutils          |             []                  []    []      | 18
+     findutils          |             []        []                      | 17
+     flex               |             []        []                      | 15
+     fslint             |                       []                      |  7
+     gas                |             []                                |  3
+     gawk               |             []                                | 14
+     gbiff              |                       []                      |  5
+     gcal               |             []                                |  5
+     gcc                |             []                  []            |  4
+     gettext-examples   |             [] []     []        []    []      | 21
+     gettext-runtime    |             [] []     []        []    []      | 25
+     gettext-tools      |             [] []     []        []    []      | 19
+     gimp-print         |                []                             | 11
+     gip                |                       []                      |  8
+     gliv               |             []        []                      |  7
+     glunarclock        |                       [] []                   | 13
+     gmult              |             []        []        []            | 13
+     gnubiff            |                       []                      |  3
+     gnucash            |             ()                        []      | 10
+     gnucash-glossary   |                       []              []      |  9
+     gpe-aerial         |                       []        []            | 13
+     gpe-beam           |                       []        []            | 13
+     gpe-calendar       |                       [] []     []    []      | 18
+     gpe-clock          |             []        [] []     []            | 17
+     gpe-conf           |                       []        []            | 12
+     gpe-contacts       |                       []        []            |  7
+     gpe-edit           |             []        [] []           []      | 15
+     gpe-go             |             []        []                      | 11
+     gpe-login          |             []        [] []     []    []      | 18
+     gpe-ownerinfo      |             []        []        []    []      | 19
+     gpe-sketchbook     |             []        []                      | 14
+     gpe-su             |             []        []        []            | 16
+     gpe-taskmanager    |             []        []        []            | 17
+     gpe-timesheet      |             []        []        []    []      | 17
+     gpe-today          |             []        [] []     []    []      | 19
+     gpe-todo           |                       [] []           []      | 17
+     gphoto2            |                []               []    []      | 18
+     gprof              |             []        []                      | 10
+     gpsdrive           |                                               |  3
+     gramadoir          |                       []                      |  6
+     grep               |             [] []     []              []      | 32
+     gretl              |                                               |  4
+     gsasl              |                       []        []            | 12
+     gss                |                       []                      |  5
+     gst-plugins        |                []     []              []      | 17
+     gstreamer          |             [] []     []              []      | 15
+     gtick              |                       []                      | 11
+     gtkspell           |                       [] []     []    []      | 21
+     hello              |             [] []     []        []            | 37
+     id-utils           |             []        []                      | 13
+     impost             |                       []                      |  3
+     indent             |             []        []        []    []      | 25
+     iso_3166           |          [] []        []                      | 12
+     iso_3166_1         |             []           []                   | 20
+     iso_3166_2         |                                               |  2
+     iso_3166_3         |                          []     []            |  8
+     iso_4217           |             []        []                      | 10
+     iso_639            |                       [] []                   | 12
+     jpilot             |             [] []               []            |  6
+     jtag               |                                               |  2
+     jwhois             |             []        []              []      | 12
+     kbd                |             []        []                      | 12
+     latrine            |             []        []                      |  8
+     ld                 |             []                                |  5
+     libc               |             []                  []            | 22
+     libextractor       |                                               |  1
+     libgpewidget       |                       [] []                   | 17
+     libgphoto2         |                                 []            |  9
+     libgphoto2_port    |                                               |  5
+     libgsasl           |                       []                      |  7
+     libiconv           |             [] []     [] []     []            | 32
+     libidn             |                       []        []            |  6
+     lifelines          |                                               |  4
+     lilypond           |                                               |  1
+     lingoteach         |                       []                      |  6
+     lynx               |             [] []     []                      | 15
+     m4                 |                       []        []            | 17
+     mailutils          |                []                             |  7
+     make               |             []                  []            | 18
+     man-db             |                                               |  5
+     minicom            |                                               | 11
+     mysecretdiary      |             []        []                      | 12
+     nano               |                       []              []      | 13
+     nano_1_0           |             [] []     []                      | 18
+     opcodes            |             []        []                      |  9
+     parted             |             [] []               []            | 18
+     psmisc             |                       []                      |  7
+     ptx                |             []                  []            | 23
+     pwdutils           |                                               |  1
+     python             |                                               |  0
+     radius             |                []                             |  6
+     recode             |             []        []                      | 22
+     rpm                |             [] []                             | 11
+     screem             |                                               |  1
+     scrollkeeper       |             [] []                     []      | 24
+     sed                |             []        []              []      | 21
+     sh-utils           |             []                                | 15
+     shared-mime-info   |                []               []    []      | 21
+     sharutils          |             []        []              []      | 20
+     silky              |                                               |  3
+     skencil            |                                               |  6
+     sketch             |                                               |  6
+     solfege            |                                               |  4
+     soundtracker       |             []                                |  8
+     sp                 |             []                                |  3
+     stardict           |                []     []        []    []      | 10
+     tar                |             [] []     []              []      | 15
+     texinfo            |             []                  []            | 14
+     textutils          |             []                  []    []      | 17
+     tin                |                                               |  1
+     tp-robot           |                       []        []    []      |  8
+     tuxpaint           |             []        [] []     []            | 34
+     unicode-han-tra... |                                               |  0
+     unicode-transla... |                                               |  2
+     util-linux         |             [] []     []                      | 18
+     vorbis-tools       |                []                             | 10
+     wastesedge         |                                               |  1
+     wdiff              |             []        []                      | 22
+     wget               |             []        []                      |  7
+     xchat              |                []     []        []    []      | 26
+     xkeyboard-config   |                       []                      |  2
+     xpad               |                       []                      |  5
+                        +-----------------------------------------------+
+       73 teams           ta tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+      149 domains          0  0  0  1 77 30  0  92 16  0  42    32    0  1746
+
+   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 2005 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://www.iro.umontreal.ca/contrib/po/HTML/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
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+
diff --git a/MAINTAINER b/AUTHORS
index 618ea3ca8..6f615629d 100644
--- a/MAINTAINER
+++ b/AUTHORS
@@ -1,4 +1,5 @@
-Maintainer: Adrian Bunk <bunk@stusta.de>
+Maintainer: Adrian Bunk <bunk@kernel.org>
 
 Maintainer of getopt: Frodo Looijaard <frodol@dds.nl>
+Maintainer of schedutils: Robert Love <rlove@rlove.org>
 Maintainer of simpleinit: Richard Gooch <rgooch@atnf.csiro.au>
diff --git a/COPYING b/COPYING
new file mode 100644
index 000000000..623b6258a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/INSTALL b/INSTALL
index f42cbe9ea..23e5f25d0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,101 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
 
-WARNING: THE PROGRAMS IN THIS SUITE DO *NOT* SUPPORT SHADOW PASSWORD FILES!
-	 UNLESS YOU USE PAM.
-
-WARNING: THIS COLLECTION CONFLICTS WITH SYSTEM V INITTAB.
-         UNLESS YOU CONFIGURE IT NOT TO.
-
-WARNING: USE GNU TAR -- OTHER TARS WILL FAIL SILENTLY!
-
-WARNING: DO *NOT* INSTALL WITHOUT THINKING.
-
-WARNING: The simpleinit and some other programs in this package are
-	 *NOT* System V compliant.  These utilities are meant to be
-	 used by people who build their own systems.  If you are not
-         a wizard, do *NOT* blindly install these utilities: they could
-         prevent you from logging into your system.  Have a boot floppy
-         ready, especially if you don't know what you are doing.  It's a
-	 great way to learn though ;-)
-
-
-To install from source:
-
-1) Get source distribution (see the .lsm file for locations)
-2) Untar util-linux-2.11X.tar.gz somewhere
-3) cd util-linux-2.11X
-4) Edit MCONFIG
-5) ./configure
-6) Look at defines.h and make_include, and edit if necessary
-7) make
-8) make install
-9) If you want to use simpleinit and agetty, then make softlinks from
-   /sbin/init to simpleinit and from /sbin/getty to agetty, but make sure
-   that your /etc/inittab is set up right (this is *NOT* the System V
-   compatible init!), or you will be hosed.  If you are using the SysV
-   init and/or some other getty, they you can keep using those.
-
-People ask: I want to link statically and install in /foo. How?
-Answer: Try the following:
-	LDFLAGS="-static"
-	DESTDIR=/foo
-	export LDFLAGS DESTDIR
-	./configure
-	make
-	make install
-
-If you have compilation problems: tell util-linux@math.uio.no about it.
-
-Compilation will fail on a minix filesystem with 14-byte filenames
-since for example mount_guess_fstype.h, mount_guess_fstype.c and
-mount_guess_fstype.o will be the same file. (However, 30 bytes suffice.)
-
-A glibc header bug causes
-  /usr/include/bits/string2.h:419: warning: pointer of type `void *'
-    used in arithmetic
-This is harmless.
-
-Users of libc5 may get warnings like
-  /usr/include/linux/byteorder/swab.h:100: warning: no previous prototype for `__fswab16'
-that they'll have to ignore. The Linux kernel includes are not meant to be
-included in user programs, but libc5 does precisely that and is inherently
-broken.
-
-Several old libc have complaints like
-  /usr/include/sys/syslog.h:71: warning: missing braces around initializer
-  /usr/include/sys/syslog.h:87: warning: aggregate has a partly bracketed initializer
-  /usr/include/rpc/xdr.h:103: warning: function declaration isn't a prototype
-  /usr/include/rpc/auth.h:86: warning: function declaration isn't a prototype
-  /usr/include/rpc/svc.h:79: warning: function declaration isn't a prototype
-Also this is a libc/include problem.
-
-Warnings like
-  <sys/mman.h>:11: warning: `MAP_FILE' redefined
-  <asm/mman.h>:30: warning: this is the location of the previous definition
-are caused by the libc/kernel combination.
-
-Warnings like
-  setterm.c:805: warning: passing arg 1 of `tigetstr' discards qualifiers
-    from pointer target type
-  login.c:979: warning: passing arg 1 of `putenv' discards qualifiers
-    from pointer target type
-are caused by bad ncurses or glibc header files.
-
-Warnings like
-  script.c: In function `dooutput':
-  script.c:254: warning: `%c' yields only last 2 digits of year in some locales
-are caused by a broken gcc that warns about things that are not wrong,
-where the warning is not easily avoided.
-
-All such warnings are harmless.
-There should be no compilation errors.
-
-
-If you have runtime problems:
-
-- with non-ASCII characters: perhaps you forgot to set LC_CTYPE or LC_ALL?
-  (For example, in Norway one can say  LC_ALL=no_NO; export LC_ALL  and
-   then various utilities will treat Scandinavian non-ASCII letters as
-   letters.)
-
-otherwise: tell util-linux@math.uio.no about it.
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
 
diff --git a/MCONFIG b/MCONFIG
deleted file mode 100644
index 8e8ab254d..000000000
--- a/MCONFIG
+++ /dev/null
@@ -1,245 +0,0 @@
-# MCONFIG -- Configuration stuff for util-linux
-# Created: Sat Feb  4 15:50:30 1995
-# Copyright 1995 Rickard E. Faith (faith@cs.unc.edu)
-
-# For a user-mode install, make (at least) three changes:
-#  - remove the `-o root' part in INSTALLSUID
-#  - set USE_TTY_GROUP=no
-#  - define DESTDIR
-
-## Configuration outside of this file you might want to do for mount:
-## If make_include has HAVE_BLKID=yes, turn that into HAVE_BLKID=no
-## if you do not want to use the blkid library.
-## In mount/realpath.c turn #define resolve_symlinks into
-## #undef resolve_symlinks if you use devfs and hate long names.
-
-# Select for ARCH one of intel, alpha, sparc, arm, m68k, mips
-# Select for CPU i386 if the binaries must be able to run on an intel 386
-# (by default i486 code is generated, see below)
-CPU=$(shell uname -m)
-ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
-
-# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
-# will use PAM for authentication. Additionally, passwd will not be
-# installed as it is not PAM aware.
-HAVE_PAM=no
-
-# If HAVE_SELINUX is set to "yes", the login will make sure the user is
-# logged into an appropriate security context
-HAVE_SELINUX=no
-
-# If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd,
-# and vipw will not be built or installed from the login-utils
-# subdirectory.  
-HAVE_SHADOW=yes
-
-# If HAVE_PASSWD is set to "yes", then passwd will not be built or
-# installed from the login-utils subdirectory.
-HAVE_PASSWD=no
-
-# If you use chfn and chsh from this package, REQUIRE_PASSWORD will require
-# non-root users to enter the account password before updating /etc/passwd.
-REQUIRE_PASSWORD=yes
-#REQUIRE_PASSWORD=no
-
-# If you use chsh from this package, ONLY_LISTED_SHELLS will require that
-# the selected shell be listed in /etc/shells -- otherwise only a warning is
-# printed.  This prevents someone from setting their shell to /bin/false.
-ONLY_LISTED_SHELLS=yes
-#ONLY_LISTED_SHELLS=no
-
-
-# If HAVE_SYSVINIT is set to "yes", then simpleinit and shutdown will not
-# be built or installed from the login-utils subdirectory.  (The shutdown
-# and halt that come with the SysVinit package should be used with the init
-# found in that package.)
-HAVE_SYSVINIT=yes
-
-# If HAVE_SYSVINIT_UTILS is set to "yes", then last, mesg, and wall will
-# not be built or installed from the login-utils subdirectory.  (The
-# shutdown and init from the SysVinit package do not depend on the last,
-# mesg, and wall from that package.)
-HAVE_SYSVINIT_UTILS=yes
-
-# If HAVE_WRITE is set to "yes", then write will not be built or
-# installed from the misc-utils subdirectory.
-# (There is a network aware write in netwrite from NetKit 0.16 or later.)
-HAVE_WRITE=no
-
-# If HAVE_GETTY is set to "yes", then agetty will not be built or
-# installed from the login-utils subdirectory.  Note that agetty can
-# co-exist with other gettys, so this option should never be used.
-HAVE_GETTY=no
-
-# If USE_TTY_GROUP is set to "yes", then wall and write will be installed
-# setgid to the "tty" group, and mesg will only set the group write bit.
-# Note that this is only useful if login/xterm/etc. change the group of the
-# user's tty to "tty" [The login in util-linux does this correctly, and
-# xterm will do it correctly if X is compiled with USE_TTY_GROUP set
-# properly.]
-USE_TTY_GROUP=yes
-
-# If HAVE_KILL is set to "yes", then kill will not be built or
-# installed from the misc-utils subdirectory.
-# (There is also a kill in the procps package.)
-HAVE_KILL=no
-
-# If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
-# to the current user, allowing her to make a screendump and do other
-# nifty things on the console, but also allowing him to keep an open
-# file descriptor after logging out to trick the next user.
-ALLOW_VCS_USE=yes
-
-# If DO_STAT_MAIL is set to "yes", then login will stat() the mailbox
-# and tell the user that she has new mail. This can hang the login if
-# the mailbox is on a NFS mounted filesystem.
-DO_STAT_MAIL=no
-
-# If HAVE_RESET is set to "yes", then reset won't be installed.  The version
-# of reset that comes with the ncurses package is less aggressive.
-HAVE_RESET=yes
-
-# If HAVE_SLN is set to "yes", then sln won't be installed
-# (but the man page sln.8 will be installed anyway).
-# sln also comes with libc and glibc.
-HAVE_SLN=no
-
-# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
-HAVE_FDUTILS=no
-
-# If SILENT_PG is set to "yes", then pg will not ring the bell
-# when an invalid key is pressed
-SILENT_PG=no
-
-# If configure decides that Native Language Support (NLS) is available,
-# it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set
-# DISABLE_NLS to "yes".
-DISABLE_NLS=no
-
-# Different optimizations for different cpus.
-# Before gcc 2.8.0 only -m486
-# gcc 3.0 only likes -mcpu=i486
-# gcc 3.4 only likes -mtune=i486
-ifeq "$(ARCH)" "intel"
-  ifeq "$(HAVE_NEW_GCC)" "yes"
-    # 3.4.0 and later
-    CPUHEAD=-mtune=i
-  else
-    ifeq "$(HAVE_OLD_GCC)" "yes"
-      # before 3.0
-      CPUHEAD=-m
-    else
-      CPUHEAD=-mcpu=i
-    endif
-  endif
-  ifeq "$(CPU)" "i386"
-    CPUTAIL=386
-  else
-    CPUTAIL=486
-  endif
-  CPUOPT= $(CPUHEAD)$(CPUTAIL)
-  OPT=          -pipe -O2 $(CPUOPT) -fomit-frame-pointer
-else 
-  ifeq "$(ARCH)" "arm"
-    OPT=	-pipe -O2 -fsigned-char -fomit-frame-pointer
-  else
-    OPT=	-O2 -fomit-frame-pointer
-  endif
-endif
-
-WARNFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes
-
-LIB=../lib
-
-ERR_O=$(LIB)/err.o
-
-# Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk)
-# (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.)
-# HAVE_SLANG=yes
-# There is a subdirectory /usr/include/slang containing slcurses.h
-# SLANGFLAGS=-I/usr/include/slang
-# No such subdirectory - slcurses.h lives in /usr/include
-#   (no extra definition required).
-LIBSLANG=-lslang
-
-#
-# Paths used for compilation (not all are actually used, see CFLAGS below)
-#
-DEV_DIR=	/dev
-ETC_DIR=	/etc
-SBIN_DIR=	/sbin
-USRSBIN_DIR=	/usr/sbin
-USRLIB_DIR=	/usr/lib
-USRBIN_DIR=	/usr/bin
-USRGAMES_DIR=	/usr/games
-USRSHAREMISC_DIR=/usr/share/misc
-LOCALE_DIR=	/usr/share/locale
-BIN_DIR=        /bin
-VAR_PATH=	/var
-LOG_DIR=	/var/log
-MAN_DIR=	/usr/share/man
-INFO_DIR=	/usr/share/info
-
-#
-# Paths used for install
-#
-DEVDIR=		$(DESTDIR)$(DEV_DIR)
-ETCDIR=		$(DESTDIR)$(ETC_DIR)
-SBINDIR=	$(DESTDIR)$(SBIN_DIR)
-USRSBINDIR=	$(DESTDIR)$(USRSBIN_DIR)
-USRLIBDIR=      $(DESTDIR)$(USRLIB_DIR)
-USRBINDIR=      $(DESTDIR)$(USRBIN_DIR)
-USRGAMESDIR=    $(DESTDIR)$(USRGAMES_DIR)
-USRSHAREMISCDIR=$(DESTDIR)$(USRSHAREMISC_DIR)
-LOCALEDIR=      $(DESTDIR)$(LOCALE_DIR)
-BINDIR=         $(DESTDIR)$(BIN_DIR)
-VARPATH=	$(DESTDIR)$(VAR_PATH)
-LOGDIR=		$(DESTDIR)$(LOG_DIR)
-MANDIR=		$(DESTDIR)$(MAN_DIR)
-MAN1DIR=	$(MANDIR)/man1
-MAN3DIR=	$(MANDIR)/man3
-MAN5DIR=	$(MANDIR)/man5
-MAN6DIR=	$(MANDIR)/man6
-MAN8DIR=	$(MANDIR)/man8
-INFODIR=	$(DESTDIR)$(INFO_DIR)
-
-# Directory for shutdown, halt, reboot, etc.
-SHUTDOWNDIR=	$(SBINDIR)
-
-# Modes
-DIRMODE=	755
-BINMODE=	755
-MANMODE=	644
-DATMODE=	644
-INFOMODE=	644
-SUIDMODE=      4755
-
-CHMOD=		chmod
-INSTALL=	install
-INSTALLDIR=	$(INSTALL) -d -m $(DIRMODE)
-INSTALLBIN=	$(INSTALL) -m $(BINMODE)
-INSTALLMAN=	$(INSTALL) -m $(MANMODE)
-INSTALLDAT=	$(INSTALL) -m $(DATMODE)
-INSTALLSUID=    $(INSTALL) -m $(SUIDMODE) -o root
-
-ifeq "$(DISABLE_NLS)" "yes"
-NLSFLAGS = -DDISABLE_NLS
-endif
-
-CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \
-			$(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \
-			-D_FILE_OFFSET_BITS=64 \
-			-DSBINDIR=\"$(SBIN_DIR)\" \
-			-DUSRSBINDIR=\"$(USRSBIN_DIR)\" \
-			-DLOGDIR=\"$(LOG_DIR)\" \
-			-DVARPATH=\"$(VAR_PATH)\" \
-			-DLOCALEDIR=\"$(LOCALE_DIR)\" \
-			$(CFLAGS)
-
-
-%.o: %.c
-	$(CC) -c $(CFLAGS) $< -o $@
-
-%: %.cc
-	$(CXX) $(CFLAGS) $< -o $@
-
diff --git a/Makefile b/Makefile
deleted file mode 100644
index cd2c2487e..000000000
--- a/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-# Created: Sat Dec 26 20:09:40 1992
-# Revised: Fri Oct  6 21:37:30 1995 by r.faith@ieee.org
-# Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu)
-# May be distributed under the terms of the GNU GPL.
-#
-
-include ./make_include
-include ./MCONFIG
-
-SUBDIRS=po \
-	lib \
-	getopt \
-	disk-utils \
-	login-utils \
-	misc-utils \
-	mount \
-	fdisk \
-	hwclock \
-	sys-utils \
-	text-utils
-
-.PHONEY: all install clean now
-all:	defines.h
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-defines.h make_include:
-	./configure
-
-now:
-	touch defines.h
-
-$(SUBDIRS): defines.h now
-	cd $@ && $(MAKE)
-
-install:
-	@if [ "`whoami`" = "root" ]; then umask 022; fi
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-clean:
-	-rm -f *.o *~ omake conftest conftest.c core
-	@for subdir in $(SUBDIRS) partx; do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-distclean: make_include clean
-	cd po && make distclean
-	cd mount && make distclean
-	-rm -f defines.h make_include
-
-tar: make_include clean
-	cd po && make util-linux.pot && make distclean
-	cd mount && make distclean
-	-rm -f defines.h make_include
-	cd .. && tar cvfz util-linux-$(VERSION).tar.gz ./util-linux-$(VERSION)
-	ls -l ../util-linux-$(VERSION).tar.gz
-
-# dist:
-#	(cd /tmp; \
-#	rm -rf /tmp/util-linux-$(VERSION); \
-#	cvs export -fNd util-linux-$(VERSION) -r HEAD util-linux; \
-#	cd util-linux-$(VERSION); \
-#	find -type d | xargs chmod 755; \
-#	find -type f | xargs chmod 644; \
-#	find -type d | xargs chown root:root; \
-#	find -type f | xargs chown root:root; \
-#	cd ..; \
-#	GZIP=-9 tar cvvzf util-linux-$(VERSION).tar.gz util-linux-$(VERSION); \
-#	cp -p util-linux-$(VERSION)/LSM util-linux-$(VERSION).lsm; \
-#	cp -p util-linux-$(VERSION)/ANNOUNCE util-linux-$(VERSION).Announce; \
-#	echo Done.)
-#
-
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000000000..d7ac64f07
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,19 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+SUBDIRS = lib \
+	disk-utils \
+	fdisk \
+	getopt \
+	hwclock \
+	login-utils \
+	misc-utils \
+	mount \
+        partx \
+	po \
+	schedutils \
+	sys-utils \
+	text-utils
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = config/config.rpath config/mkinstalldirs config/include-Makefile.am
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 000000000..40a33c7b6
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,715 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/config/include-Makefile.am \
+	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING INSTALL NEWS \
+	config/compile config/config.guess config/config.rpath \
+	config/config.sub config/depcomp config/install-sh \
+	config/ltmain.sh config/missing config/mkinstalldirs \
+	config/texinfo.tex
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+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); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+SUBDIRS = lib \
+	disk-utils \
+	fdisk \
+	getopt \
+	hwclock \
+	login-utils \
+	misc-utils \
+	mount \
+        partx \
+	po \
+	schedutils \
+	sys-utils \
+	text-utils
+
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = config/config.rpath config/mkinstalldirs config/include-Makefile.am
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	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)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) 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) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# 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):
+	@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; \
+	  (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"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@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; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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 || \
+	      tags="$$tags $$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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@case `sed 15q $(srcdir)/NEWS` in \
+	*"$(VERSION)"*) : ;; \
+	*) \
+	  echo "NEWS not updated; not releasing" 1>&2; \
+	  exit 1;; \
+	esac
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/config $(distdir)/m4 $(distdir)/po
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -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 $(SHELL) $(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-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) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(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)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && 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
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+	@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 config.h
+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)
+
+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-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+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 mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-libtool clean-recursive \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-recursive distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-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 --git a/HISTORY b/NEWS
index c67e66ece..b918976fa 100644
--- a/HISTORY
+++ b/NEWS
@@ -1,14 +1,14 @@
-util-linux 2.12r
-
-* no changes
-
-util-linux 2.12r-pre1
-
-* cfdisk: fix a segfault with ReiserFS partitions
-* umount: disallow -r option for non-root users
+util-linux 2.13-pre1
+* use GNU autoconf/automake/libtool for building
+* added schedutils
+* removed support for curses implementations other than ncurses
+* removed programs: arch, passwd, rescuept, setfdprm
+* removed mkminix-0.1/
+* misc fixes and documentation updates
+* new translation: vi
+* updated translations: ca, de, fi, fr, it, nl, ru, tr
 
 util-linux 2.12q
-
 * updated translation: nl
 
 util-linux 2.12q-pre2
diff --git a/README b/README
index db2bcf6d7..e35278a79 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 util-linux is a random collection of Linux utilities
 
 The stuff in the subdirectories mount, fdisk, disk-utils, text-utils,
-misc-utils, sys-utils, getopt-* should be rather distribution-neutral,
-and installing it does no harm.
+misc-utils, schedutils, sys-utils, getopt-* should be rather
+distribution-neutral, and installing it does no harm.
 On the other hand, the stuff in login-utils defines initial boot-time
 stuff, things that are done in different ways by different distributions.
 If you install it, your machine may not boot anymore, or you may be
diff --git a/VERSION b/VERSION
deleted file mode 100644
index aff5e0058..000000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.12r
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 000000000..3e7d1ef39
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,6774 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 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.
+
+# 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.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 47 AC_PROG_LIBTOOL
+# Debian $Rev: 214 $
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+[$]*
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+  ])
+esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+     else
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$4], , :, [$4])
+else
+    ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+ *)
+    # If test is not a shell built-in, we'll probably end up computing a
+    # maximum length that is only half of the actual maximum length, but
+    # we can't tell.
+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	    lt_cv_sys_max_cmd_len=$new_result &&
+	    test $i != 17 # 1/2 MB should be enough
+    do
+      i=`expr $i + 1`
+      teststring=$teststring$teststring
+    done
+    teststring=
+    # Add a significant safety factor because C++ compilers can tack on massive
+    # amounts of additional arguments before passing them to the linker.
+    # It appears as though 1/2 is a usable value.
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# --------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_unknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# -------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+   ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
+fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if test "$GCC" = yes; then
+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+kfreebsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=yes
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+    fi
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	  AC_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+	AC_LIBTOOL_LANG_RC_CONFIG
+	;;
+
+      *)
+	AC_MSG_ERROR([Unsupported tag name: $tagname])
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+  fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 dll's
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+#- set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognise shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+])# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognise a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# AC_PATH_MAGIC
+
+
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--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([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+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 $CC])
+  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.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname 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(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_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 `"$lt_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="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_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_PROG_LD_GNU
+])# AC_PROG_LD
+
+
+# AC_PROG_LD_GNU
+# --------------
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_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'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
+
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+])# AC_PROG_LD_RELOAD_FLAG
+
+
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognise dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix4* | aix5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi4*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | kfreebsd*-gnu)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case "$host_cpu" in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+  else
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sco3.2v5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
+
+
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      # Tru64's nm complains that /dev/null is an invalid object file
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
+	lt_cv_path_NM="$tmp_nm -B"
+	break
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
+	  break
+	  ;;
+	*)
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
+	  ;;
+	esac
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
+
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+])# AC_CHECK_LIBM
+
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and
+# top_srcdir appropriately in the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
+
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+# DIRECTORY is not provided and an installed libltdl is not found, it is
+# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+# quotes!).  If your package is not flat and you're not using automake,
+# define top_builddir and top_srcdir appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    LTDLINCL=
+  fi
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
+
+
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
+
+
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
+
+
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
+
+
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
+
+
+# AC_LIBTOOL_RC
+# --------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
+
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}\n'
+
+_LT_AC_SYS_COMPILER
+
+#
+# Check for any special shared library compilation flags.
+#
+_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+if test "$GCC" = no; then
+  case $host_os in
+  sco3.2v5*)
+    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+    ;;
+  esac
+fi
+if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
+  else
+    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+  fi
+fi
+
+
+#
+# Check to make sure the static flag actually works.
+#
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF($1)
+
+# Report which librarie types wil actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+  darwin* | rhapsody*)
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    case "$host_os" in
+    rhapsody* | darwin1.[[012]])
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[[012]])
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+      ;;
+    esac
+    output_verbose_link_cmd='echo'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+  else
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+  fi
+    ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cc
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+  AC_PROG_LD
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[012]|aix4.[012].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	else
+	  # We have old collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	fi
+      esac
+      shared_flag='-shared'
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	_LT_AC_SYS_LIBPATH_AIX
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	# -bexpall does not export symbols beginning with underscore (_)
+	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+	# Exported symbols can be pulled into shared objects from archives
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	# This is similar to how AIX traditionally builds it's shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+  ;;
+
+  darwin* | rhapsody*)
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    case "$host_os" in
+    rhapsody* | darwin1.[[012]])
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[[012]])
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+      ;;
+    esac
+    lt_int_apple_cc_single_mod=no
+    output_verbose_link_cmd='echo'
+    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+      lt_int_apple_cc_single_mod=yes
+    fi
+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    else
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    fi
+    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+  else
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+  fi
+    ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      ghcx)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  freebsd[12]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  freebsd-elf*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  freebsd* | kfreebsd*-gnu)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    aCC)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      case "$host_cpu" in
+      hppa*64*)
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+        ;;
+      ia64*)
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        ;;
+      *)
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case "$host_cpu" in
+    hppa*64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+    ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    *)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      aCC)
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case "$host_cpu" in
+	    ia64*|hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC)
+	# SGI C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  else
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc)
+	# Intel C++
+	with_gnu_ld=yes
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      cxx)
+	# Compaq C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	runpath_var=LD_RUN_PATH
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+	;;
+      RCC)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  sco*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    case $cc_basename in
+      CC)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      lcc)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC)
+	# Sun C++ 4.2, 5.x and Centerline C++
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    # The C++ compiler is used as linker so we must use $wl
+	    # flag to pass the commands to the underlying system
+	    # linker.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	esac
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx)
+	# Green Hills C++ Compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	fi
+	;;
+    esac
+    ;;
+  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$rm -f confest.$objext
+
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="      program t\n      end\n"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix4* | aix5*)
+  test "$enable_shared" = yes && enable_static=no
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
+
+
+# AC_LIBTOOL_LANG_RC_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
+
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
+
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+    ;;
+  esac
+
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
+
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# 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.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
+
+__EOF__
+
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+])# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris* | sysv5*)
+  symcode='[[BDRT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix4* | aix5*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | kfreebsd*-gnu)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    if test "$host_cpu" != ia64; then
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    case "$host_cpu" in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux*)
+	case $cc_basename in
+	  KCC)
+	    # KAI C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  icpc)
+	    # Intel C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  cxx)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC)
+	    # Rational C++ 2.4.1
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx)
+	    # Digital/Compaq C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      sco*)
+	case $cc_basename in
+	  CC)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC)
+	    # Sun C++ 4.x
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc)
+	    # Lucid
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC)
+	    # NonStop-UX NCC 3.20
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      unixware*)
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    linux*)
+      case $CC in
+      icc* | ecc*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      ccc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+])
+
+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix4* | aix5*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux*)
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+  ;;
+  *)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+  linux*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
+      supports_anon_versioning=no
+      case `$LD -v 2>/dev/null` in
+        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=yes ;;
+      esac
+      if test $supports_anon_versioning = yes; then
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+$echo "local: *; };" >> $output_objdir/$libname.ver~
+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+      else
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
+      fi
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+      runpath_var=LD_RUN_PATH
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+      fi
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$link_static_flag"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  else
+  	  # We have old collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	esac
+	shared_flag='-shared'
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+  	if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+  	fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 _LT_AC_SYS_LIBPATH_AIX
+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # -bexpall does not export symbols beginning with underscore (_)
+	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    bsdi4*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+    if test "$GXX" = yes ; then
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      case "$host_os" in
+      rhapsody* | darwin1.[[012]])
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+	;;
+      *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[[012]])
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+	;;
+      esac
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        else
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        fi
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+      ;;
+
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | kfreebsd*-gnu)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10* | hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    openbsd*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      else
+       case $host_os in
+	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	   ;;
+	 *)
+	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    sco3.2v5*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+      esac
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4.2uw2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      hardcode_runpath_var=yes
+      runpath_var=LD_RUN_PATH
+      ;;
+
+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv5*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && break
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+SED=$lt_cv_path_SED
+])
+AC_MSG_RESULT([$SED])
+])
+
+# Copyright (C) 2002, 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_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
+
+# 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
+# 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 7
+
+# 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])
+AC_SUBST([$1_FALSE])
+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
+# 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 8
+
+# 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], 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
+  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
+
+    case $depmode in
+    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
+      ;;
+    none) break ;;
+    esac
+    # 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.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} 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])
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 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 3
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; 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.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /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
+# 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 12
+
+# 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.58])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
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+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
+ 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)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+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
+])
+])
+
+
+# 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_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# 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_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+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  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 3
+
+# 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 done
+.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
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+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, 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 4
+
+# 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
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# 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  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 whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+#
+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+# created by `make install' are always world readable, even if the
+# installer happens to have an overly restrictive umask (e.g. 077).
+# This was a mistake.  There are at least two reasons why we must not
+# use `-m 0755':
+#   - it causes special bits like SGID to be ignored,
+#   - it may be too restrictive (some setups expect 775 directories).
+#
+# Do not use -m 0755 and let people choose whatever they expect by
+# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out.  Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
+AC_DEFUN([AM_PROG_MKDIR_P],
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
+else
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
+  else
+    mkdir_p='$(install_sh) -d'
+  fi
+fi
+AC_SUBST([mkdir_p])])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 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 3
+
+# _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],
+[AC_FOREACH([_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
+# 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_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# 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) 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="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# 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/gettext.m4])
+m4_include([m4/iconv.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 --git a/config.h.in b/config.h.in
new file mode 100644
index 000000000..7c015c144
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,206 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* 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 <asm/page.h> header file. */
+#undef HAVE_ASM_PAGE_H
+
+/* 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 if the GNU dcgettext() function is already present or preinstalled.
+   */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#undef HAVE_FSEEKO
+
+/* Define to 1 if you have the `fsync' function. */
+#undef HAVE_FSYNC
+
+/* Define to 1 if you have the `getdomainname' function. */
+#undef HAVE_GETDOMAINNAME
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the `inet_aton' function. */
+#undef HAVE_INET_ATON
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
+
+/* Define to 1 if you have the `lchown' function. */
+#undef HAVE_LCHOWN
+
+/* Define to 1 if you have the `blkid' library (-lblkid). */
+#undef HAVE_LIBBLKID
+
+/* Define to 1 if you have the `selinux' library (-lselinux). */
+#undef HAVE_LIBSELINUX
+
+/* Define to 1 if you have the `termcap' library (-ltermcap). */
+#undef HAVE_LIBTERMCAP
+
+/* Define to 1 if you have the `util' library (-lutil). */
+#undef HAVE_LIBUTIL
+
+/* Define to 1 if you have the `uuid' library (-luuid). */
+#undef HAVE_LIBUUID
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the <linux/blkpg.h> header file. */
+#undef HAVE_LINUX_BLKPG_H
+
+/* Define to 1 if you have the <linux/compiler.h> header file. */
+#undef HAVE_LINUX_COMPILER_H
+
+/* Define to 1 if you have the <linux/raw.h> header file. */
+#undef HAVE_LINUX_RAW_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `nanosleep' function. */
+#undef HAVE_NANOSLEEP
+
+/* 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 `personality' function. */
+#undef HAVE_PERSONALITY
+
+/* Define to 1 if you have the <pty.h> header file. */
+#undef HAVE_PTY_H
+
+/* Define to 1 if you have the <rpcsvc/nfs_prot.h> header file. */
+#undef HAVE_RPCSVC_NFS_PROT_H
+
+/* Define to 1 if you have the `rpmatch' function. */
+#undef HAVE_RPMATCH
+
+/* Define to 1 if you have the <scsi/scsi.h> header file. */
+#undef HAVE_SCSI_SCSI_H
+
+/* Define to 1 if you have the <security/pam_misc.h> header file. */
+#undef HAVE_SECURITY_PAM_MISC_H
+
+/* Define to 1 if you have the <slang/slcurses.h> header file. */
+#undef HAVE_SLANG_SLCURSES_H
+
+/* Define to 1 if you have the <slcurses.h> header file. */
+#undef HAVE_SLCURSES_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 <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 <sys/io.h> header file. */
+#undef HAVE_SYS_IO_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/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/user.h> header file. */
+#undef HAVE_SYS_USER_H
+
+/* Does struct tm have a field tm_gmtoff? */
+#undef HAVE_TM_GMTOFF
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `updwtmp' function. */
+#undef HAVE_UPDWTMP
+
+/* Do we have wide character support? */
+#undef HAVE_WIDECHAR
+
+/* Do we have __progname? */
+#undef HAVE___PROGNAME
+
+/* Should login chown /dev/vcsN? */
+#undef LOGIN_CHOWN_VCS
+
+/* Should login stat() the mailbox? */
+#undef LOGIN_STAT_MAIL
+
+/* Do we need -lcrypt? */
+#undef NEED_LIBCRYPT
+
+/* Should chsh allow only shells in /etc/shells? */
+#undef ONLY_LISTED_SHELLS
+
+/* 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 version of this package. */
+#undef PACKAGE_VERSION
+
+/* Should pg ring the bell on invalid keys? */
+#undef PG_BELL
+
+/* Should chfn and chsh require the user to enter the password? */
+#undef REQUIRE_PASSWORD
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Should wall and write be installed setgid tty? */
+#undef USE_TTY_GROUP
+
+/* Version number of package */
+#undef VERSION
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
diff --git a/config/compile b/config/compile
new file mode 100755
index 000000000..1b1d23216
--- /dev/null
+++ b/config/compile
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.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, 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., 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
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/config/config.rpath b/config/config.rpath
new file mode 100755
index 000000000..3f1bef34a
--- /dev/null
+++ b/config/config.rpath
@@ -0,0 +1,571 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2005 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   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.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case "$cc_basename" in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux*)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  case "$host_os" in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = yes; then
+    # Unlike libtool, we use -rpath here, not --rpath, since the documented
+    # option of GNU ld is called -rpath, not --rpath.
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            hardcode_direct=yes
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case "$cc_basename" in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10* | hpux11*)
+      if test "$with_gnu_ld" = no; then
+        case "$host_cpu" in
+          hppa*64*)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=no
+            ;;
+          ia64*)
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_direct=no
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      hardcode_direct=yes
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+        case "$host_os" in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            hardcode_libdir_flag_spec='-R$libdir'
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+            ;;
+        esac
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4.2uw2*)
+      hardcode_direct=yes
+      hardcode_minus_L=no
+      ;;
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      ;;
+    sysv5*)
+      hardcode_libdir_flag_spec=
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    ;;
+  aix4* | aix5*)
+    ;;
+  amigaos*)
+    ;;
+  beos*)
+    ;;
+  bsdi[45]*)
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    ;;
+  dgux*)
+    ;;
+  freebsd1*)
+    ;;
+  kfreebsd*-gnu)
+    ;;
+  freebsd*)
+    ;;
+  gnu*)
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case "$host_cpu" in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    ;;
+  irix5* | irix6* | nonstopux*)
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux*)
+    ;;
+  knetbsd*-gnu)
+    ;;
+  netbsd*)
+    ;;
+  newsos6)
+    ;;
+  nto-qnx*)
+    ;;
+  openbsd*)
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    ;;
+  osf3* | osf4* | osf5*)
+    ;;
+  sco3.2v5*)
+    ;;
+  solaris*)
+    ;;
+  sunos4*)
+    ;;
+  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    ;;
+  sysv4*MP*)
+    ;;
+  uts4*)
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/config/depcomp b/config/depcomp
new file mode 100755
index 000000000..04701da53
--- /dev/null
+++ b/config/depcomp
@@ -0,0 +1,530 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2005-07-09.11
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 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
+# the Free Software Foundation; either version 2, 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., 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
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$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.
+## 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 '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # 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
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## 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 '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## 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 '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
new file mode 100644
index 000000000..f9327c7a7
--- /dev/null
+++ b/config/include-Makefile.am
@@ -0,0 +1,12 @@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+datadir = $(prefix)/usr/share
+infodir = $(datadir)/info
+mandir = $(datadir)/man
+
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+
+DEFAULT_INCLUDES =
+
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+
diff --git a/config/install-sh b/config/install-sh
new file mode 100755
index 000000000..4d4a9519e
--- /dev/null
+++ b/config/install-sh
@@ -0,0 +1,323 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2005-05-14.22
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # 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.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/config/ltmain.sh b/config/ltmain.sh
new file mode 100644
index 000000000..1a224ac2a
--- /dev/null
+++ b/config/ltmain.sh
@@ -0,0 +1,6426 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+# Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# 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.
+
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5.6
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
+
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell, and then maybe $echo will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+# test EBCDIC or ASCII
+case `echo A|tr A '\301'` in
+ A) # EBCDIC based system
+  SP2NL="tr '\100' '\n'"
+  NL2SP="tr '\r\n' '\100\100'"
+  ;;
+ *) # Assume ASCII based system
+  SP2NL="tr '\040' '\012'"
+  NL2SP="tr '\015\012' '\040\040'"
+  ;;
+esac
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+# Make sure IFS has a sensible default
+: ${IFS=" 	
+"}
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+  $echo "$modename: not configured to build any kind of library" 1>&2
+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit $EXIT_FAILURE
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+
+#####################################
+# Shell function definitions:
+# This seems to be the best place for them
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid () {
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 | \
+	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+      if test "X$win32_nmres" = "Ximport" ; then
+        win32_libid_type="x86 archive import"
+      else
+        win32_libid_type="x86 archive static"
+      fi
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $echo $win32_libid_type
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	case $arg in
+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	    # Double-quote args containing other shell metacharacters.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    CC_quoted="$CC_quoted $arg"
+	  done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+# End of Shell function definitions
+#####################################
+
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
+
+# Parse our command line options once, thoroughly.
+while test "$#" -gt 0
+do
+  arg="$1"
+  shift
+
+  case $arg in
+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    case $prev in
+    execute_dlfiles)
+      execute_dlfiles="$execute_dlfiles $arg"
+      ;;
+    tag)
+      tagname="$arg"
+      preserve_args="${preserve_args}=$arg"
+
+      # Check whether tagname contains only valid characters
+      case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+	$echo "$progname: invalid tag name: $tagname" 1>&2
+	exit $EXIT_FAILURE
+	;;
+      esac
+
+      case $tagname in
+      CC)
+	# Don't test for the "default" C tag, as we know, it's there, but
+	# not specially marked.
+	;;
+      *)
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+	  taglist="$taglist $tagname"
+	  # Evaluate the configuration.
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+	else
+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+	fi
+	;;
+      esac
+      ;;
+    *)
+      eval "$prev=\$arg"
+      ;;
+    esac
+
+    prev=
+    prevopt=
+    continue
+  fi
+
+  # Have we seen a non-optional argument yet?
+  case $arg in
+  --help)
+    show_help=yes
+    ;;
+
+  --version)
+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    $echo
+    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+    $echo "This is free software; see the source for copying conditions.  There is NO"
+    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    exit $EXIT_SUCCESS
+    ;;
+
+  --config)
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+    done
+    exit $EXIT_SUCCESS
+    ;;
+
+  --debug)
+    $echo "$progname: enabling shell trace mode"
+    set -x
+    preserve_args="$preserve_args $arg"
+    ;;
+
+  --dry-run | -n)
+    run=:
+    ;;
+
+  --features)
+    $echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      $echo "enable shared libraries"
+    else
+      $echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      $echo "enable static libraries"
+    else
+      $echo "disable static libraries"
+    fi
+    exit $EXIT_SUCCESS
+    ;;
+
+  --finish) mode="finish" ;;
+
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
+
+  --preserve-dup-deps) duplicate_deps="yes" ;;
+
+  --quiet | --silent)
+    show=:
+    preserve_args="$preserve_args $arg"
+    ;;
+
+  --tag) prevopt="--tag" prev=tag ;;
+  --tag=*)
+    set tag "$optarg" ${1+"$@"}
+    shift
+    prev=tag
+    preserve_args="$preserve_args --tag"
+    ;;
+
+  -dlopen)
+    prevopt="-dlopen"
+    prev=execute_dlfiles
+    ;;
+
+  -*)
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$help" 1>&2
+    exit $EXIT_FAILURE
+    ;;
+
+  *)
+    nonopt="$arg"
+    break
+    ;;
+  esac
+done
+
+if test -n "$prevopt"; then
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$help" 1>&2
+  exit $EXIT_FAILURE
+fi
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+if test -z "$show_help"; then
+
+  # Infer the operation mode.
+  if test -z "$mode"; then
+    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+    case $nonopt in
+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+      mode=link
+      for arg
+      do
+	case $arg in
+	-c)
+	   mode=compile
+	   break
+	   ;;
+	esac
+      done
+      ;;
+    *db | *dbx | *strace | *truss)
+      mode=execute
+      ;;
+    *install*|cp|mv)
+      mode=install
+      ;;
+    *rm)
+      mode=uninstall
+      ;;
+    *)
+      # If we have no mode, but dlfiles were specified, then do execute mode.
+      test -n "$execute_dlfiles" && mode=execute
+
+      # Just use the default operation mode.
+      if test -z "$mode"; then
+	if test -n "$nonopt"; then
+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+	else
+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+	fi
+      fi
+      ;;
+    esac
+  fi
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$modename --help --mode=$mode' for more information."
+
+  # These modes are in order of execution frequency so that they run quickly.
+  case $mode in
+  # libtool compile mode
+  compile)
+    modename="$modename: compile"
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+
+    for arg
+    do
+      case "$arg_mode" in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  if test -n "$libobj" ; then
+	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-static | -prefer-pic | -prefer-non-pic)
+	  later="$later $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+ 	  for arg in $args; do
+	    IFS="$save_ifs"
+
+	    # Double-quote args containing other shell metacharacters.
+	    # Many Bourne shells cannot handle close brackets correctly
+	    # in scan sets, so we specify it separately.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    lastarg="$lastarg $arg"
+	  done
+	  IFS="$save_ifs"
+	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+
+	  # Add the arguments to base_compile.
+	  base_compile="$base_compile $lastarg"
+	  continue
+	  ;;
+
+	* )
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+      case $lastarg in
+      # Double-quote args containing other shell metacharacters.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	lastarg="\"$lastarg\""
+	;;
+      esac
+
+      base_compile="$base_compile $lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      $echo "$modename: you must specify an argument for -Xcompile"
+      exit $EXIT_FAILURE
+      ;;
+    target)
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    *)
+      # Get the name of the library object.
+      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    xform='[cCFSifmso]'
+    case $libobj in
+    *.ada) xform=ada ;;
+    *.adb) xform=adb ;;
+    *.ads) xform=ads ;;
+    *.asm) xform=asm ;;
+    *.c++) xform=c++ ;;
+    *.cc) xform=cc ;;
+    *.ii) xform=ii ;;
+    *.class) xform=class ;;
+    *.cpp) xform=cpp ;;
+    *.cxx) xform=cxx ;;
+    *.f90) xform=f90 ;;
+    *.for) xform=for ;;
+    *.java) xform=java ;;
+    esac
+
+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+    case $libobj in
+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *)
+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -static)
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$xdir" = "X$obj"; then
+      xdir=
+    else
+      xdir=$xdir/
+    fi
+    lobj=${xdir}$objdir/$objname
+
+    if test -z "$base_compile"; then
+      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    $run $rm $removelist
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+      removelist="$removelist $output_obj $lockfile"
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+	$show "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+      $echo $srcfile > "$lockfile"
+    fi
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+
+    $run $rm "$libobj" "${libobj}T"
+
+    # Create a libtool object file (analogous to a ".la" file),
+    # but don't create it if we're doing a dry run.
+    test -z "$run" && cat > ${libobj}T <<EOF
+# $libobj - a libtool object file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+EOF
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $srcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $srcfile"
+      fi
+
+      if test ! -d "${xdir}$objdir"; then
+	$show "$mkdir ${xdir}$objdir"
+	$run $mkdir ${xdir}$objdir
+	status=$?
+	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+	  exit $status
+	fi
+      fi
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	command="$command -o $lobj"
+      fi
+
+      $run $rm "$lobj" "$output_obj"
+
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	test -n "$output_obj" && $run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	$show "$mv $output_obj $lobj"
+	if $run $mv $output_obj $lobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Append the name of the PIC object to the libtool object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object='$objdir/$objname'
+
+EOF
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+        suppress_output=' >/dev/null 2>&1'
+      fi
+    else
+      # No PIC object so indicate it doesn't exist in the libtool
+      # object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object=none
+
+EOF
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $srcfile"
+      else
+	command="$base_compile $srcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      $run $rm "$obj" "$output_obj"
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	$show "$mv $output_obj $obj"
+	if $run $mv $output_obj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object='$objname'
+
+EOF
+    else
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object=none
+
+EOF
+    fi
+
+    $run $mv "${libobj}T" "${libobj}"
+
+    # Unlock the critical section if it was locked
+    if test "$need_locks" != no; then
+      $run $rm "$lockfile"
+    fi
+
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool link mode
+  link | relink)
+    modename="$modename: link"
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args="$nonopt"
+    base_compile="$nonopt $@"
+    compile_command="$nonopt"
+    finalize_command="$nonopt"
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -all-static | -static)
+	if test "X$arg" = "X-all-static"; then
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	else
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	fi
+	build_libtool_libs=no
+	build_old_libs=yes
+	prefer_static_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+	;;
+      *) qarg=$arg ;;
+      esac
+      libtool_args="$libtool_args $qarg"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  compile_command="$compile_command @OUTPUT@"
+	  finalize_command="$finalize_command @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    compile_command="$compile_command @SYMFILE@"
+	    finalize_command="$finalize_command @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  if test ! -f "$arg"; then
+	    $echo "$modename: symbol file \`$arg' does not exist"
+	    exit $EXIT_FAILURE
+	  fi
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat $save_arg`
+	    do
+#	      moreargs="$moreargs $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		# If there is no directory component, then add one.
+		case $arg in
+		*/* | *\\*) . $arg ;;
+		*) . ./$arg ;;
+		esac
+
+		if test -z "$pic_object" || \
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none && \
+		   test "$non_pic_object" = none; then
+		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+		  exit $EXIT_FAILURE
+		fi
+
+		# Extract subdirectory from the argument.
+		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		if test "X$xdir" = "X$arg"; then
+		  xdir=
+		else
+		  xdir="$xdir/"
+		fi
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      dlfiles="$dlfiles $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    dlprefiles="$dlprefiles $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  libobjs="$libobjs $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if test -z "$run"; then
+		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+		  exit $EXIT_FAILURE
+		else
+		  # Dry-run case.
+
+		  # Extract subdirectory from the argument.
+		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		  if test "X$xdir" = "X$arg"; then
+		    xdir=
+		  else
+		    xdir="$xdir/"
+		  fi
+
+		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+		  libobjs="$libobjs $pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		fi
+	      fi
+	    done
+	  else
+	    $echo "$modename: link input file \`$save_arg' does not exist"
+	    exit $EXIT_FAILURE
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  compile_command="$compile_command $wl$qarg"
+	  finalize_command="$finalize_command $wl$qarg"
+	  continue
+	  ;;
+	xcclinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	shrext)
+  	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	continue
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+	  exit $EXIT_FAILURE
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  if test -z "$absdir"; then
+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-mingw* | *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    deplibs="$deplibs -framework System"
+	    continue
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # gcc -m* arguments should be passed to the linker via $compiler_flags
+      # in order to pass architecture information to the linker
+      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+      # but this is not reliable with gcc because gcc may use -mfoo to
+      # select a different linker, different libraries, etc, while
+      # -Wl,-mfoo simply passes -mfoo to the linker.
+      -m*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+        compile_command="$compile_command $arg"
+        finalize_command="$finalize_command $arg"
+        if test "$with_gcc" = "yes" ; then
+          compiler_flags="$compiler_flags $arg"
+        fi
+        continue
+        ;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # in order for the loader to find any dlls it needs.
+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
+	esac
+	continue
+	;;
+
+      -static)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -Wc,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Wl,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $wl$flag"
+	  linker_flags="$linker_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+
+      *.$objext)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  # If there is no directory component, then add one.
+	  case $arg in
+	  */* | *\\*) . $arg ;;
+	  *) . ./$arg ;;
+	  esac
+
+	  if test -z "$pic_object" || \
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none && \
+	     test "$non_pic_object" = none; then
+	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	  if test "X$xdir" = "X$arg"; then
+	    xdir=
+ 	  else
+	    xdir="$xdir/"
+	  fi
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      dlprefiles="$dlprefiles $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    libobjs="$libobjs $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if test -z "$run"; then
+	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+	    exit $EXIT_FAILURE
+	  else
+	    # Dry-run case.
+
+	    # Extract subdirectory from the argument.
+	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	    if test "X$xdir" = "X$arg"; then
+	      xdir=
+	    else
+	      xdir="$xdir/"
+	    fi
+
+	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+	    libobjs="$libobjs $pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
+	else
+	  deplibs="$deplibs $arg"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+      fi
+    done # argument parsing loop
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      compile_command="$compile_command $arg"
+      finalize_command="$finalize_command $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$output_objdir" = "X$output"; then
+      output_objdir="$objdir"
+    else
+      output_objdir="$output_objdir/$objdir"
+    fi
+    # Create the object directory.
+    if test ! -d "$output_objdir"; then
+      $show "$mkdir $output_objdir"
+      $run $mkdir $output_objdir
+      status=$?
+      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+	exit $status
+      fi
+    fi
+
+    # Determine the type of output
+    case $output in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    case $host in
+    *cygwin* | *mingw* | *pw32*)
+      # don't eliminate duplications in $postdeps and $predeps
+      duplicate_compiler_generated_deps=yes
+      ;;
+    *)
+      duplicate_compiler_generated_deps=$duplicate_deps
+      ;;
+    esac
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if test "X$duplicate_deps" = "Xyes" ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  esac
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+    case $linkmode in
+    lib)
+	passes="conv link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+    for pass in $passes; do
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
+	esac
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+	    continue
+	  fi
+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if (${SED} -e '2q' $lib |
+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		  library_names=
+		  old_library=
+		  case $lib in
+		  */* | *\\*) . $lib ;;
+		  *) . ./$lib ;;
+		  esac
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+		    test "X$ladir" = "X$lib" && ladir="."
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+	        ;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  *)
+	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    if test "$deplibs_check_method" != pass_all; then
+	      $echo
+	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+	      $echo "*** I have the capability to make that library automatically link in when"
+	      $echo "*** you link to this library.  But I can only do this if you have a"
+	      $echo "*** shared version of the library, which you do not appear to have"
+	      $echo "*** because the file extensions .$libext of this argument makes me believe"
+	      $echo "*** that it is just a static archive that I should not used here."
+	    else
+	      $echo
+	      $echo "*** Warning: Linking the shared library $output against the"
+	      $echo "*** static library $deplib is not portable!"
+	      deplibs="$deplib $deplibs"
+	    fi
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      newdlprefiles="$newdlprefiles $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      newdlfiles="$newdlfiles $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$ladir" = "X$lib" && ladir="."
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+
+	# Read the .la file
+	case $lib in
+	*/* | *\\*) . $lib ;;
+	*) . ./$lib ;;
+	esac
+
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	      exit $EXIT_FAILURE
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+              if test "X$duplicate_deps" = "Xyes" ; then
+	        case "$tmp_libs " in
+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	        esac
+              fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	else
+	  dir="$ladir/$objdir"
+	  absdir="$abs_ladir/$objdir"
+	  # Remove this search path later
+	  notinst_path="$notinst_path $abs_ladir"
+	fi # $installed = yes
+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var"; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath " in
+	      *" $dir "*) ;;
+	      *" $absdir "*) ;;
+	      *) temp_rpath="$temp_rpath $dir" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	if test -n "$library_names" &&
+	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	  if test "$installed" = no; then
+	    notinst_deplibs="$notinst_deplibs $lib"
+	    need_relink=yes
+	  fi
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on
+	  # some systems (darwin)
+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+	    $echo
+	    if test "$linkmode" = prog; then
+	      $echo "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $echo "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    realname="$2"
+	    shift; shift
+	    libname=`eval \\$echo \"$libname_spec\"`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw*)
+		major=`expr $current - $age`
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      $show "extracting exported symbol list from \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      cmds=$extract_expsyms_cmds
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      $show "generating import library for \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      cmds=$old_archive_from_expsyms_cmds
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a module then we can not link against
+		    # it, someone is ignoring the new warnings I added
+		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+		      $echo "** Warning, lib $linklib is a module, not a shared library"
+		      if test -z "$old_library" ; then
+		        $echo
+		        $echo "** And there doesn't seem to be a static archive available"
+		        $echo "** The link will probably fail, sorry"
+		      else
+		        add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$dir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case "$libdir" in
+		    [\\/]*)
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      $echo "$modename: configuration error: unsupported hardcode properties"
+	      exit $EXIT_FAILURE
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes && \
+		 test "$hardcode_minus_L" != yes && \
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+	        add="$inst_prefix_dir$libdir/$linklib"
+	      else
+	        add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case "$libdir" in
+		  [\\/]*)
+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    $echo
+	    $echo "*** Warning: This system can not link to static lib archive $lib."
+	    $echo "*** I have the capability to make that library automatically link in when"
+	    $echo "*** you link to this library.  But I can only do this if you have a"
+	    $echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      $echo "*** But as you try to build a module library, libtool will still create "
+	      $echo "*** a static module, that should work as long as the dlopening application"
+	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		$echo
+		$echo "*** However, this would only work if libtool was able to extract symbol"
+		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$echo "*** not find such a program.  So, this module is probably useless."
+		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    convenience="$convenience $dir/$old_library"
+	    old_convenience="$old_convenience $dir/$old_library"
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+		test "X$dir" = "X$deplib" && dir="."
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if grep "^installed=no" $deplib > /dev/null; then
+		  path="$absdir/$objdir"
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  if test -z "$libdir"; then
+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		    exit $EXIT_FAILURE
+		  fi
+		  if test "$absdir" != "$libdir"; then
+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+		  fi
+		  path="$absdir"
+		fi
+		depdepl=
+		case $host in
+		*-*-darwin*)
+		  # we do not want to link against static libs,
+		  # but need to link against shared
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$path/$depdepl" ; then
+		      depdepl="$path/$depdepl"
+		    fi
+		    # do not add paths which are already there
+		    case " $newlib_search_path " in
+		    *" $path "*) ;;
+		    *) newlib_search_path="$newlib_search_path $path";;
+		    esac
+		  fi
+		  path=""
+		  ;;
+		*)
+		  path="-L$path"
+		  ;;
+		esac
+		;;
+	      -l*)
+		case $host in
+		*-*-darwin*)
+		  # Again, we only want to link against shared libraries
+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+		  for tmp in $newlib_search_path ; do
+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
+		      break
+		    fi
+		  done
+		  path=""
+		  ;;
+		*) continue ;;
+		esac
+		;;
+	      *) continue ;;
+	      esac
+	      case " $deplibs " in
+	      *" $depdepl "*) ;;
+	      *) deplibs="$depdepl $deplibs" ;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$deplibs $path" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  tmp_libs="$tmp_libs $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+      fi
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	if test "$module" = no; then
+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+	  exit $EXIT_FAILURE
+	else
+	  $echo
+	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+	  $echo "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
+
+      if test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+      fi
+
+      set dummy $rpath
+      if test "$#" -gt 2; then
+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      fi
+      install_libdir="$2"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	if test -n "$vinfo"; then
+	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+	fi
+
+	if test -n "$release"; then
+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+	fi
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	IFS="$save_ifs"
+
+	if test -n "$8"; then
+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$2"
+	  number_minor="$3"
+	  number_revision="$4"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows)
+	    current=`expr $number_major + $number_minor`
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    current=`expr $number_major + $number_minor - 1`
+	    age="$number_minor"
+	    revision="$number_minor"
+	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$2"
+	  revision="$3"
+	  age="$4"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  minor_current=`expr $current + 1`
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current";
+	  ;;
+
+	irix | nonstopux)
+	  major=`expr $current - $age + 1`
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    iface=`expr $revision - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux)
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  major=.`expr $current - $age`
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    iface=`expr $current - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  major=`expr $current - $age`
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+      fi
+
+      if test "$mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$echo "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+	         then
+		   continue
+		 fi
+	       fi
+	       removelist="$removelist $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	if test -n "$removelist"; then
+	  $show "${rm}r $removelist"
+	  $run ${rm}r $removelist
+	fi
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      for path in $notinst_path; do
+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+      done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs -framework System"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+ 	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      deplibs="$deplibs -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $rm conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $rm conftest
+	  $LTCC -o conftest conftest.c $deplibs
+	  if test "$?" -eq 0 ; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      name="`expr $i : '-l\(.*\)'`"
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" -ne "0"; then
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+	        fi
+		if test -n "$i" ; then
+		  libname=`eval \\$echo \"$libname_spec\"`
+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		  set dummy $deplib_matches
+		  deplib_match=$2
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    $echo
+		    $echo "*** Warning: dynamic linker does not accept needed library $i."
+		    $echo "*** I have the capability to make that library automatically link in when"
+		    $echo "*** you link to this library.  But I can only do this if you have a"
+		    $echo "*** shared version of the library, which I believe you do not have"
+		    $echo "*** because a test_compile did reveal that the linker did not use it for"
+		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      name="`expr $i : '-l\(.*\)'`"
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" != "0"; then
+		$rm conftest
+		$LTCC -o conftest conftest.c $i
+		# Did it work?
+		if test "$?" -eq 0 ; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval \\$echo \"$libname_spec\"`
+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		    set dummy $deplib_matches
+		    deplib_match=$2
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      $echo
+		      $echo "*** Warning: dynamic linker does not accept needed library $i."
+		      $echo "*** I have the capability to make that library automatically link in when"
+		      $echo "*** you link to this library.  But I can only do this if you have a"
+		      $echo "*** shared version of the library, which you do not appear to have"
+		      $echo "*** because a test_compile did reveal that the linker did not use this one"
+		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  $echo
+		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** library that it depends on before this library will be fully"
+		  $echo "*** functional.  Installing it before continuing would be even better."
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method
+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    # If $name is empty we are operating on a -L argument.
+            if test "$name" != "" && test  "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null \
+			 | grep " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+			 | ${SED} 10q \
+			 | $EGREP "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    # If $name is empty we are operating on a -L argument.
+	    if test -n "$name" && test "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval $echo \"$potent_lib\" 2>/dev/null \
+		        | ${SED} 10q \
+		        | $EGREP "$match_pattern_regex" > /dev/null; then
+		      newdeplibs="$newdeplibs $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+	    -e 's/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	    done
+	  fi
+	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+	    | grep . >/dev/null; then
+	    $echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    $echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	  fi
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library is the System framework
+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    $echo
+	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $echo "*** a static module, that should work as long as the dlopening"
+	    $echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      $echo
+	      $echo "*** However, this would only work if libtool was able to extract symbol"
+	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $echo "*** not find such a program.  So, this module is probably useless."
+	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    $echo "*** The inter-library dependencies that have been dropped here will be"
+	    $echo "*** automatically added whenever a program is linked with this library"
+	    $echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      $echo
+	      $echo "*** Since this library must not contain undefined symbols,"
+	      $echo "*** because either the platform does not support them or"
+	      $echo "*** it was explicitly requested with -no-undefined,"
+	      $echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	realname="$2"
+	shift; shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      eval cmd=\"$cmd\"
+	      if len=`expr "X$cmd" : ".*"` &&
+	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	        $show "$cmd"
+	        $run eval "$cmd" || exit $?
+	        skipped_export=false
+	      else
+	        # The command line is too long to execute in one step.
+	        $show "using reloadable object file for export list..."
+	        skipped_export=:
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex"; then
+	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+		case " $convenience " in
+		*" $test_deplib "*) ;;
+		*)
+			tmp_deplibs="$tmp_deplibs $test_deplib"
+			;;
+		esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "$mkdir $gentop"
+	    $run $mkdir "$gentop"
+	    status=$?
+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+	      exit $status
+	    fi
+	    generated="$generated $gentop"
+
+	    for xlib in $convenience; do
+	      # Extract the objects.
+	      case $xlib in
+	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	      *) xabs=`pwd`"/$xlib" ;;
+	      esac
+	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	      xdir="$gentop/$xlib"
+
+	      $show "${rm}r $xdir"
+	      $run ${rm}r "$xdir"
+	      $show "$mkdir $xdir"
+	      $run $mkdir "$xdir"
+	      status=$?
+	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+		exit $status
+	      fi
+	      # We will extract separately just the conflicting names and we will no
+	      # longer touch any unique names. It is faster to leave these extract
+	      # automatically by $AR in one run.
+	      $show "(cd $xdir && $AR x $xabs)"
+	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+		:
+	      else
+		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+		do
+		  i=1
+		  while test "$i" -le "$count"
+		  do
+		   # Put our $i before any first dot (extension)
+		   # Never overwrite any file
+		   name_to="$name"
+		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+		   do
+		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+		   done
+		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+		   i=`expr $i + 1`
+		  done
+		done
+	      fi
+
+	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+	    done
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  linker_flags="$linker_flags $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	  eval test_cmds=\"$archive_expsym_cmds\"
+	  cmds=$archive_expsym_cmds
+	else
+	  eval test_cmds=\"$archive_cmds\"
+	  cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise.
+	  $echo "creating reloadable object files..."
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  delfiles=
+	  last_robj=
+	  k=1
+	  output=$output_objdir/$save_output-${k}.$objext
+	  # Loop over the list of objects to be linked.
+	  for obj in $save_libobjs
+	  do
+	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+	    if test "X$objlist" = X ||
+	       { len=`expr "X$test_cmds" : ".*"` &&
+		 test "$len" -le "$max_cmd_len"; }; then
+	      objlist="$objlist $obj"
+	    else
+	      # The command $test_cmds is almost too long, add a
+	      # command to the queue.
+	      if test "$k" -eq 1 ; then
+		# The first file doesn't have a previous command to add.
+		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+	      else
+		# All subsequent reloadable object files will link in
+		# the last one created.
+		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+	      fi
+	      last_robj=$output_objdir/$save_output-${k}.$objext
+	      k=`expr $k + 1`
+	      output=$output_objdir/$save_output-${k}.$objext
+	      objlist=$obj
+	      len=1
+	    fi
+	  done
+	  # Handle the remaining objects by creating one last
+	  # reloadable object file.  All subsequent reloadable object
+	  # files will link in the last one created.
+	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+
+	  if ${skipped_export-false}; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    libobjs=$output
+	    # Append the command to create the export file.
+	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+          fi
+
+	  # Set up a command to remove the reloadale object files
+	  # after they are used.
+	  i=0
+	  while test "$i" -lt "$k"
+	  do
+	    i=`expr $i + 1`
+	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+	  done
+
+	  $echo "creating a temporary reloadable object file: $output"
+
+	  # Loop through the commands generated above and execute them.
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $concat_cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    cmds=$archive_expsym_cmds
+	  else
+	    cmds=$archive_cmds
+	    fi
+	  fi
+
+	  # Append the command to remove the reloadable object files
+	  # to the just-reset $cmds.
+	  eval cmds=\"\$cmds~\$rm $delfiles\"
+	fi
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+      fi
+
+      case $output in
+      *.lo)
+	if test -n "$objs$old_deplibs"; then
+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	libobj="$output"
+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $run $rm $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	else
+	  gentop="$output_objdir/${obj}x"
+	  $show "${rm}r $gentop"
+	  $run ${rm}r "$gentop"
+	  $show "$mkdir $gentop"
+	  $run $mkdir "$gentop"
+	  status=$?
+	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+	    exit $status
+	  fi
+	  generated="$generated $gentop"
+
+	  for xlib in $convenience; do
+	    # Extract the objects.
+	    case $xlib in
+	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	    *) xabs=`pwd`"/$xlib" ;;
+	    esac
+	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	    xdir="$gentop/$xlib"
+
+	    $show "${rm}r $xdir"
+	    $run ${rm}r "$xdir"
+	    $show "$mkdir $xdir"
+	    $run $mkdir "$xdir"
+	    status=$?
+	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+	      exit $status
+	    fi
+	    # We will extract separately just the conflicting names and we will no
+	    # longer touch any unique names. It is faster to leave these extract
+	    # automatically by $AR in one run.
+	    $show "(cd $xdir && $AR x $xabs)"
+	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+	      :
+	    else
+	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+	      do
+		i=1
+		while test "$i" -le "$count"
+		do
+		 # Put our $i before any first dot (extension)
+		 # Never overwrite any file
+		 name_to="$name"
+		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+		 do
+		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+		 done
+		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+		 i=`expr $i + 1`
+		done
+	      done
+	    fi
+
+	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+	  done
+	fi
+      fi
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      cmds=$reload_cmds
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	eval cmd=\"$cmd\"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $run eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	cmds=$reload_cmds
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+      fi
+
+      if test -n "$gentop"; then
+	$show "${rm}r $gentop"
+	$run ${rm}r $gentop
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+      esac
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+      fi
+
+      if test "$preload" = yes; then
+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+	   test "$dlopen_self_static" = unknown; then
+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+	fi
+      fi
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	;;
+      esac
+
+      case $host in
+      *darwin*)
+        # Don't allow lazy linking, it breaks C++ global constructors
+        if test "$tagname" = CXX ; then
+        compile_command="$compile_command ${wl}-bind_at_load"
+        finalize_command="$finalize_command ${wl}-bind_at_load"
+        fi
+        ;;
+      esac
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
+
+      dlsyms=
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	  dlsyms="${outputname}S.c"
+	else
+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+	fi
+      fi
+
+      if test -n "$dlsyms"; then
+	case $dlsyms in
+	"") ;;
+	*.c)
+	  # Discover the nlist of each of the dlfiles.
+	  nlist="$output_objdir/${outputname}.nm"
+
+	  $show "$rm $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Parse the name list into a source file.
+	  $show "creating $output_objdir/$dlsyms"
+
+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+	  if test "$dlself" = yes; then
+	    $show "generating symbol list for \`$output'"
+
+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+	    # Add our own program objects to the symbol list.
+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	    for arg in $progfiles; do
+	      $show "extracting global C symbols from \`$arg'"
+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	    done
+
+	    if test -n "$exclude_expsyms"; then
+	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    if test -n "$export_symbols_regex"; then
+	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    # Prepare the list of exported symbols
+	    if test -z "$export_symbols"; then
+	      export_symbols="$output_objdir/$output.exp"
+	      $run $rm $export_symbols
+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	    else
+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+	      $run eval 'mv "$nlist"T "$nlist"'
+	    fi
+	  fi
+
+	  for arg in $dlprefiles; do
+	    $show "extracting global C symbols from \`$arg'"
+	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+	    $run eval '$echo ": $name " >> "$nlist"'
+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -z "$run"; then
+	    # Make sure we have at least an empty file.
+	    test -f "$nlist" || : > "$nlist"
+
+	    if test -n "$exclude_expsyms"; then
+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	      $mv "$nlist"T "$nlist"
+	    fi
+
+	    # Try sorting and uniquifying the output.
+	    if grep -v "^: " < "$nlist" |
+		if sort -k 3 </dev/null >/dev/null 2>&1; then
+		  sort -k 3
+		else
+		  sort +2
+		fi |
+		uniq > "$nlist"S; then
+	      :
+	    else
+	      grep -v "^: " < "$nlist" > "$nlist"S
+	    fi
+
+	    if test -f "$nlist"S; then
+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+	    else
+	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	    fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+  {0, (lt_ptr) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	  fi
+
+	  pic_flag_for_symtable=
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+	    esac;;
+	  *-*-hpux*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag";;
+	    esac
+	  esac
+
+	  # Now compile the dynamic symbol file.
+	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+	  # Clean up the generated files.
+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Transform the symbol file into the correct name.
+	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+	  ;;
+	*)
+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+      else
+	# We keep going just in case the user didn't refer to
+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+	# really was required.
+
+	# Nullify the symbol file.
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      fi
+
+      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+	# Replace the output file specification.
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	$show "$link_command"
+	$run eval "$link_command"
+	status=$?
+
+	# Delete the generated files.
+	if test -n "$dlsyms"; then
+	  $show "$rm $output_objdir/${outputname}S.${objext}"
+	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	fi
+
+	exit $status
+      fi
+
+      if test -n "$shlibpath_var"; then
+	# We should set the shlibpath_var
+	rpath=
+	for dir in $temp_rpath; do
+	  case $dir in
+	  [\\/]* | [A-Za-z]:[\\/]*)
+	    # Absolute path.
+	    rpath="$rpath$dir:"
+	    ;;
+	  *)
+	    # Relative path: add a thisdir entry.
+	    rpath="$rpath\$thisdir/$dir:"
+	    ;;
+	  esac
+	done
+	temp_rpath="$rpath"
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$run $rm $output
+	# Link the executable and exit
+	$show "$link_command"
+	$run eval "$link_command" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      $show "$link_command"
+      $run eval "$link_command" || exit $?
+
+      # Now create the wrapper script.
+      $show "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Quote $echo for shipping.
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	esac
+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if our run command is non-null.
+      if test -z "$run"; then
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+	    cwrapper=`$echo ${output}.exe`
+	    $rm $cwrappersource $cwrapper
+	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    cat > $cwrappersource <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "/bin/sh $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat >> $cwrappersource<<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+#define HAVE_DOS_BASED_FILE_SYSTEM
+#ifndef DIR_SEPARATOR_2
+#define DIR_SEPARATOR_2 '\\'
+#endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+const char *program_name = NULL;
+
+void * xmalloc (size_t num);
+char * xstrdup (const char *string);
+char * basename (const char *name);
+char * fnqualify(const char *path);
+char * strendzap(char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int i;
+
+  program_name = (char *) xstrdup ((char *) basename (argv[0]));
+  newargz = XMALLOC(char *, argc+2);
+EOF
+
+	    cat >> $cwrappersource <<EOF
+  newargz[0] = "$SHELL";
+EOF
+
+	    cat >> $cwrappersource <<"EOF"
+  newargz[1] = fnqualify(argv[0]);
+  /* we know the script has the same name, without the .exe */
+  /* so make sure newargz[1] doesn't end in .exe */
+  strendzap(newargz[1],".exe");
+  for (i = 1; i < argc; i++)
+    newargz[i+1] = xstrdup(argv[i]);
+  newargz[argc+1] = NULL;
+EOF
+
+	    cat >> $cwrappersource <<EOF
+  execv("$SHELL",newargz);
+EOF
+
+	    cat >> $cwrappersource <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void * p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+;
+}
+
+char *
+basename (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha (name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return (char *) base;
+}
+
+char *
+fnqualify(const char *path)
+{
+  size_t size;
+  char *p;
+  char tmp[LT_PATHMAX + 1];
+
+  assert(path != NULL);
+
+  /* Is it qualified already? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha (path[0]) && path[1] == ':')
+    return xstrdup (path);
+#endif
+  if (IS_DIR_SEPARATOR (path[0]))
+    return xstrdup (path);
+
+  /* prepend the current directory */
+  /* doesn't handle '~' */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+  p = XMALLOC(char, size);
+  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+  return p;
+}
+
+char *
+strendzap(char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert(str != NULL);
+  assert(pat != NULL);
+
+  len = strlen(str);
+  patlen = strlen(pat);
+
+  if (patlen <= len)
+  {
+    str += len - patlen;
+    if (strcmp(str, pat) == 0)
+      *str = '\0';
+  }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char * mode,
+          const char * message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+EOF
+	  # we should really use a build-platform specific compiler
+	  # here, but OTOH, the wrappers (shell script and this C one)
+	  # are only useful if you want to execute the "real" binary.
+	  # Since the "real" binary is built for $host, then this
+	  # wrapper might as well be built for $host, too.
+	  $run $LTCC -s -o $cwrapper $cwrappersource
+	  ;;
+	esac
+	$rm $output
+	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+	$echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variable:
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$echo are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    echo=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$echo will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$echo >> $output "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $echo >> $output "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" || \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $mkdir \"\$progdir\"
+    else
+      $rm \"\$progdir/\$file\"
+    fi"
+
+	  $echo >> $output "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$echo \"\$relink_command_output\" >&2
+	$rm \"\$progdir/\$file\"
+	exit $EXIT_FAILURE
+      fi
+    fi
+
+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $rm \"\$progdir/\$program\";
+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $rm \"\$progdir/\$file\"
+  fi"
+	else
+	  $echo >> $output "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$echo >> $output "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $echo >> $output "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $echo >> $output "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$echo >> $output "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2*)
+	  $echo >> $output "\
+      exec \$progdir\\\\\$program \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $echo >> $output "\
+      exec \$progdir/\$program \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$echo >> $output "\
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      exit $EXIT_FAILURE
+    fi
+  else
+    # The program doesn't exist.
+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit $EXIT_FAILURE
+  fi
+fi\
+"
+	chmod +x $output
+      fi
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	$show "${rm}r $gentop"
+	$run ${rm}r "$gentop"
+	$show "$mkdir $gentop"
+	$run $mkdir "$gentop"
+	status=$?
+	if test "$status" -ne 0 && test ! -d "$gentop"; then
+	  exit $status
+	fi
+	generated="$generated $gentop"
+
+	# Add in members from convenience archives.
+	for xlib in $addlibs; do
+	  # Extract the objects.
+	  case $xlib in
+	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+	  *) xabs=`pwd`"/$xlib" ;;
+	  esac
+	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+	  xdir="$gentop/$xlib"
+
+	  $show "${rm}r $xdir"
+	  $run ${rm}r "$xdir"
+	  $show "$mkdir $xdir"
+	  $run $mkdir "$xdir"
+	  status=$?
+	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+	    exit $status
+	  fi
+	  # We will extract separately just the conflicting names and we will no
+	  # longer touch any unique names. It is faster to leave these extract
+	  # automatically by $AR in one run.
+	  $show "(cd $xdir && $AR x $xabs)"
+	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+	    :
+	  else
+	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+	    do
+	      i=1
+	      while test "$i" -le "$count"
+	      do
+	       # Put our $i before any first dot (extension)
+	       # Never overwrite any file
+	       name_to="$name"
+	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+	       do
+		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+	       done
+	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+	       i=`expr $i + 1`
+	      done
+	    done
+	  fi
+
+	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+	done
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+       cmds=$old_archive_from_new_cmds
+      else
+	eval cmds=\"$old_archive_cmds\"
+
+	if len=`expr "X$cmds" : ".*"` &&
+	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  $echo "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+	  # encoded into archives.  This makes 'ar r' malfunction in
+	  # this piecewise linking case whenever conflicting object
+	  # names appear in distinct ar calls; check, warn and compensate.
+	    if (for obj in $save_oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	    :
+	  else
+	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+	    AR_FLAGS=cq
+	  fi
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  for obj in $save_oldobjs
+	  do
+	    oldobjs="$objlist $obj"
+	    objlist="$objlist $obj"
+	    eval test_cmds=\"$old_archive_cmds\"
+	    if len=`expr "X$test_cmds" : ".*"` &&
+	       test "$len" -le "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+	        RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+        eval cmd=\"$cmd\"
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$generated"; then
+      $show "${rm}r$generated"
+      $run ${rm}r$generated
+    fi
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      $show "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+
+      # Only create the output if not a dry run.
+      if test -z "$run"; then
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		if test -z "$libdir"; then
+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		  exit $EXIT_FAILURE
+		fi
+		newdependency_libs="$newdependency_libs $libdir/$name"
+		;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit $EXIT_FAILURE
+	      fi
+	      newdlfiles="$newdlfiles $libdir/$name"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit $EXIT_FAILURE
+	      fi
+	      newdlprefiles="$newdlprefiles $libdir/$name"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlfiles="$newdlfiles $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlprefiles="$newdlprefiles $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $rm $output
+	  # place dlname in correct position for cygwin
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	  esac
+	  $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $echo >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      fi
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool install mode
+  install)
+    modename="$modename: install"
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+      # Aesthetically quote it.
+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$arg "
+      arg="$1"
+      shift
+    else
+      install_prog=
+      arg="$nonopt"
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+    case $arg in
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      arg="\"$arg\""
+      ;;
+    esac
+    install_prog="$install_prog$arg"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest="$arg"
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f) prev="-f" ;;
+      -g) prev="-g" ;;
+      -m) prev="-m" ;;
+      -o) prev="-o" ;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*) ;;
+
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest="$arg"
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$install_prog $arg"
+    done
+
+    if test -z "$install_prog"; then
+      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	$echo "$modename: no file or destination specified" 1>&2
+      else
+	$echo "$modename: you must specify a destination" 1>&2
+      fi
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Strip any trailing slash from the destination.
+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$destdir" = "X$dest" && destdir=.
+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files
+      if test "$#" -gt 2; then
+	$echo "$modename: \`$dest' is not a directory" 1>&2
+	$echo "$help" 1>&2
+	exit $EXIT_FAILURE
+      fi
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	library_names=
+	old_library=
+	relink_command=
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+	test "X$dir" = "X$file/" && dir=
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  $echo "$modename: warning: relinking \`$file'" 1>&2
+	  $show "$relink_command"
+	  if $run eval "$relink_command"; then :
+	  else
+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names
+	if test -n "$2"; then
+	  realname="$2"
+	  shift
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  $show "$install_prog $dir/$srcname $destdir/$realname"
+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+	  if test -n "$stripme" && test -n "$striplib"; then
+	    $show "$striplib $destdir/$realname"
+	    $run eval "$striplib $destdir/$realname" || exit $?
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    for linkname
+	    do
+	      if test "$linkname" != "$realname"; then
+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+	      fi
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  cmds=$postinstall_cmds
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+	fi
+
+	# Install the pseudo-library for information purposes.
+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "$install_prog $instname $destdir/$name"
+	$run eval "$install_prog $instname $destdir/$name" || exit $?
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	if test -n "$destfile"; then
+	  $show "$install_prog $file $destfile"
+	  $run eval "$install_prog $file $destfile" || exit $?
+	fi
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+	  $show "$install_prog $staticobj $staticdest"
+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      file=`$echo $file|${SED} 's,.exe$,,'`
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin*|*mingw*)
+	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  # To insure that "foo" is sourced, and not "foo.exe",
+	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+	  # which disallows the automatic-append-.exe behavior.
+	  case $build in
+	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+	  *) wrapperdot=${wrapper} ;;
+	  esac
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . ${wrapperdot} ;;
+	  *) . ./${wrapperdot} ;;
+	  esac
+
+	  # Check the variables that should have been set.
+	  if test -z "$notinst_deplibs"; then
+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      # If there is no directory component, then add one.
+	      case $lib in
+	      */* | *\\*) . $lib ;;
+	      *) . ./$lib ;;
+	      esac
+	    fi
+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  # To insure that "foo" is sourced, and not "foo.exe",
+	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+	  # which disallows the automatic-append-.exe behavior.
+	  case $build in
+	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+	  *) wrapperdot=${wrapper} ;;
+	  esac
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . ${wrapperdot} ;;
+	  *) . ./${wrapperdot} ;;
+	  esac
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    if test "$finalize" = yes && test -z "$run"; then
+	      tmpdir="/tmp"
+	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+	      tmpdir="$tmpdir/libtool-$$"
+	      save_umask=`umask`
+	      umask 0077
+	      if $mkdir "$tmpdir"; then
+	        umask $save_umask
+	      else
+	        umask $save_umask
+		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+		continue
+	      fi
+	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+	      outputname="$tmpdir/$file"
+	      # Replace the output file specification.
+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+	      $show "$relink_command"
+	      if $run eval "$relink_command"; then :
+	      else
+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+		${rm}r "$tmpdir"
+		continue
+	      fi
+	      file="$outputname"
+	    else
+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+	    fi
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyways
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+	    ;;
+	  esac
+	  ;;
+	esac
+	$show "$install_prog$stripme $file $destfile"
+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+	test -n "$outputname" && ${rm}r "$tmpdir"
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      $show "$install_prog $file $oldlib"
+      $run eval "$install_prog \$file \$oldlib" || exit $?
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	$show "$old_striplib $oldlib"
+	$run eval "$old_striplib $oldlib" || exit $?
+      fi
+
+      # Do each command in the postinstall commands.
+      cmds=$old_postinstall_cmds
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	eval cmd=\"$cmd\"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$future_libdirs"; then
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+    fi
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      test -n "$run" && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+    ;;
+
+  # libtool finish mode
+  finish)
+    modename="$modename: finish"
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  cmds=$finish_cmds
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
+	    $show "$cmd"
+	    $run eval "$cmd" || admincmds="$admincmds
+       $cmd"
+	  done
+	  IFS="$save_ifs"
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $run eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    test "$show" = : && exit $EXIT_SUCCESS
+
+    $echo "----------------------------------------------------------------------"
+    $echo "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $echo "   $libdir"
+    done
+    $echo
+    $echo "If you ever happen to want to link against installed libraries"
+    $echo "in a given directory, LIBDIR, you must either use libtool, and"
+    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $echo "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $echo "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $echo "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      $echo "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $echo "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $echo
+    $echo "See any operating system documentation about shared libraries for"
+    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+    $echo "----------------------------------------------------------------------"
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool execute mode
+  execute)
+    modename="$modename: execute"
+
+    # The first argument is the command name.
+    cmd="$nonopt"
+    if test -z "$cmd"; then
+      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$help"
+      exit $EXIT_FAILURE
+    fi
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      if test ! -f "$file"; then
+	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$help" 1>&2
+	exit $EXIT_FAILURE
+      fi
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+	;;
+
+      *)
+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
+
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+      args="$args \"$file\""
+    done
+
+    if test -z "$run"; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+	$echo "export $shlibpath_var"
+      fi
+      $echo "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+    ;;
+
+  # libtool clean and uninstall mode
+  clean | uninstall)
+    modename="$modename: $mode"
+    rm="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) rm="$rm $arg"; rmforce=yes ;;
+      -*) rm="$rm $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    if test -z "$rm"; then
+      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    rmdirs=
+
+    origobjdir="$objdir"
+    for file in $files; do
+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$dir" = "X$file"; then
+	dir=.
+	objdir="$origobjdir"
+      else
+	objdir="$dir/$origobjdir"
+      fi
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      test "$mode" = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
+	case " $rmdirs " in
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if (test -L "$file") >/dev/null 2>&1 \
+	|| (test -h "$file") >/dev/null 2>&1 \
+	|| test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  . $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $objdir/$n"
+	  done
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+	  if test "$mode" = uninstall; then
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      cmds=$postuninstall_cmds
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      cmds=$old_postuninstall_cmds
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+
+	  # Read the .lo file
+	  . $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      $show "$rm $rmfiles"
+      $run $rm $rmfiles || exit_status=1
+    done
+    objdir="$origobjdir"
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	$show "rmdir $dir"
+	$run rmdir $dir >/dev/null 2>&1
+      fi
+    done
+
+    exit $exit_status
+    ;;
+
+  "")
+    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+    ;;
+  esac
+
+  if test -z "$exec_cmd"; then
+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+fi # test -z "$show_help"
+
+if test -n "$exec_cmd"; then
+  eval exec $exec_cmd
+  exit $EXIT_FAILURE
+fi
+
+# We need to display help for each of the modes.
+case $mode in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+    --config          show all configuration variables
+    --debug           enable verbose shell tracing
+-n, --dry-run         display commands without modifying any files
+    --features        display basic configuration information and exit
+    --finish          same as \`--mode=finish'
+    --help            display this help message and exit
+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
+    --tag=TAG         use configuration variables from tag TAG
+    --version         print version information
+
+MODE must be one of the following:
+
+      clean           remove files from the build directory
+      compile         compile a source file into a libtool object
+      execute         automatically set library path, then run a program
+      finish          complete the installation of libtool libraries
+      install         install libraries or executables
+      link            create a library or an executable
+      uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool@gnu.org>."
+  exit $EXIT_SUCCESS
+  ;;
+
+clean)
+  $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+compile)
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -static           always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+  ;;
+
+execute)
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+  ;;
+
+finish)
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+  ;;
+
+install)
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+  ;;
+
+link)
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+		    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+		    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -static           do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+		    specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+  ;;
+
+uninstall)
+  $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+*)
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$help" 1>&2
+  exit $EXIT_FAILURE
+  ;;
+esac
+
+$echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit $EXIT_SUCCESS
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/config/missing b/config/missing
new file mode 100755
index 000000000..894e786e1
--- /dev/null
+++ b/config/missing
@@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+#   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
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, 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., 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
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  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]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # 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.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    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.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/config/mkinstalldirs b/config/mkinstalldirs
new file mode 100755
index 000000000..259dbfcd3
--- /dev/null
+++ b/config/mkinstalldirs
@@ -0,0 +1,158 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+
+scriptversion=2005-06-29.22
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+errstatus=0
+dirmode=
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage"
+      exit $?
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit $?
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
+case $dirmode in
+  '')
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
+    fi
+    ;;
+esac
+
+for file
+do
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
+  shift
+  IFS=$oIFS
+
+  for d
+  do
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+	errstatus=$lasterr
+      else
+	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+	  lasterr=
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
+      fi
+    fi
+
+    pathcomp=$pathcomp/
+  done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/config/texinfo.tex b/config/texinfo.tex
new file mode 100644
index 000000000..ff2c40654
--- /dev/null
+++ b/config/texinfo.tex
@@ -0,0 +1,7210 @@
+% texinfo.tex -- TeX macros to handle Texinfo files.
+%
+% Load plain if necessary, i.e., if running under initex.
+\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
+%
+\def\texinfoversion{2005-07-05.19}
+%
+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+% Foundation, Inc.
+%
+% This texinfo.tex file 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, or (at
+% your option) any later version.
+%
+% This texinfo.tex file 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 texinfo.tex file; see the file COPYING.  If not, write
+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+%
+% As a special exception, when this file is read by TeX when processing
+% a Texinfo source document, you may use the result without
+% restriction.  (This has been our intent since Texinfo was invented.)
+%
+% Please try the latest version of texinfo.tex before submitting bug
+% reports; you can get the latest version from:
+%   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
+%   ftp://tug.org/tex/texinfo.tex
+%     (and all CTAN mirrors, see http://www.ctan.org).
+% The texinfo.tex in any given distribution could well be out
+% of date, so if that's what you're using, please check.
+%
+% Send bug reports to bug-texinfo@gnu.org.  Please include including a
+% complete document in each bug report with which we can reproduce the
+% problem.  Patches are, of course, greatly appreciated.
+%
+% To process a Texinfo manual with TeX, it's most reliable to use the
+% texi2dvi shell script that comes with the distribution.  For a simple
+% manual foo.texi, however, you can get away with this:
+%   tex foo.texi
+%   texindex foo.??
+%   tex foo.texi
+%   tex foo.texi
+%   dvips foo.dvi -o  # or whatever; this makes foo.ps.
+% The extra TeX runs get the cross-reference information correct.
+% Sometimes one run after texindex suffices, and sometimes you need more
+% than two; texi2dvi does it as many times as necessary.
+%
+% It is possible to adapt texinfo.tex for other languages, to some
+% extent.  You can get the existing language-specific files from the
+% full Texinfo distribution.
+%
+% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
+
+
+\message{Loading texinfo [version \texinfoversion]:}
+
+% If in a .fmt file, print the version number
+% and turn on active characters that we couldn't do earlier because
+% they might have appeared in the input file name.
+\everyjob{\message{[Texinfo version \texinfoversion]}%
+  \catcode`+=\active \catcode`\_=\active}
+
+\message{Basics,}
+\chardef\other=12
+
+% We never want plain's \outer definition of \+ in Texinfo.
+% For @tex, we can use \tabalign.
+\let\+ = \relax
+
+% Save some plain tex macros whose names we will redefine.
+\let\ptexb=\b
+\let\ptexbullet=\bullet
+\let\ptexc=\c
+\let\ptexcomma=\,
+\let\ptexdot=\.
+\let\ptexdots=\dots
+\let\ptexend=\end
+\let\ptexequiv=\equiv
+\let\ptexexclam=\!
+\let\ptexfootnote=\footnote
+\let\ptexgtr=>
+\let\ptexhat=^
+\let\ptexi=\i
+\let\ptexindent=\indent
+\let\ptexinsert=\insert
+\let\ptexlbrace=\{
+\let\ptexless=<
+\let\ptexnewwrite\newwrite
+\let\ptexnoindent=\noindent
+\let\ptexplus=+
+\let\ptexrbrace=\}
+\let\ptexslash=\/
+\let\ptexstar=\*
+\let\ptext=\t
+
+% If this character appears in an error message or help string, it
+% starts a new line in the output.
+\newlinechar = `^^J
+
+% Use TeX 3.0's \inputlineno to get the line number, for better error
+% messages, but if we're using an old version of TeX, don't do anything.
+%
+\ifx\inputlineno\thisisundefined
+  \let\linenumber = \empty % Pre-3.0.
+\else
+  \def\linenumber{l.\the\inputlineno:\space}
+\fi
+
+% Set up fixed words for English if not already set.
+\ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
+\ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
+\ifx\putwordfile\undefined      \gdef\putwordfile{file}\fi
+\ifx\putwordin\undefined        \gdef\putwordin{in}\fi
+\ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
+\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
+\ifx\putwordInfo\undefined      \gdef\putwordInfo{Info}\fi
+\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
+\ifx\putwordMethodon\undefined  \gdef\putwordMethodon{Method on}\fi
+\ifx\putwordNoTitle\undefined   \gdef\putwordNoTitle{No Title}\fi
+\ifx\putwordof\undefined        \gdef\putwordof{of}\fi
+\ifx\putwordon\undefined        \gdef\putwordon{on}\fi
+\ifx\putwordpage\undefined      \gdef\putwordpage{page}\fi
+\ifx\putwordsection\undefined   \gdef\putwordsection{section}\fi
+\ifx\putwordSection\undefined   \gdef\putwordSection{Section}\fi
+\ifx\putwordsee\undefined       \gdef\putwordsee{see}\fi
+\ifx\putwordSee\undefined       \gdef\putwordSee{See}\fi
+\ifx\putwordShortTOC\undefined  \gdef\putwordShortTOC{Short Contents}\fi
+\ifx\putwordTOC\undefined       \gdef\putwordTOC{Table of Contents}\fi
+%
+\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
+\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
+\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
+\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi
+\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi
+\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi
+\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi
+\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi
+\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi
+\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi
+\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi
+\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi
+%
+\ifx\putwordDefmac\undefined    \gdef\putwordDefmac{Macro}\fi
+\ifx\putwordDefspec\undefined   \gdef\putwordDefspec{Special Form}\fi
+\ifx\putwordDefvar\undefined    \gdef\putwordDefvar{Variable}\fi
+\ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
+\ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
+
+% In some macros, we cannot use the `\? notation---the left quote is
+% in some cases the escape char.
+\chardef\backChar  = `\\
+\chardef\colonChar = `\:
+\chardef\commaChar = `\,
+\chardef\dotChar   = `\.
+\chardef\exclamChar= `\!
+\chardef\plusChar  = `\+
+\chardef\questChar = `\?
+\chardef\semiChar  = `\;
+\chardef\underChar = `\_
+
+\chardef\spaceChar = `\ %
+\chardef\spacecat = 10
+\def\spaceisspace{\catcode\spaceChar=\spacecat}
+
+{% for help with debugging.
+ % example usage: \expandafter\show\activebackslash
+ \catcode`\! = 0 \catcode`\\ = \active
+ !global!def!activebackslash{\}
+}
+
+% Ignore a token.
+%
+\def\gobble#1{}
+
+% The following is used inside several \edef's.
+\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
+
+% Hyphenation fixes.
+\hyphenation{
+  Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
+  ap-pen-dix bit-map bit-maps
+  data-base data-bases eshell fall-ing half-way long-est man-u-script
+  man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
+  par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
+  spell-ing spell-ings
+  stand-alone strong-est time-stamp time-stamps which-ever white-space
+  wide-spread wrap-around
+}
+
+% Margin to add to right of even pages, to left of odd pages.
+\newdimen\bindingoffset
+\newdimen\normaloffset
+\newdimen\pagewidth \newdimen\pageheight
+
+% For a final copy, take out the rectangles
+% that mark overfull boxes (in case you have decided
+% that the text looks ok even though it passes the margin).
+%
+\def\finalout{\overfullrule=0pt}
+
+% @| inserts a changebar to the left of the current line.  It should
+% surround any changed text.  This approach does *not* work if the
+% change spans more than two lines of output.  To handle that, we would
+% have adopt a much more difficult approach (putting marks into the main
+% vertical list for the beginning and end of each change).
+%
+\def\|{%
+  % \vadjust can only be used in horizontal mode.
+  \leavevmode
+  %
+  % Append this vertical mode material after the current line in the output.
+  \vadjust{%
+    % We want to insert a rule with the height and depth of the current
+    % leading; that is exactly what \strutbox is supposed to record.
+    \vskip-\baselineskip
+    %
+    % \vadjust-items are inserted at the left edge of the type.  So
+    % the \llap here moves out into the left-hand margin.
+    \llap{%
+      %
+      % For a thicker or thinner bar, change the `1pt'.
+      \vrule height\baselineskip width1pt
+      %
+      % This is the space between the bar and the text.
+      \hskip 12pt
+    }%
+  }%
+}
+
+% Sometimes it is convenient to have everything in the transcript file
+% and nothing on the terminal.  We don't just call \tracingall here,
+% since that produces some useless output on the terminal.  We also make
+% some effort to order the tracing commands to reduce output in the log
+% file; cf. trace.sty in LaTeX.
+%
+\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
+\def\loggingall{%
+  \tracingstats2
+  \tracingpages1
+  \tracinglostchars2  % 2 gives us more in etex
+  \tracingparagraphs1
+  \tracingoutput1
+  \tracingmacros2
+  \tracingrestores1
+  \showboxbreadth\maxdimen \showboxdepth\maxdimen
+  \ifx\eTeXversion\undefined\else % etex gives us more logging
+    \tracingscantokens1
+    \tracingifs1
+    \tracinggroups1
+    \tracingnesting2
+    \tracingassigns1
+  \fi
+  \tracingcommands3  % 3 gives us more in etex
+  \errorcontextlines16
+}%
+
+% add check for \lastpenalty to plain's definitions.  If the last thing
+% we did was a \nobreak, we don't want to insert more space.
+%
+\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
+  \removelastskip\penalty-50\smallskip\fi\fi}
+\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
+  \removelastskip\penalty-100\medskip\fi\fi}
+\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
+  \removelastskip\penalty-200\bigskip\fi\fi}
+
+% For @cropmarks command.
+% Do @cropmarks to get crop marks.
+%
+\newif\ifcropmarks
+\let\cropmarks = \cropmarkstrue
+%
+% Dimensions to add cropmarks at corners.
+% Added by P. A. MacKay, 12 Nov. 1986
+%
+\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
+\newdimen\cornerlong  \cornerlong=1pc
+\newdimen\cornerthick \cornerthick=.3pt
+\newdimen\topandbottommargin \topandbottommargin=.75in
+
+% Main output routine.
+\chardef\PAGE = 255
+\output = {\onepageout{\pagecontents\PAGE}}
+
+\newbox\headlinebox
+\newbox\footlinebox
+
+% \onepageout takes a vbox as an argument.  Note that \pagecontents
+% does insertions, but you have to call it yourself.
+\def\onepageout#1{%
+  \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
+  %
+  \ifodd\pageno  \advance\hoffset by \bindingoffset
+  \else \advance\hoffset by -\bindingoffset\fi
+  %
+  % Do this outside of the \shipout so @code etc. will be expanded in
+  % the headline as they should be, not taken literally (outputting ''code).
+  \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+  \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
+  %
+  {%
+    % Have to do this stuff outside the \shipout because we want it to
+    % take effect in \write's, yet the group defined by the \vbox ends
+    % before the \shipout runs.
+    %
+    \indexdummies         % don't expand commands in the output.
+    \shipout\vbox{%
+      % Do this early so pdf references go to the beginning of the page.
+      \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
+      %
+      \ifcropmarks \vbox to \outervsize\bgroup
+        \hsize = \outerhsize
+        \vskip-\topandbottommargin
+        \vtop to0pt{%
+          \line{\ewtop\hfil\ewtop}%
+          \nointerlineskip
+          \line{%
+            \vbox{\moveleft\cornerthick\nstop}%
+            \hfill
+            \vbox{\moveright\cornerthick\nstop}%
+          }%
+          \vss}%
+        \vskip\topandbottommargin
+        \line\bgroup
+          \hfil % center the page within the outer (page) hsize.
+          \ifodd\pageno\hskip\bindingoffset\fi
+          \vbox\bgroup
+      \fi
+      %
+      \unvbox\headlinebox
+      \pagebody{#1}%
+      \ifdim\ht\footlinebox > 0pt
+        % Only leave this space if the footline is nonempty.
+        % (We lessened \vsize for it in \oddfootingxxx.)
+        % The \baselineskip=24pt in plain's \makefootline has no effect.
+        \vskip 2\baselineskip
+        \unvbox\footlinebox
+      \fi
+      %
+      \ifcropmarks
+          \egroup % end of \vbox\bgroup
+        \hfil\egroup % end of (centering) \line\bgroup
+        \vskip\topandbottommargin plus1fill minus1fill
+        \boxmaxdepth = \cornerthick
+        \vbox to0pt{\vss
+          \line{%
+            \vbox{\moveleft\cornerthick\nsbot}%
+            \hfill
+            \vbox{\moveright\cornerthick\nsbot}%
+          }%
+          \nointerlineskip
+          \line{\ewbot\hfil\ewbot}%
+        }%
+      \egroup % \vbox from first cropmarks clause
+      \fi
+    }% end of \shipout\vbox
+  }% end of group with \indexdummies
+  \advancepageno
+  \ifnum\outputpenalty>-20000 \else\dosupereject\fi
+}
+
+\newinsert\margin \dimen\margin=\maxdimen
+
+\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
+{\catcode`\@ =11
+\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
+% marginal hacks, juha@viisa.uucp (Juha Takala)
+\ifvoid\margin\else % marginal info is present
+  \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
+\dimen@=\dp#1 \unvbox#1
+\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
+\ifr@ggedbottom \kern-\dimen@ \vfil \fi}
+}
+
+% Here are the rules for the cropmarks.  Note that they are
+% offset so that the space between them is truly \outerhsize or \outervsize
+% (P. A. MacKay, 12 November, 1986)
+%
+\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
+\def\nstop{\vbox
+  {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
+\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
+\def\nsbot{\vbox
+  {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
+
+% Parse an argument, then pass it to #1.  The argument is the rest of
+% the input line (except we remove a trailing comment).  #1 should be a
+% macro which expects an ordinary undelimited TeX argument.
+%
+\def\parsearg{\parseargusing{}}
+\def\parseargusing#1#2{%
+  \def\next{#2}%
+  \begingroup
+    \obeylines
+    \spaceisspace
+    #1%
+    \parseargline\empty% Insert the \empty token, see \finishparsearg below.
+}
+
+{\obeylines %
+  \gdef\parseargline#1^^M{%
+    \endgroup % End of the group started in \parsearg.
+    \argremovecomment #1\comment\ArgTerm%
+  }%
+}
+
+% First remove any @comment, then any @c comment.
+\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
+\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
+
+% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
+%
+% \argremovec might leave us with trailing space, e.g.,
+%    @end itemize  @c foo
+% This space token undergoes the same procedure and is eventually removed
+% by \finishparsearg.
+%
+\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
+\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
+\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
+  \def\temp{#3}%
+  \ifx\temp\empty
+    % We cannot use \next here, as it holds the macro to run;
+    % thus we reuse \temp.
+    \let\temp\finishparsearg
+  \else
+    \let\temp\argcheckspaces
+  \fi
+  % Put the space token in:
+  \temp#1 #3\ArgTerm
+}
+
+% If a _delimited_ argument is enclosed in braces, they get stripped; so
+% to get _exactly_ the rest of the line, we had to prevent such situation.
+% We prepended an \empty token at the very beginning and we expand it now,
+% just before passing the control to \next.
+% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
+% either the null string, or it ends with \^^M---thus there is no danger
+% that a pair of braces would be stripped.
+%
+% But first, we have to remove the trailing space token.
+%
+\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
+
+% \parseargdef\foo{...}
+%	is roughly equivalent to
+% \def\foo{\parsearg\Xfoo}
+% \def\Xfoo#1{...}
+%
+% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
+% favourite TeX trick.  --kasal, 16nov03
+
+\def\parseargdef#1{%
+  \expandafter \doparseargdef \csname\string#1\endcsname #1%
+}
+\def\doparseargdef#1#2{%
+  \def#2{\parsearg#1}%
+  \def#1##1%
+}
+
+% Several utility definitions with active space:
+{
+  \obeyspaces
+  \gdef\obeyedspace{ }
+
+  % Make each space character in the input produce a normal interword
+  % space in the output.  Don't allow a line break at this space, as this
+  % is used only in environments like @example, where each line of input
+  % should produce a line of output anyway.
+  %
+  \gdef\sepspaces{\obeyspaces\let =\tie}
+
+  % If an index command is used in an @example environment, any spaces
+  % therein should become regular spaces in the raw index file, not the
+  % expansion of \tie (\leavevmode \penalty \@M \ ).
+  \gdef\unsepspaces{\let =\space}
+}
+
+
+\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
+
+% Define the framework for environments in texinfo.tex.  It's used like this:
+%
+%   \envdef\foo{...}
+%   \def\Efoo{...}
+%
+% It's the responsibility of \envdef to insert \begingroup before the
+% actual body; @end closes the group after calling \Efoo.  \envdef also
+% defines \thisenv, so the current environment is known; @end checks
+% whether the environment name matches.  The \checkenv macro can also be
+% used to check whether the current environment is the one expected.
+%
+% Non-false conditionals (@iftex, @ifset) don't fit into this, so they
+% are not treated as enviroments; they don't open a group.  (The
+% implementation of @end takes care not to call \endgroup in this
+% special case.)
+
+
+% At runtime, environments start with this:
+\def\startenvironment#1{\begingroup\def\thisenv{#1}}
+% initialize
+\let\thisenv\empty
+
+% ... but they get defined via ``\envdef\foo{...}'':
+\long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
+\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
+
+% Check whether we're in the right environment:
+\def\checkenv#1{%
+  \def\temp{#1}%
+  \ifx\thisenv\temp
+  \else
+    \badenverr
+  \fi
+}
+
+% Evironment mismatch, #1 expected:
+\def\badenverr{%
+  \errhelp = \EMsimple
+  \errmessage{This command can appear only \inenvironment\temp,
+    not \inenvironment\thisenv}%
+}
+\def\inenvironment#1{%
+  \ifx#1\empty
+    out of any environment%
+  \else
+    in environment \expandafter\string#1%
+  \fi
+}
+
+% @end foo executes the definition of \Efoo.
+% But first, it executes a specialized version of \checkenv
+%
+\parseargdef\end{%
+  \if 1\csname iscond.#1\endcsname
+  \else
+    % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
+    \expandafter\checkenv\csname#1\endcsname
+    \csname E#1\endcsname
+    \endgroup
+  \fi
+}
+
+\newhelp\EMsimple{Press RETURN to continue.}
+
+
+%% Simple single-character @ commands
+
+% @@ prints an @
+% Kludge this until the fonts are right (grr).
+\def\@{{\tt\char64}}
+
+% This is turned off because it was never documented
+% and you can use @w{...} around a quote to suppress ligatures.
+%% Define @` and @' to be the same as ` and '
+%% but suppressing ligatures.
+%\def\`{{`}}
+%\def\'{{'}}
+
+% Used to generate quoted braces.
+\def\mylbrace {{\tt\char123}}
+\def\myrbrace {{\tt\char125}}
+\let\{=\mylbrace
+\let\}=\myrbrace
+\begingroup
+  % Definitions to produce \{ and \} commands for indices,
+  % and @{ and @} for the aux/toc files.
+  \catcode`\{ = \other \catcode`\} = \other
+  \catcode`\[ = 1 \catcode`\] = 2
+  \catcode`\! = 0 \catcode`\\ = \other
+  !gdef!lbracecmd[\{]%
+  !gdef!rbracecmd[\}]%
+  !gdef!lbraceatcmd[@{]%
+  !gdef!rbraceatcmd[@}]%
+!endgroup
+
+% @comma{} to avoid , parsing problems.
+\let\comma = ,
+
+% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
+% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
+\let\, = \c
+\let\dotaccent = \.
+\def\ringaccent#1{{\accent23 #1}}
+\let\tieaccent = \t
+\let\ubaraccent = \b
+\let\udotaccent = \d
+
+% Other special characters: @questiondown @exclamdown @ordf @ordm
+% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
+\def\questiondown{?`}
+\def\exclamdown{!`}
+\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
+\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
+
+% Dotless i and dotless j, used for accents.
+\def\imacro{i}
+\def\jmacro{j}
+\def\dotless#1{%
+  \def\temp{#1}%
+  \ifx\temp\imacro \ptexi
+  \else\ifx\temp\jmacro \j
+  \else \errmessage{@dotless can be used only with i or j}%
+  \fi\fi
+}
+
+% The \TeX{} logo, as in plain, but resetting the spacing so that a
+% period following counts as ending a sentence.  (Idea found in latex.)
+%
+\edef\TeX{\TeX \spacefactor=1000 }
+
+% @LaTeX{} logo.  Not quite the same results as the definition in
+% latex.ltx, since we use a different font for the raised A; it's most
+% convenient for us to use an explicitly smaller font, rather than using
+% the \scriptstyle font (since we don't reset \scriptstyle and
+% \scriptscriptstyle).
+%
+\def\LaTeX{%
+  L\kern-.36em
+  {\setbox0=\hbox{T}%
+   \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
+  \kern-.15em
+  \TeX
+}
+
+% Be sure we're in horizontal mode when doing a tie, since we make space
+% equivalent to this in @example-like environments. Otherwise, a space
+% at the beginning of a line will start with \penalty -- and
+% since \penalty is valid in vertical mode, we'd end up putting the
+% penalty on the vertical list instead of in the new paragraph.
+{\catcode`@ = 11
+ % Avoid using \@M directly, because that causes trouble
+ % if the definition is written into an index file.
+ \global\let\tiepenalty = \@M
+ \gdef\tie{\leavevmode\penalty\tiepenalty\ }
+}
+
+% @: forces normal size whitespace following.
+\def\:{\spacefactor=1000 }
+
+% @* forces a line break.
+\def\*{\hfil\break\hbox{}\ignorespaces}
+
+% @/ allows a line break.
+\let\/=\allowbreak
+
+% @. is an end-of-sentence period.
+\def\.{.\spacefactor=\endofsentencespacefactor\space}
+
+% @! is an end-of-sentence bang.
+\def\!{!\spacefactor=\endofsentencespacefactor\space}
+
+% @? is an end-of-sentence query.
+\def\?{?\spacefactor=\endofsentencespacefactor\space}
+
+% @frenchspacing on|off  says whether to put extra space after punctuation.
+% 
+\def\onword{on}
+\def\offword{off}
+%
+\parseargdef\frenchspacing{%
+  \def\temp{#1}%
+  \ifx\temp\onword \plainfrenchspacing
+  \else\ifx\temp\offword \plainnonfrenchspacing
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
+  \fi\fi
+}
+
+% @w prevents a word break.  Without the \leavevmode, @w at the
+% beginning of a paragraph, when TeX is still in vertical mode, would
+% produce a whole line of output instead of starting the paragraph.
+\def\w#1{\leavevmode\hbox{#1}}
+
+% @group ... @end group forces ... to be all on one page, by enclosing
+% it in a TeX vbox.  We use \vtop instead of \vbox to construct the box
+% to keep its height that of a normal line.  According to the rules for
+% \topskip (p.114 of the TeXbook), the glue inserted is
+% max (\topskip - \ht (first item), 0).  If that height is large,
+% therefore, no glue is inserted, and the space between the headline and
+% the text is small, which looks bad.
+%
+% Another complication is that the group might be very large.  This can
+% cause the glue on the previous page to be unduly stretched, because it
+% does not have much material.  In this case, it's better to add an
+% explicit \vfill so that the extra space is at the bottom.  The
+% threshold for doing this is if the group is more than \vfilllimit
+% percent of a page (\vfilllimit can be changed inside of @tex).
+%
+\newbox\groupbox
+\def\vfilllimit{0.7}
+%
+\envdef\group{%
+  \ifnum\catcode`\^^M=\active \else
+    \errhelp = \groupinvalidhelp
+    \errmessage{@group invalid in context where filling is enabled}%
+  \fi
+  \startsavinginserts
+  %
+  \setbox\groupbox = \vtop\bgroup
+    % Do @comment since we are called inside an environment such as
+    % @example, where each end-of-line in the input causes an
+    % end-of-line in the output.  We don't want the end-of-line after
+    % the `@group' to put extra space in the output.  Since @group
+    % should appear on a line by itself (according to the Texinfo
+    % manual), we don't worry about eating any user text.
+    \comment
+}
+%
+% The \vtop produces a box with normal height and large depth; thus, TeX puts
+% \baselineskip glue before it, and (when the next line of text is done)
+% \lineskip glue after it.  Thus, space below is not quite equal to space
+% above.  But it's pretty close.
+\def\Egroup{%
+    % To get correct interline space between the last line of the group
+    % and the first line afterwards, we have to propagate \prevdepth.
+    \endgraf % Not \par, as it may have been set to \lisppar.
+    \global\dimen1 = \prevdepth
+  \egroup           % End the \vtop.
+  % \dimen0 is the vertical size of the group's box.
+  \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
+  % \dimen2 is how much space is left on the page (more or less).
+  \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
+  % if the group doesn't fit on the current page, and it's a big big
+  % group, force a page break.
+  \ifdim \dimen0 > \dimen2
+    \ifdim \pagetotal < \vfilllimit\pageheight
+      \page
+    \fi
+  \fi
+  \box\groupbox
+  \prevdepth = \dimen1
+  \checkinserts
+}
+%
+% TeX puts in an \escapechar (i.e., `@') at the beginning of the help
+% message, so this ends up printing `@group can only ...'.
+%
+\newhelp\groupinvalidhelp{%
+group can only be used in environments such as @example,^^J%
+where each line of input produces a line of output.}
+
+% @need space-in-mils
+% forces a page break if there is not space-in-mils remaining.
+
+\newdimen\mil  \mil=0.001in
+
+% Old definition--didn't work.
+%\parseargdef\need{\par %
+%% This method tries to make TeX break the page naturally
+%% if the depth of the box does not fit.
+%{\baselineskip=0pt%
+%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
+%\prevdepth=-1000pt
+%}}
+
+\parseargdef\need{%
+  % Ensure vertical mode, so we don't make a big box in the middle of a
+  % paragraph.
+  \par
+  %
+  % If the @need value is less than one line space, it's useless.
+  \dimen0 = #1\mil
+  \dimen2 = \ht\strutbox
+  \advance\dimen2 by \dp\strutbox
+  \ifdim\dimen0 > \dimen2
+    %
+    % Do a \strut just to make the height of this box be normal, so the
+    % normal leading is inserted relative to the preceding line.
+    % And a page break here is fine.
+    \vtop to #1\mil{\strut\vfil}%
+    %
+    % TeX does not even consider page breaks if a penalty added to the
+    % main vertical list is 10000 or more.  But in order to see if the
+    % empty box we just added fits on the page, we must make it consider
+    % page breaks.  On the other hand, we don't want to actually break the
+    % page after the empty box.  So we use a penalty of 9999.
+    %
+    % There is an extremely small chance that TeX will actually break the
+    % page at this \penalty, if there are no other feasible breakpoints in
+    % sight.  (If the user is using lots of big @group commands, which
+    % almost-but-not-quite fill up a page, TeX will have a hard time doing
+    % good page breaking, for example.)  However, I could not construct an
+    % example where a page broke at this \penalty; if it happens in a real
+    % document, then we can reconsider our strategy.
+    \penalty9999
+    %
+    % Back up by the size of the box, whether we did a page break or not.
+    \kern -#1\mil
+    %
+    % Do not allow a page break right after this kern.
+    \nobreak
+  \fi
+}
+
+% @br   forces paragraph break (and is undocumented).
+
+\let\br = \par
+
+% @page forces the start of a new page.
+%
+\def\page{\par\vfill\supereject}
+
+% @exdent text....
+% outputs text on separate line in roman font, starting at standard page margin
+
+% This records the amount of indent in the innermost environment.
+% That's how much \exdent should take out.
+\newskip\exdentamount
+
+% This defn is used inside fill environments such as @defun.
+\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}
+
+% This defn is used inside nofill environments such as @example.
+\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount
+  \leftline{\hskip\leftskip{\rm#1}}}}
+
+% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
+% paragraph.  For more general purposes, use the \margin insertion
+% class.  WHICH is `l' or `r'.
+%
+\newskip\inmarginspacing \inmarginspacing=1cm
+\def\strutdepth{\dp\strutbox}
+%
+\def\doinmargin#1#2{\strut\vadjust{%
+  \nobreak
+  \kern-\strutdepth
+  \vtop to \strutdepth{%
+    \baselineskip=\strutdepth
+    \vss
+    % if you have multiple lines of stuff to put here, you'll need to
+    % make the vbox yourself of the appropriate size.
+    \ifx#1l%
+      \llap{\ignorespaces #2\hskip\inmarginspacing}%
+    \else
+      \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
+    \fi
+    \null
+  }%
+}}
+\def\inleftmargin{\doinmargin l}
+\def\inrightmargin{\doinmargin r}
+%
+% @inmargin{TEXT [, RIGHT-TEXT]}
+% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
+% else use TEXT for both).
+%
+\def\inmargin#1{\parseinmargin #1,,\finish}
+\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
+  \setbox0 = \hbox{\ignorespaces #2}%
+  \ifdim\wd0 > 0pt
+    \def\lefttext{#1}%  have both texts
+    \def\righttext{#2}%
+  \else
+    \def\lefttext{#1}%  have only one text
+    \def\righttext{#1}%
+  \fi
+  %
+  \ifodd\pageno
+    \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin
+  \else
+    \def\temp{\inleftmargin\lefttext}%
+  \fi
+  \temp
+}
+
+% @include file    insert text of that file as input.
+%
+\def\include{\parseargusing\filenamecatcodes\includezzz}
+\def\includezzz#1{%
+  \pushthisfilestack
+  \def\thisfile{#1}%
+  {%
+    \makevalueexpandable
+    \def\temp{\input #1 }%
+    \expandafter
+  }\temp
+  \popthisfilestack
+}
+\def\filenamecatcodes{%
+  \catcode`\\=\other
+  \catcode`~=\other
+  \catcode`^=\other
+  \catcode`_=\other
+  \catcode`|=\other
+  \catcode`<=\other
+  \catcode`>=\other
+  \catcode`+=\other
+  \catcode`-=\other
+}
+
+\def\pushthisfilestack{%
+  \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
+}
+\def\pushthisfilestackX{%
+  \expandafter\pushthisfilestackY\thisfile\StackTerm
+}
+\def\pushthisfilestackY #1\StackTerm #2\StackTerm {%
+  \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}%
+}
+
+\def\popthisfilestack{\errthisfilestackempty}
+\def\errthisfilestackempty{\errmessage{Internal error:
+  the stack of filenames is empty.}}
+
+\def\thisfile{}
+
+% @center line
+% outputs that line, centered.
+%
+\parseargdef\center{%
+  \ifhmode
+    \let\next\centerH
+  \else
+    \let\next\centerV
+  \fi
+  \next{\hfil \ignorespaces#1\unskip \hfil}%
+}
+\def\centerH#1{%
+  {%
+    \hfil\break
+    \advance\hsize by -\leftskip
+    \advance\hsize by -\rightskip
+    \line{#1}%
+    \break
+  }%
+}
+\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
+
+% @sp n   outputs n lines of vertical space
+
+\parseargdef\sp{\vskip #1\baselineskip}
+
+% @comment ...line which is ignored...
+% @c is the same as @comment
+% @ignore ... @end ignore  is another way to write a comment
+
+\def\comment{\begingroup \catcode`\^^M=\other%
+\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
+\commentxxx}
+{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
+
+\let\c=\comment
+
+% @paragraphindent NCHARS
+% We'll use ems for NCHARS, close enough.
+% NCHARS can also be the word `asis' or `none'.
+% We cannot feasibly implement @paragraphindent asis, though.
+%
+\def\asisword{asis} % no translation, these are keywords
+\def\noneword{none}
+%
+\parseargdef\paragraphindent{%
+  \def\temp{#1}%
+  \ifx\temp\asisword
+  \else
+    \ifx\temp\noneword
+      \defaultparindent = 0pt
+    \else
+      \defaultparindent = #1em
+    \fi
+  \fi
+  \parindent = \defaultparindent
+}
+
+% @exampleindent NCHARS
+% We'll use ems for NCHARS like @paragraphindent.
+% It seems @exampleindent asis isn't necessary, but
+% I preserve it to make it similar to @paragraphindent.
+\parseargdef\exampleindent{%
+  \def\temp{#1}%
+  \ifx\temp\asisword
+  \else
+    \ifx\temp\noneword
+      \lispnarrowing = 0pt
+    \else
+      \lispnarrowing = #1em
+    \fi
+  \fi
+}
+
+% @firstparagraphindent WORD
+% If WORD is `none', then suppress indentation of the first paragraph
+% after a section heading.  If WORD is `insert', then do indent at such
+% paragraphs.
+%
+% The paragraph indentation is suppressed or not by calling
+% \suppressfirstparagraphindent, which the sectioning commands do.
+% We switch the definition of this back and forth according to WORD.
+% By default, we suppress indentation.
+%
+\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
+\def\insertword{insert}
+%
+\parseargdef\firstparagraphindent{%
+  \def\temp{#1}%
+  \ifx\temp\noneword
+    \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
+  \else\ifx\temp\insertword
+    \let\suppressfirstparagraphindent = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @firstparagraphindent option `\temp'}%
+  \fi\fi
+}
+
+% Here is how we actually suppress indentation.  Redefine \everypar to
+% \kern backwards by \parindent, and then reset itself to empty.
+%
+% We also make \indent itself not actually do anything until the next
+% paragraph.
+%
+\gdef\dosuppressfirstparagraphindent{%
+  \gdef\indent{%
+    \restorefirstparagraphindent
+    \indent
+  }%
+  \gdef\noindent{%
+    \restorefirstparagraphindent
+    \noindent
+  }%
+  \global\everypar = {%
+    \kern -\parindent
+    \restorefirstparagraphindent
+  }%
+}
+
+\gdef\restorefirstparagraphindent{%
+  \global \let \indent = \ptexindent
+  \global \let \noindent = \ptexnoindent
+  \global \everypar = {}%
+}
+
+
+% @asis just yields its argument.  Used with @table, for example.
+%
+\def\asis#1{#1}
+
+% @math outputs its argument in math mode.
+%
+% One complication: _ usually means subscripts, but it could also mean
+% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
+% _ active, and distinguish by seeing if the current family is \slfam,
+% which is what @var uses.
+{
+  \catcode\underChar = \active
+  \gdef\mathunderscore{%
+    \catcode\underChar=\active
+    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
+  }
+}
+% Another complication: we want \\ (and @\) to output a \ character.
+% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
+% this is not advertised and we don't care.  Texinfo does not
+% otherwise define @\.
+%
+% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
+\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
+%
+\def\math{%
+  \tex
+  \mathunderscore
+  \let\\ = \mathbackslash
+  \mathactive
+  $\finishmath
+}
+\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
+
+% Some active characters (such as <) are spaced differently in math.
+% We have to reset their definitions in case the @math was an argument
+% to a command which sets the catcodes (such as @item or @section).
+%
+{
+  \catcode`^ = \active
+  \catcode`< = \active
+  \catcode`> = \active
+  \catcode`+ = \active
+  \gdef\mathactive{%
+    \let^ = \ptexhat
+    \let< = \ptexless
+    \let> = \ptexgtr
+    \let+ = \ptexplus
+  }
+}
+
+% @bullet and @minus need the same treatment as @math, just above.
+\def\bullet{$\ptexbullet$}
+\def\minus{$-$}
+
+% @dots{} outputs an ellipsis using the current font.
+% We do .5em per period so that it has the same spacing in a typewriter
+% font as three actual period characters.
+%
+\def\dots{%
+  \leavevmode
+  \hbox to 1.5em{%
+    \hskip 0pt plus 0.25fil
+    .\hfil.\hfil.%
+    \hskip 0pt plus 0.5fil
+  }%
+}
+
+% @enddots{} is an end-of-sentence ellipsis.
+%
+\def\enddots{%
+  \dots
+  \spacefactor=\endofsentencespacefactor
+}
+
+% @comma{} is so commas can be inserted into text without messing up
+% Texinfo's parsing.
+%
+\let\comma = ,
+
+% @refill is a no-op.
+\let\refill=\relax
+
+% If working on a large document in chapters, it is convenient to
+% be able to disable indexing, cross-referencing, and contents, for test runs.
+% This is done with @novalidate (before @setfilename).
+%
+\newif\iflinks \linkstrue % by default we want the aux files.
+\let\novalidate = \linksfalse
+
+% @setfilename is done at the beginning of every texinfo file.
+% So open here the files we need to have open while reading the input.
+% This makes it possible to make a .fmt file for texinfo.
+\def\setfilename{%
+   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
+   \iflinks
+     \tryauxfile
+     % Open the new aux file.  TeX will close it automatically at exit.
+     \immediate\openout\auxfile=\jobname.aux
+   \fi % \openindices needs to do some work in any case.
+   \openindices
+   \let\setfilename=\comment % Ignore extra @setfilename cmds.
+   %
+   % If texinfo.cnf is present on the system, read it.
+   % Useful for site-wide @afourpaper, etc.
+   \openin 1 texinfo.cnf
+   \ifeof 1 \else \input texinfo.cnf \fi
+   \closein 1
+   %
+   \comment % Ignore the actual filename.
+}
+
+% Called from \setfilename.
+%
+\def\openindices{%
+  \newindex{cp}%
+  \newcodeindex{fn}%
+  \newcodeindex{vr}%
+  \newcodeindex{tp}%
+  \newcodeindex{ky}%
+  \newcodeindex{pg}%
+}
+
+% @bye.
+\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
+
+
+\message{pdf,}
+% adobe `portable' document format
+\newcount\tempnum
+\newcount\lnkcount
+\newtoks\filename
+\newcount\filenamelength
+\newcount\pgn
+\newtoks\toksA
+\newtoks\toksB
+\newtoks\toksC
+\newtoks\toksD
+\newbox\boxA
+\newcount\countA
+\newif\ifpdf
+\newif\ifpdfmakepagedest
+
+% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
+% can be set).  So we test for \relax and 0 as well as \undefined,
+% borrowed from ifpdf.sty.
+\ifx\pdfoutput\undefined
+\else
+  \ifx\pdfoutput\relax
+  \else
+    \ifcase\pdfoutput
+    \else
+      \pdftrue
+    \fi
+  \fi
+\fi
+
+% PDF uses PostScript string constants for the names of xref targets, to
+% for display in the outlines, and in other places.  Thus, we have to
+% double any backslashes.  Otherwise, a name like "\node" will be
+% interpreted as a newline (\n), followed by o, d, e.  Not good.
+% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
+% (and related messages, the final outcome is that it is up to the TeX
+% user to double the backslashes and otherwise make the string valid, so
+% that's we do).
+
+% double active backslashes.
+% 
+{\catcode`\@=0 \catcode`\\=\active
+ @gdef@activebackslash{@catcode`@\=@active @otherbackslash}
+ @gdef@activebackslashdouble{%
+   @catcode@backChar=@active
+   @let\=@doublebackslash}
+}
+
+% To handle parens, we must adopt a different approach, since parens are
+% not active characters.  hyperref.dtx (which has the same problem as
+% us) handles it with this amazing macro to replace tokens.  I've
+% tinkered with it a little for texinfo, but it's definitely from there.
+% 
+% #1 is the tokens to replace.
+% #2 is the replacement.
+% #3 is the control sequence with the string.
+% 
+\def\HyPsdSubst#1#2#3{%
+  \def\HyPsdReplace##1#1##2\END{%
+    ##1%
+    \ifx\\##2\\%
+    \else
+      #2%
+      \HyReturnAfterFi{%
+        \HyPsdReplace##2\END
+      }%
+    \fi
+  }%
+  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
+}
+\long\def\HyReturnAfterFi#1\fi{\fi#1}
+
+% #1 is a control sequence in which to do the replacements.
+\def\backslashparens#1{%
+  \xdef#1{#1}% redefine it as its expansion; the definition is simply
+             % \lastnode when called from \setref -> \pdfmkdest.
+  \HyPsdSubst{(}{\backslashlparen}{#1}%
+  \HyPsdSubst{)}{\backslashrparen}{#1}%
+}
+
+{\catcode\exclamChar = 0 \catcode\backChar = \other
+ !gdef!backslashlparen{\(}%
+ !gdef!backslashrparen{\)}%
+}
+
+\ifpdf
+  \input pdfcolor
+  \pdfcatalog{/PageMode /UseOutlines}%
+  \def\dopdfimage#1#2#3{%
+    \def\imagewidth{#2}%
+    \def\imageheight{#3}%
+    % without \immediate, pdftex seg faults when the same image is
+    % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
+    \ifnum\pdftexversion < 14
+      \immediate\pdfimage
+    \else
+      \immediate\pdfximage
+    \fi
+      \ifx\empty\imagewidth\else width \imagewidth \fi
+      \ifx\empty\imageheight\else height \imageheight \fi
+      \ifnum\pdftexversion<13
+         #1.pdf%
+       \else
+         {#1.pdf}%
+       \fi
+    \ifnum\pdftexversion < 14 \else
+      \pdfrefximage \pdflastximage
+    \fi}
+  \def\pdfmkdest#1{{%
+    % We have to set dummies so commands such as @code, and characters
+    % such as \, aren't expanded when present in a section title.
+    \atdummies
+    \activebackslashdouble
+    \def\pdfdestname{#1}%
+    \backslashparens\pdfdestname
+    \pdfdest name{\pdfdestname} xyz%
+  }}%
+  %
+  % used to mark target names; must be expandable.
+  \def\pdfmkpgn#1{#1}%
+  %
+  \let\linkcolor = \Blue  % was Cyan, but that seems light?
+  \def\endlink{\Black\pdfendlink}
+  % Adding outlines to PDF; macros for calculating structure of outlines
+  % come from Petr Olsak
+  \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
+    \else \csname#1\endcsname \fi}
+  \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
+    \advance\tempnum by 1
+    \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
+  %
+  % #1 is the section text, which is what will be displayed in the
+  % outline by the pdf viewer.  #2 is the pdf expression for the number
+  % of subentries (or empty, for subsubsections).  #3 is the node text,
+  % which might be empty if this toc entry had no corresponding node.
+  % #4 is the page number
+  %
+  \def\dopdfoutline#1#2#3#4{%
+    % Generate a link to the node text if that exists; else, use the
+    % page number.  We could generate a destination for the section
+    % text in the case where a section has no node, but it doesn't
+    % seem worth the trouble, since most documents are normally structured.
+    \def\pdfoutlinedest{#3}%
+    \ifx\pdfoutlinedest\empty
+      \def\pdfoutlinedest{#4}%
+    \else
+      % Doubled backslashes in the name.
+      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
+       \backslashparens\pdfoutlinedest}%
+    \fi
+    %
+    % Also double the backslashes in the display string.
+    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
+     \backslashparens\pdfoutlinetext}%
+    %
+    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
+  }
+  %
+  \def\pdfmakeoutlines{%
+    \begingroup
+      % Thanh's hack / proper braces in bookmarks
+      \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
+      \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
+      %
+      % Read toc silently, to get counts of subentries for \pdfoutline.
+      \def\numchapentry##1##2##3##4{%
+	\def\thischapnum{##2}%
+	\def\thissecnum{0}%
+	\def\thissubsecnum{0}%
+      }%
+      \def\numsecentry##1##2##3##4{%
+	\advancenumber{chap\thischapnum}%
+	\def\thissecnum{##2}%
+	\def\thissubsecnum{0}%
+      }%
+      \def\numsubsecentry##1##2##3##4{%
+	\advancenumber{sec\thissecnum}%
+	\def\thissubsecnum{##2}%
+      }%
+      \def\numsubsubsecentry##1##2##3##4{%
+	\advancenumber{subsec\thissubsecnum}%
+      }%
+      \def\thischapnum{0}%
+      \def\thissecnum{0}%
+      \def\thissubsecnum{0}%
+      %
+      % use \def rather than \let here because we redefine \chapentry et
+      % al. a second time, below.
+      \def\appentry{\numchapentry}%
+      \def\appsecentry{\numsecentry}%
+      \def\appsubsecentry{\numsubsecentry}%
+      \def\appsubsubsecentry{\numsubsubsecentry}%
+      \def\unnchapentry{\numchapentry}%
+      \def\unnsecentry{\numsecentry}%
+      \def\unnsubsecentry{\numsubsecentry}%
+      \def\unnsubsubsecentry{\numsubsubsecentry}%
+      \readdatafile{toc}%
+      %
+      % Read toc second time, this time actually producing the outlines.
+      % The `-' means take the \expnumber as the absolute number of
+      % subentries, which we calculated on our first read of the .toc above.
+      %
+      % We use the node names as the destinations.
+      \def\numchapentry##1##2##3##4{%
+        \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
+      \def\numsecentry##1##2##3##4{%
+        \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}%
+      \def\numsubsecentry##1##2##3##4{%
+        \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}%
+      \def\numsubsubsecentry##1##2##3##4{% count is always zero
+        \dopdfoutline{##1}{}{##3}{##4}}%
+      %
+      % PDF outlines are displayed using system fonts, instead of
+      % document fonts.  Therefore we cannot use special characters,
+      % since the encoding is unknown.  For example, the eogonek from
+      % Latin 2 (0xea) gets translated to a | character.  Info from
+      % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
+      %
+      % xx to do this right, we have to translate 8-bit characters to
+      % their "best" equivalent, based on the @documentencoding.  Right
+      % now, I guess we'll just let the pdf reader have its way.
+      \indexnofonts
+      \setupdatafile
+      \activebackslash
+      \input \jobname.toc
+    \endgroup
+  }
+  %
+  \def\skipspaces#1{\def\PP{#1}\def\D{|}%
+    \ifx\PP\D\let\nextsp\relax
+    \else\let\nextsp\skipspaces
+      \ifx\p\space\else\addtokens{\filename}{\PP}%
+        \advance\filenamelength by 1
+      \fi
+    \fi
+    \nextsp}
+  \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+  \ifnum\pdftexversion < 14
+    \let \startlink \pdfannotlink
+  \else
+    \let \startlink \pdfstartlink
+  \fi
+  \def\pdfurl#1{%
+    \begingroup
+      \normalturnoffactive\def\@{@}%
+      \makevalueexpandable
+      \leavevmode\Red
+      \startlink attr{/Border [0 0 0]}%
+        user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
+    \endgroup}
+  \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
+  \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+  \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
+  \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
+  \def\maketoks{%
+    \expandafter\poptoks\the\toksA|ENDTOKS|\relax
+    \ifx\first0\adn0
+    \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
+    \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
+    \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
+    \else
+      \ifnum0=\countA\else\makelink\fi
+      \ifx\first.\let\next=\done\else
+        \let\next=\maketoks
+        \addtokens{\toksB}{\the\toksD}
+        \ifx\first,\addtokens{\toksB}{\space}\fi
+      \fi
+    \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+    \next}
+  \def\makelink{\addtokens{\toksB}%
+    {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
+  \def\pdflink#1{%
+    \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
+    \linkcolor #1\endlink}
+  \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
+\else
+  \let\pdfmkdest = \gobble
+  \let\pdfurl = \gobble
+  \let\endlink = \relax
+  \let\linkcolor = \relax
+  \let\pdfmakeoutlines = \relax
+\fi  % \ifx\pdfoutput
+
+
+\message{fonts,}
+
+% Change the current font style to #1, remembering it in \curfontstyle.
+% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
+% italics, not bold italics.
+%
+\def\setfontstyle#1{%
+  \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
+  \csname ten#1\endcsname  % change the current font
+}
+
+% Select #1 fonts with the current style.
+%
+\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
+
+\def\rm{\fam=0 \setfontstyle{rm}}
+\def\it{\fam=\itfam \setfontstyle{it}}
+\def\sl{\fam=\slfam \setfontstyle{sl}}
+\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
+\def\tt{\fam=\ttfam \setfontstyle{tt}}
+
+% Texinfo sort of supports the sans serif font style, which plain TeX does not.
+% So we set up a \sf.
+\newfam\sffam
+\def\sf{\fam=\sffam \setfontstyle{sf}}
+\let\li = \sf % Sometimes we call it \li, not \sf.
+
+% We don't need math for this font style.
+\def\ttsl{\setfontstyle{ttsl}}
+
+% Default leading.
+\newdimen\textleading  \textleading = 13.2pt
+
+% Set the baselineskip to #1, and the lineskip and strut size
+% correspondingly.  There is no deep meaning behind these magic numbers
+% used as factors; they just match (closely enough) what Knuth defined.
+%
+\def\lineskipfactor{.08333}
+\def\strutheightpercent{.70833}
+\def\strutdepthpercent {.29167}
+%
+\def\setleading#1{%
+  \normalbaselineskip = #1\relax
+  \normallineskip = \lineskipfactor\normalbaselineskip
+  \normalbaselines
+  \setbox\strutbox =\hbox{%
+    \vrule width0pt height\strutheightpercent\baselineskip
+                    depth \strutdepthpercent \baselineskip
+  }%
+}
+
+% Set the font macro #1 to the font named #2, adding on the
+% specified font prefix (normally `cm').
+% #3 is the font's design size, #4 is a scale factor
+\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
+
+% Use cm as the default font prefix.
+% To specify the font prefix, you must define \fontprefix
+% before you read in texinfo.tex.
+\ifx\fontprefix\undefined
+\def\fontprefix{cm}
+\fi
+% Support font families that don't use the same naming scheme as CM.
+\def\rmshape{r}
+\def\rmbshape{bx}               %where the normal face is bold
+\def\bfshape{b}
+\def\bxshape{bx}
+\def\ttshape{tt}
+\def\ttbshape{tt}
+\def\ttslshape{sltt}
+\def\itshape{ti}
+\def\itbshape{bxti}
+\def\slshape{sl}
+\def\slbshape{bxsl}
+\def\sfshape{ss}
+\def\sfbshape{ss}
+\def\scshape{csc}
+\def\scbshape{csc}
+
+% Text fonts (11.2pt, magstep1).
+\def\textnominalsize{11pt}
+\edef\mainmagstep{\magstephalf}
+\setfont\textrm\rmshape{10}{\mainmagstep}
+\setfont\texttt\ttshape{10}{\mainmagstep}
+\setfont\textbf\bfshape{10}{\mainmagstep}
+\setfont\textit\itshape{10}{\mainmagstep}
+\setfont\textsl\slshape{10}{\mainmagstep}
+\setfont\textsf\sfshape{10}{\mainmagstep}
+\setfont\textsc\scshape{10}{\mainmagstep}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\font\texti=cmmi10 scaled \mainmagstep
+\font\textsy=cmsy10 scaled \mainmagstep
+
+% A few fonts for @defun names and args.
+\setfont\defbf\bfshape{10}{\magstep1}
+\setfont\deftt\ttshape{10}{\magstep1}
+\setfont\defttsl\ttslshape{10}{\magstep1}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\def\smallnominalsize{9pt}
+\setfont\smallrm\rmshape{9}{1000}
+\setfont\smalltt\ttshape{9}{1000}
+\setfont\smallbf\bfshape{10}{900}
+\setfont\smallit\itshape{9}{1000}
+\setfont\smallsl\slshape{9}{1000}
+\setfont\smallsf\sfshape{9}{1000}
+\setfont\smallsc\scshape{10}{900}
+\setfont\smallttsl\ttslshape{10}{900}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
+
+% Fonts for small examples (8pt).
+\def\smallernominalsize{8pt}
+\setfont\smallerrm\rmshape{8}{1000}
+\setfont\smallertt\ttshape{8}{1000}
+\setfont\smallerbf\bfshape{10}{800}
+\setfont\smallerit\itshape{8}{1000}
+\setfont\smallersl\slshape{8}{1000}
+\setfont\smallersf\sfshape{8}{1000}
+\setfont\smallersc\scshape{10}{800}
+\setfont\smallerttsl\ttslshape{10}{800}
+\font\smalleri=cmmi8
+\font\smallersy=cmsy8
+
+% Fonts for title page (20.4pt):
+\def\titlenominalsize{20pt}
+\setfont\titlerm\rmbshape{12}{\magstep3}
+\setfont\titleit\itbshape{10}{\magstep4}
+\setfont\titlesl\slbshape{10}{\magstep4}
+\setfont\titlett\ttbshape{12}{\magstep3}
+\setfont\titlettsl\ttslshape{10}{\magstep4}
+\setfont\titlesf\sfbshape{17}{\magstep1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+
+% Chapter (and unnumbered) fonts (17.28pt).
+\def\chapnominalsize{17pt}
+\setfont\chaprm\rmbshape{12}{\magstep2}
+\setfont\chapit\itbshape{10}{\magstep3}
+\setfont\chapsl\slbshape{10}{\magstep3}
+\setfont\chaptt\ttbshape{12}{\magstep2}
+\setfont\chapttsl\ttslshape{10}{\magstep3}
+\setfont\chapsf\sfbshape{17}{1000}
+\let\chapbf=\chaprm
+\setfont\chapsc\scbshape{10}{\magstep3}
+\font\chapi=cmmi12 scaled \magstep2
+\font\chapsy=cmsy10 scaled \magstep3
+
+% Section fonts (14.4pt).
+\def\secnominalsize{14pt}
+\setfont\secrm\rmbshape{12}{\magstep1}
+\setfont\secit\itbshape{10}{\magstep2}
+\setfont\secsl\slbshape{10}{\magstep2}
+\setfont\sectt\ttbshape{12}{\magstep1}
+\setfont\secttsl\ttslshape{10}{\magstep2}
+\setfont\secsf\sfbshape{12}{\magstep1}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep2}
+\font\seci=cmmi12 scaled \magstep1
+\font\secsy=cmsy10 scaled \magstep2
+
+% Subsection fonts (13.15pt).
+\def\ssecnominalsize{13pt}
+\setfont\ssecrm\rmbshape{12}{\magstephalf}
+\setfont\ssecit\itbshape{10}{1315}
+\setfont\ssecsl\slbshape{10}{1315}
+\setfont\ssectt\ttbshape{12}{\magstephalf}
+\setfont\ssecttsl\ttslshape{10}{1315}
+\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{1315}
+\font\sseci=cmmi12 scaled \magstephalf
+\font\ssecsy=cmsy10 scaled 1315
+
+% Reduced fonts for @acro in text (10pt).
+\def\reducednominalsize{10pt}
+\setfont\reducedrm\rmshape{10}{1000}
+\setfont\reducedtt\ttshape{10}{1000}
+\setfont\reducedbf\bfshape{10}{1000}
+\setfont\reducedit\itshape{10}{1000}
+\setfont\reducedsl\slshape{10}{1000}
+\setfont\reducedsf\sfshape{10}{1000}
+\setfont\reducedsc\scshape{10}{1000}
+\setfont\reducedttsl\ttslshape{10}{1000}
+\font\reducedi=cmmi10
+\font\reducedsy=cmsy10
+
+% In order for the font changes to affect most math symbols and letters,
+% we have to define the \textfont of the standard families.  Since
+% texinfo doesn't allow for producing subscripts and superscripts except
+% in the main text, we don't bother to reset \scriptfont and
+% \scriptscriptfont (which would also require loading a lot more fonts).
+%
+\def\resetmathfonts{%
+  \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
+  \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
+  \textfont\ttfam=\tentt \textfont\sffam=\tensf
+}
+
+% The font-changing commands redefine the meanings of \tenSTYLE, instead
+% of just \STYLE.  We do this because \STYLE needs to also set the
+% current \fam for math mode.  Our \STYLE (e.g., \rm) commands hardwire
+% \tenSTYLE to set the current font.
+%
+% Each font-changing command also sets the names \lsize (one size lower)
+% and \lllsize (three sizes lower).  These relative commands are used in
+% the LaTeX logo and acronyms.
+%
+% This all needs generalizing, badly.
+%
+\def\textfonts{%
+  \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
+  \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
+  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
+  \let\tenttsl=\textttsl
+  \def\curfontsize{text}%
+  \def\lsize{reduced}\def\lllsize{smaller}%
+  \resetmathfonts \setleading{\textleading}}
+\def\titlefonts{%
+  \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
+  \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
+  \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
+  \let\tenttsl=\titlettsl
+  \def\curfontsize{title}%
+  \def\lsize{chap}\def\lllsize{subsec}%
+  \resetmathfonts \setleading{25pt}}
+\def\titlefont#1{{\titlefonts\rm #1}}
+\def\chapfonts{%
+  \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
+  \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
+  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
+  \let\tenttsl=\chapttsl
+  \def\curfontsize{chap}%
+  \def\lsize{sec}\def\lllsize{text}%
+  \resetmathfonts \setleading{19pt}}
+\def\secfonts{%
+  \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
+  \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
+  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
+  \let\tenttsl=\secttsl
+  \def\curfontsize{sec}%
+  \def\lsize{subsec}\def\lllsize{reduced}%
+  \resetmathfonts \setleading{16pt}}
+\def\subsecfonts{%
+  \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
+  \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
+  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
+  \let\tenttsl=\ssecttsl
+  \def\curfontsize{ssec}%
+  \def\lsize{text}\def\lllsize{small}%
+  \resetmathfonts \setleading{15pt}}
+\let\subsubsecfonts = \subsecfonts
+\def\reducedfonts{%
+  \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
+  \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
+  \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
+  \let\tenttsl=\reducedttsl
+  \def\curfontsize{reduced}%
+  \def\lsize{small}\def\lllsize{smaller}%
+  \resetmathfonts \setleading{10.5pt}}
+\def\smallfonts{%
+  \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
+  \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
+  \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
+  \let\tenttsl=\smallttsl
+  \def\curfontsize{small}%
+  \def\lsize{smaller}\def\lllsize{smaller}%
+  \resetmathfonts \setleading{10.5pt}}
+\def\smallerfonts{%
+  \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
+  \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
+  \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
+  \let\tenttsl=\smallerttsl
+  \def\curfontsize{smaller}%
+  \def\lsize{smaller}\def\lllsize{smaller}%
+  \resetmathfonts \setleading{9.5pt}}
+
+% Set the fonts to use with the @small... environments.
+\let\smallexamplefonts = \smallfonts
+
+% About \smallexamplefonts.  If we use \smallfonts (9pt), @smallexample
+% can fit this many characters:
+%   8.5x11=86   smallbook=72  a4=90  a5=69
+% If we use \scriptfonts (8pt), then we can fit this many characters:
+%   8.5x11=90+  smallbook=80  a4=90+  a5=77
+% For me, subjectively, the few extra characters that fit aren't worth
+% the additional smallness of 8pt.  So I'm making the default 9pt.
+%
+% By the way, for comparison, here's what fits with @example (10pt):
+%   8.5x11=71  smallbook=60  a4=75  a5=58
+%
+% I wish the USA used A4 paper.
+% --karl, 24jan03.
+
+
+% Set up the default fonts, so we can use them for creating boxes.
+%
+\textfonts \rm
+
+% Define these so they can be easily changed for other fonts.
+\def\angleleft{$\langle$}
+\def\angleright{$\rangle$}
+
+% Count depth in font-changes, for error checks
+\newcount\fontdepth \fontdepth=0
+
+% Fonts for short table of contents.
+\setfont\shortcontrm\rmshape{12}{1000}
+\setfont\shortcontbf\bfshape{10}{\magstep1}  % no cmb12
+\setfont\shortcontsl\slshape{12}{1000}
+\setfont\shortconttt\ttshape{12}{1000}
+
+%% Add scribe-like font environments, plus @l for inline lisp (usually sans
+%% serif) and @ii for TeX italic
+
+% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
+% unless the following character is such as not to need one.
+\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
+                    \ptexslash\fi\fi\fi}
+\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
+\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
+
+% like \smartslanted except unconditionally uses \ttsl.
+% @var is set to this for defun arguments.
+\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
+
+% like \smartslanted except unconditionally use \sl.  We never want
+% ttsl for book titles, do we?
+\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
+
+\let\i=\smartitalic
+\let\slanted=\smartslanted
+\let\var=\smartslanted
+\let\dfn=\smartslanted
+\let\emph=\smartitalic
+
+% @b, explicit bold.
+\def\b#1{{\bf #1}}
+\let\strong=\b
+
+% @sansserif, explicit sans.
+\def\sansserif#1{{\sf #1}}
+
+% We can't just use \exhyphenpenalty, because that only has effect at
+% the end of a paragraph.  Restore normal hyphenation at the end of the
+% group within which \nohyphenation is presumably called.
+%
+\def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
+\def\restorehyphenation{\hyphenchar\font = `- }
+
+% Set sfcode to normal for the chars that usually have another value.
+% Can't use plain's \frenchspacing because it uses the `\x notation, and
+% sometimes \x has an active definition that messes things up.
+%
+\catcode`@=11
+  \def\plainfrenchspacing{%
+    \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
+    \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
+    \def\endofsentencespacefactor{1000}% for @. and friends
+  }
+  \def\plainnonfrenchspacing{%
+    \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
+    \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
+    \def\endofsentencespacefactor{3000}% for @. and friends
+  }
+\catcode`@=\other
+\def\endofsentencespacefactor{3000}% default
+
+\def\t#1{%
+  {\tt \rawbackslash \plainfrenchspacing #1}%
+  \null
+}
+\def\samp#1{`\tclose{#1}'\null}
+\setfont\keyrm\rmshape{8}{1000}
+\font\keysy=cmsy9
+\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
+  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
+    \vbox{\hrule\kern-0.4pt
+     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
+    \kern-0.4pt\hrule}%
+  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+% The old definition, with no lozenge:
+%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
+\def\ctrl #1{{\tt \rawbackslash \hat}#1}
+
+% @file, @option are the same as @samp.
+\let\file=\samp
+\let\option=\samp
+
+% @code is a modification of @t,
+% which makes spaces the same size as normal in the surrounding text.
+\def\tclose#1{%
+  {%
+    % Change normal interword space to be same as for the current font.
+    \spaceskip = \fontdimen2\font
+    %
+    % Switch to typewriter.
+    \tt
+    %
+    % But `\ ' produces the large typewriter interword space.
+    \def\ {{\spaceskip = 0pt{} }}%
+    %
+    % Turn off hyphenation.
+    \nohyphenation
+    %
+    \rawbackslash
+    \plainfrenchspacing
+    #1%
+  }%
+  \null
+}
+
+% We *must* turn on hyphenation at `-' and `_' in @code.
+% Otherwise, it is too hard to avoid overfull hboxes
+% in the Emacs manual, the Library manual, etc.
+
+% Unfortunately, TeX uses one parameter (\hyphenchar) to control
+% both hyphenation at - and hyphenation within words.
+% We must therefore turn them both off (\tclose does that)
+% and arrange explicitly to hyphenate at a dash.
+%  -- rms.
+{
+  \catcode`\-=\active
+  \catcode`\_=\active
+  %
+  \global\def\code{\begingroup
+    \catcode`\-=\active  \catcode`\_=\active
+    \ifallowcodebreaks
+     \let-\codedash
+     \let_\codeunder
+    \else
+     \let-\realdash
+     \let_\realunder
+    \fi
+    \codex
+  }
+}
+
+\def\realdash{-}
+\def\codedash{-\discretionary{}{}{}}
+\def\codeunder{%
+  % this is all so @math{@code{var_name}+1} can work.  In math mode, _
+  % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
+  % will therefore expand the active definition of _, which is us
+  % (inside @code that is), therefore an endless loop.
+  \ifusingtt{\ifmmode
+               \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
+             \else\normalunderscore \fi
+             \discretionary{}{}{}}%
+            {\_}%
+}
+\def\codex #1{\tclose{#1}\endgroup}
+
+% An additional complication: the above will allow breaks after, e.g.,
+% each of the four underscores in __typeof__.  This is undesirable in
+% some manuals, especially if they don't have long identifiers in
+% general.  @allowcodebreaks provides a way to control this.
+% 
+\newif\ifallowcodebreaks  \allowcodebreakstrue
+
+\def\keywordtrue{true}
+\def\keywordfalse{false}
+
+\parseargdef\allowcodebreaks{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\keywordtrue
+    \allowcodebreakstrue
+  \else\ifx\txiarg\keywordfalse
+    \allowcodebreaksfalse
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
+  \fi\fi
+}
+
+% @kbd is like @code, except that if the argument is just one @key command,
+% then @kbd has no effect.
+
+% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
+%   `example' (@kbd uses ttsl only inside of @example and friends),
+%   or `code' (@kbd uses normal tty font always).
+\parseargdef\kbdinputstyle{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\worddistinct
+    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
+  \else\ifx\txiarg\wordexample
+    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
+  \else\ifx\txiarg\wordcode
+    \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
+  \fi\fi\fi
+}
+\def\worddistinct{distinct}
+\def\wordexample{example}
+\def\wordcode{code}
+
+% Default is `distinct.'
+\kbdinputstyle distinct
+
+\def\xkey{\key}
+\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
+\ifx\one\xkey\ifx\threex\three \key{#2}%
+\else{\tclose{\kbdfont\look}}\fi
+\else{\tclose{\kbdfont\look}}\fi}
+
+% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
+\let\indicateurl=\code
+\let\env=\code
+\let\command=\code
+
+% @uref (abbreviation for `urlref') takes an optional (comma-separated)
+% second argument specifying the text to display and an optional third
+% arg as text to display instead of (rather than in addition to) the url
+% itself.  First (mandatory) arg is the url.  Perhaps eventually put in
+% a hypertex \special here.
+%
+\def\uref#1{\douref #1,,,\finish}
+\def\douref#1,#2,#3,#4\finish{\begingroup
+  \unsepspaces
+  \pdfurl{#1}%
+  \setbox0 = \hbox{\ignorespaces #3}%
+  \ifdim\wd0 > 0pt
+    \unhbox0 % third arg given, show only that
+  \else
+    \setbox0 = \hbox{\ignorespaces #2}%
+    \ifdim\wd0 > 0pt
+      \ifpdf
+        \unhbox0             % PDF: 2nd arg given, show only it
+      \else
+        \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
+      \fi
+    \else
+      \code{#1}% only url given, so show it
+    \fi
+  \fi
+  \endlink
+\endgroup}
+
+% @url synonym for @uref, since that's how everyone uses it.
+%
+\let\url=\uref
+
+% rms does not like angle brackets --karl, 17may97.
+% So now @email is just like @uref, unless we are pdf.
+%
+%\def\email#1{\angleleft{\tt #1}\angleright}
+\ifpdf
+  \def\email#1{\doemail#1,,\finish}
+  \def\doemail#1,#2,#3\finish{\begingroup
+    \unsepspaces
+    \pdfurl{mailto:#1}%
+    \setbox0 = \hbox{\ignorespaces #2}%
+    \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
+    \endlink
+  \endgroup}
+\else
+  \let\email=\uref
+\fi
+
+% Check if we are currently using a typewriter font.  Since all the
+% Computer Modern typewriter fonts have zero interword stretch (and
+% shrink), and it is reasonable to expect all typewriter fonts to have
+% this property, we can check that font parameter.
+%
+\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
+
+% Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
+% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
+%
+\def\dmn#1{\thinspace #1}
+
+\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
+
+% @l was never documented to mean ``switch to the Lisp font'',
+% and it is not used as such in any manual I can find.  We need it for
+% Polish suppressed-l.  --karl, 22sep96.
+%\def\l#1{{\li #1}\null}
+
+% Explicit font changes: @r, @sc, undocumented @ii.
+\def\r#1{{\rm #1}}              % roman font
+\def\sc#1{{\smallcaps#1}}       % smallcaps font
+\def\ii#1{{\it #1}}             % italic font
+
+% @acronym for "FBI", "NATO", and the like.
+% We print this one point size smaller, since it's intended for
+% all-uppercase.
+% 
+\def\acronym#1{\doacronym #1,,\finish}
+\def\doacronym#1,#2,#3\finish{%
+  {\selectfonts\lsize #1}%
+  \def\temp{#2}%
+  \ifx\temp\empty \else
+    \space ({\unsepspaces \ignorespaces \temp \unskip})%
+  \fi
+}
+
+% @abbr for "Comput. J." and the like.
+% No font change, but don't do end-of-sentence spacing.
+% 
+\def\abbr#1{\doabbr #1,,\finish}
+\def\doabbr#1,#2,#3\finish{%
+  {\plainfrenchspacing #1}%
+  \def\temp{#2}%
+  \ifx\temp\empty \else
+    \space ({\unsepspaces \ignorespaces \temp \unskip})%
+  \fi
+}
+
+% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
+%
+\def\pounds{{\it\$}}
+
+% @euro{} comes from a separate font, depending on the current style.
+% We use the free feym* fonts from the eurosym package by Henrik
+% Theiling, which support regular, slanted, bold and bold slanted (and
+% "outlined" (blackboard board, sort of) versions, which we don't need).
+% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
+% 
+% Although only regular is the truly official Euro symbol, we ignore
+% that.  The Euro is designed to be slightly taller than the regular
+% font height.
+% 
+% feymr - regular
+% feymo - slanted
+% feybr - bold
+% feybo - bold slanted
+% 
+% There is no good (free) typewriter version, to my knowledge.
+% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
+% Hmm.
+% 
+% Also doesn't work in math.  Do we need to do math with euro symbols?
+% Hope not.
+% 
+% 
+\def\euro{{\eurofont e}}
+\def\eurofont{%
+  % We set the font at each command, rather than predefining it in
+  % \textfonts and the other font-switching commands, so that
+  % installations which never need the symbol don't have to have the
+  % font installed.
+  % 
+  % There is only one designed size (nominal 10pt), so we always scale
+  % that to the current nominal size.
+  % 
+  % By the way, simply using "at 1em" works for cmr10 and the like, but
+  % does not work for cmbx10 and other extended/shrunken fonts.
+  % 
+  \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
+  %
+  \ifx\curfontstyle\bfstylename 
+    % bold:
+    \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
+  \else 
+    % regular:
+    \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
+  \fi
+  \thiseurofont
+}
+
+% @registeredsymbol - R in a circle.  The font for the R should really
+% be smaller yet, but lllsize is the best we can do for now.
+% Adapted from the plain.tex definition of \copyright.
+%
+\def\registeredsymbol{%
+  $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
+               \hfil\crcr\Orb}}%
+    }$%
+}
+
+% Laurent Siebenmann reports \Orb undefined with:
+%  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
+% so we'll define it if necessary.
+% 
+\ifx\Orb\undefined
+\def\Orb{\mathhexbox20D}
+\fi
+
+
+\message{page headings,}
+
+\newskip\titlepagetopglue \titlepagetopglue = 1.5in
+\newskip\titlepagebottomglue \titlepagebottomglue = 2pc
+
+% First the title page.  Must do @settitle before @titlepage.
+\newif\ifseenauthor
+\newif\iffinishedtitlepage
+
+% Do an implicit @contents or @shortcontents after @end titlepage if the
+% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
+%
+\newif\ifsetcontentsaftertitlepage
+ \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
+\newif\ifsetshortcontentsaftertitlepage
+ \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
+
+\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
+        \endgroup\page\hbox{}\page}
+
+\envdef\titlepage{%
+  % Open one extra group, as we want to close it in the middle of \Etitlepage.
+  \begingroup
+    \parindent=0pt \textfonts
+    % Leave some space at the very top of the page.
+    \vglue\titlepagetopglue
+    % No rule at page bottom unless we print one at the top with @title.
+    \finishedtitlepagetrue
+    %
+    % Most title ``pages'' are actually two pages long, with space
+    % at the top of the second.  We don't want the ragged left on the second.
+    \let\oldpage = \page
+    \def\page{%
+      \iffinishedtitlepage\else
+	 \finishtitlepage
+      \fi
+      \let\page = \oldpage
+      \page
+      \null
+    }%
+}
+
+\def\Etitlepage{%
+    \iffinishedtitlepage\else
+	\finishtitlepage
+    \fi
+    % It is important to do the page break before ending the group,
+    % because the headline and footline are only empty inside the group.
+    % If we use the new definition of \page, we always get a blank page
+    % after the title page, which we certainly don't want.
+    \oldpage
+  \endgroup
+  %
+  % Need this before the \...aftertitlepage checks so that if they are
+  % in effect the toc pages will come out with page numbers.
+  \HEADINGSon
+  %
+  % If they want short, they certainly want long too.
+  \ifsetshortcontentsaftertitlepage
+    \shortcontents
+    \contents
+    \global\let\shortcontents = \relax
+    \global\let\contents = \relax
+  \fi
+  %
+  \ifsetcontentsaftertitlepage
+    \contents
+    \global\let\contents = \relax
+    \global\let\shortcontents = \relax
+  \fi
+}
+
+\def\finishtitlepage{%
+  \vskip4pt \hrule height 2pt width \hsize
+  \vskip\titlepagebottomglue
+  \finishedtitlepagetrue
+}
+
+%%% Macros to be used within @titlepage:
+
+\let\subtitlerm=\tenrm
+\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
+
+\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
+		\let\tt=\authortt}
+
+\parseargdef\title{%
+  \checkenv\titlepage
+  \leftline{\titlefonts\rm #1}
+  % print a rule at the page bottom also.
+  \finishedtitlepagefalse
+  \vskip4pt \hrule height 4pt width \hsize \vskip4pt
+}
+
+\parseargdef\subtitle{%
+  \checkenv\titlepage
+  {\subtitlefont \rightline{#1}}%
+}
+
+% @author should come last, but may come many times.
+% It can also be used inside @quotation.
+%
+\parseargdef\author{%
+  \def\temp{\quotation}%
+  \ifx\thisenv\temp
+    \def\quotationauthor{#1}% printed in \Equotation.
+  \else
+    \checkenv\titlepage
+    \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
+    {\authorfont \leftline{#1}}%
+  \fi
+}
+
+
+%%% Set up page headings and footings.
+
+\let\thispage=\folio
+
+\newtoks\evenheadline    % headline on even pages
+\newtoks\oddheadline     % headline on odd pages
+\newtoks\evenfootline    % footline on even pages
+\newtoks\oddfootline     % footline on odd pages
+
+% Now make TeX use those variables
+\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
+                            \else \the\evenheadline \fi}}
+\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
+                            \else \the\evenfootline \fi}\HEADINGShook}
+\let\HEADINGShook=\relax
+
+% Commands to set those variables.
+% For example, this is what  @headings on  does
+% @evenheading @thistitle|@thispage|@thischapter
+% @oddheading @thischapter|@thispage|@thistitle
+% @evenfooting @thisfile||
+% @oddfooting ||@thisfile
+
+
+\def\evenheading{\parsearg\evenheadingxxx}
+\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
+\def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
+\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+
+\def\oddheading{\parsearg\oddheadingxxx}
+\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
+\def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
+\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+
+\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
+
+\def\evenfooting{\parsearg\evenfootingxxx}
+\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish}
+\def\evenfootingyyy #1\|#2\|#3\|#4\finish{%
+\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+
+\def\oddfooting{\parsearg\oddfootingxxx}
+\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish}
+\def\oddfootingyyy #1\|#2\|#3\|#4\finish{%
+  \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
+  %
+  % Leave some space for the footline.  Hopefully ok to assume
+  % @evenfooting will not be used by itself.
+  \global\advance\pageheight by -\baselineskip
+  \global\advance\vsize by -\baselineskip
+}
+
+\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
+
+
+% @headings double      turns headings on for double-sided printing.
+% @headings single      turns headings on for single-sided printing.
+% @headings off         turns them off.
+% @headings on          same as @headings double, retained for compatibility.
+% @headings after       turns on double-sided headings after this page.
+% @headings doubleafter turns on double-sided headings after this page.
+% @headings singleafter turns on single-sided headings after this page.
+% By default, they are off at the start of a document,
+% and turned `on' after @end titlepage.
+
+\def\headings #1 {\csname HEADINGS#1\endcsname}
+
+\def\HEADINGSoff{%
+\global\evenheadline={\hfil} \global\evenfootline={\hfil}
+\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
+\HEADINGSoff
+% When we turn headings on, set the page number to 1.
+% For double-sided printing, put current file name in lower left corner,
+% chapter name on inside top of right hand pages, document
+% title on inside top of left hand pages, and page numbers on outside top
+% edge of all pages.
+\def\HEADINGSdouble{%
+\global\pageno=1
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\folio\hfil\thistitle}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chapoddpage
+}
+\let\contentsalignmacro = \chappager
+
+% For single-sided printing, chapter title goes across top left of page,
+% page number on top right.
+\def\HEADINGSsingle{%
+\global\pageno=1
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\thischapter\hfil\folio}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chappager
+}
+\def\HEADINGSon{\HEADINGSdouble}
+
+\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
+\let\HEADINGSdoubleafter=\HEADINGSafter
+\def\HEADINGSdoublex{%
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\folio\hfil\thistitle}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chapoddpage
+}
+
+\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
+\def\HEADINGSsinglex{%
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\thischapter\hfil\folio}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chappager
+}
+
+% Subroutines used in generating headings
+% This produces Day Month Year style of output.
+% Only define if not already defined, in case a txi-??.tex file has set
+% up a different format (e.g., txi-cs.tex does this).
+\ifx\today\undefined
+\def\today{%
+  \number\day\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
+\fi
+
+% @settitle line...  specifies the title of the document, for headings.
+% It generates no output of its own.
+\def\thistitle{\putwordNoTitle}
+\def\settitle{\parsearg{\gdef\thistitle}}
+
+
+\message{tables,}
+% Tables -- @table, @ftable, @vtable, @item(x).
+
+% default indentation of table text
+\newdimen\tableindent \tableindent=.8in
+% default indentation of @itemize and @enumerate text
+\newdimen\itemindent  \itemindent=.3in
+% margin between end of table item and start of table text.
+\newdimen\itemmargin  \itemmargin=.1in
+
+% used internally for \itemindent minus \itemmargin
+\newdimen\itemmax
+
+% Note @table, @ftable, and @vtable define @item, @itemx, etc., with
+% these defs.
+% They also define \itemindex
+% to index the item name in whatever manner is desired (perhaps none).
+
+\newif\ifitemxneedsnegativevskip
+
+\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi}
+
+\def\internalBitem{\smallbreak \parsearg\itemzzz}
+\def\internalBitemx{\itemxpar \parsearg\itemzzz}
+
+\def\itemzzz #1{\begingroup %
+  \advance\hsize by -\rightskip
+  \advance\hsize by -\tableindent
+  \setbox0=\hbox{\itemindicate{#1}}%
+  \itemindex{#1}%
+  \nobreak % This prevents a break before @itemx.
+  %
+  % If the item text does not fit in the space we have, put it on a line
+  % by itself, and do not allow a page break either before or after that
+  % line.  We do not start a paragraph here because then if the next
+  % command is, e.g., @kindex, the whatsit would get put into the
+  % horizontal list on a line by itself, resulting in extra blank space.
+  \ifdim \wd0>\itemmax
+    %
+    % Make this a paragraph so we get the \parskip glue and wrapping,
+    % but leave it ragged-right.
+    \begingroup
+      \advance\leftskip by-\tableindent
+      \advance\hsize by\tableindent
+      \advance\rightskip by0pt plus1fil
+      \leavevmode\unhbox0\par
+    \endgroup
+    %
+    % We're going to be starting a paragraph, but we don't want the
+    % \parskip glue -- logically it's part of the @item we just started.
+    \nobreak \vskip-\parskip
+    %
+    % Stop a page break at the \parskip glue coming up.  However, if
+    % what follows is an environment such as @example, there will be no
+    % \parskip glue; then the negative vskip we just inserted would
+    % cause the example and the item to crash together.  So we use this
+    % bizarre value of 10001 as a signal to \aboveenvbreak to insert
+    % \parskip glue after all.  Section titles are handled this way also.
+    % 
+    \penalty 10001
+    \endgroup
+    \itemxneedsnegativevskipfalse
+  \else
+    % The item text fits into the space.  Start a paragraph, so that the
+    % following text (if any) will end up on the same line.
+    \noindent
+    % Do this with kerns and \unhbox so that if there is a footnote in
+    % the item text, it can migrate to the main vertical list and
+    % eventually be printed.
+    \nobreak\kern-\tableindent
+    \dimen0 = \itemmax  \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0
+    \unhbox0
+    \nobreak\kern\dimen0
+    \endgroup
+    \itemxneedsnegativevskiptrue
+  \fi
+}
+
+\def\item{\errmessage{@item while not in a list environment}}
+\def\itemx{\errmessage{@itemx while not in a list environment}}
+
+% @table, @ftable, @vtable.
+\envdef\table{%
+  \let\itemindex\gobble
+  \tablecheck{table}%
+}
+\envdef\ftable{%
+  \def\itemindex ##1{\doind {fn}{\code{##1}}}%
+  \tablecheck{ftable}%
+}
+\envdef\vtable{%
+  \def\itemindex ##1{\doind {vr}{\code{##1}}}%
+  \tablecheck{vtable}%
+}
+\def\tablecheck#1{%
+  \ifnum \the\catcode`\^^M=\active
+    \endgroup
+    \errmessage{This command won't work in this context; perhaps the problem is
+      that we are \inenvironment\thisenv}%
+    \def\next{\doignore{#1}}%
+  \else
+    \let\next\tablex
+  \fi
+  \next
+}
+\def\tablex#1{%
+  \def\itemindicate{#1}%
+  \parsearg\tabley
+}
+\def\tabley#1{%
+  {%
+    \makevalueexpandable
+    \edef\temp{\noexpand\tablez #1\space\space\space}%
+    \expandafter
+  }\temp \endtablez
+}
+\def\tablez #1 #2 #3 #4\endtablez{%
+  \aboveenvbreak
+  \ifnum 0#1>0 \advance \leftskip by #1\mil \fi
+  \ifnum 0#2>0 \tableindent=#2\mil \fi
+  \ifnum 0#3>0 \advance \rightskip by #3\mil \fi
+  \itemmax=\tableindent
+  \advance \itemmax by -\itemmargin
+  \advance \leftskip by \tableindent
+  \exdentamount=\tableindent
+  \parindent = 0pt
+  \parskip = \smallskipamount
+  \ifdim \parskip=0pt \parskip=2pt \fi
+  \let\item = \internalBitem
+  \let\itemx = \internalBitemx
+}
+\def\Etable{\endgraf\afterenvbreak}
+\let\Eftable\Etable
+\let\Evtable\Etable
+\let\Eitemize\Etable
+\let\Eenumerate\Etable
+
+% This is the counter used by @enumerate, which is really @itemize
+
+\newcount \itemno
+
+\envdef\itemize{\parsearg\doitemize}
+
+\def\doitemize#1{%
+  \aboveenvbreak
+  \itemmax=\itemindent
+  \advance\itemmax by -\itemmargin
+  \advance\leftskip by \itemindent
+  \exdentamount=\itemindent
+  \parindent=0pt
+  \parskip=\smallskipamount
+  \ifdim\parskip=0pt \parskip=2pt \fi
+  \def\itemcontents{#1}%
+  % @itemize with no arg is equivalent to @itemize @bullet.
+  \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
+  \let\item=\itemizeitem
+}
+
+% Definition of @item while inside @itemize and @enumerate.
+%
+\def\itemizeitem{%
+  \advance\itemno by 1  % for enumerations
+  {\let\par=\endgraf \smallbreak}% reasonable place to break
+  {%
+   % If the document has an @itemize directly after a section title, a
+   % \nobreak will be last on the list, and \sectionheading will have
+   % done a \vskip-\parskip.  In that case, we don't want to zero
+   % parskip, or the item text will crash with the heading.  On the
+   % other hand, when there is normal text preceding the item (as there
+   % usually is), we do want to zero parskip, or there would be too much
+   % space.  In that case, we won't have a \nobreak before.  At least
+   % that's the theory.
+   \ifnum\lastpenalty<10000 \parskip=0in \fi
+   \noindent
+   \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
+   \vadjust{\penalty 1200}}% not good to break after first line of item.
+  \flushcr
+}
+
+% \splitoff TOKENS\endmark defines \first to be the first token in
+% TOKENS, and \rest to be the remainder.
+%
+\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}%
+
+% Allow an optional argument of an uppercase letter, lowercase letter,
+% or number, to specify the first label in the enumerated list.  No
+% argument is the same as `1'.
+%
+\envparseargdef\enumerate{\enumeratey #1  \endenumeratey}
+\def\enumeratey #1 #2\endenumeratey{%
+  % If we were given no argument, pretend we were given `1'.
+  \def\thearg{#1}%
+  \ifx\thearg\empty \def\thearg{1}\fi
+  %
+  % Detect if the argument is a single token.  If so, it might be a
+  % letter.  Otherwise, the only valid thing it can be is a number.
+  % (We will always have one token, because of the test we just made.
+  % This is a good thing, since \splitoff doesn't work given nothing at
+  % all -- the first parameter is undelimited.)
+  \expandafter\splitoff\thearg\endmark
+  \ifx\rest\empty
+    % Only one token in the argument.  It could still be anything.
+    % A ``lowercase letter'' is one whose \lccode is nonzero.
+    % An ``uppercase letter'' is one whose \lccode is both nonzero, and
+    %   not equal to itself.
+    % Otherwise, we assume it's a number.
+    %
+    % We need the \relax at the end of the \ifnum lines to stop TeX from
+    % continuing to look for a <number>.
+    %
+    \ifnum\lccode\expandafter`\thearg=0\relax
+      \numericenumerate % a number (we hope)
+    \else
+      % It's a letter.
+      \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax
+        \lowercaseenumerate % lowercase letter
+      \else
+        \uppercaseenumerate % uppercase letter
+      \fi
+    \fi
+  \else
+    % Multiple tokens in the argument.  We hope it's a number.
+    \numericenumerate
+  \fi
+}
+
+% An @enumerate whose labels are integers.  The starting integer is
+% given in \thearg.
+%
+\def\numericenumerate{%
+  \itemno = \thearg
+  \startenumeration{\the\itemno}%
+}
+
+% The starting (lowercase) letter is in \thearg.
+\def\lowercaseenumerate{%
+  \itemno = \expandafter`\thearg
+  \startenumeration{%
+    % Be sure we're not beyond the end of the alphabet.
+    \ifnum\itemno=0
+      \errmessage{No more lowercase letters in @enumerate; get a bigger
+                  alphabet}%
+    \fi
+    \char\lccode\itemno
+  }%
+}
+
+% The starting (uppercase) letter is in \thearg.
+\def\uppercaseenumerate{%
+  \itemno = \expandafter`\thearg
+  \startenumeration{%
+    % Be sure we're not beyond the end of the alphabet.
+    \ifnum\itemno=0
+      \errmessage{No more uppercase letters in @enumerate; get a bigger
+                  alphabet}
+    \fi
+    \char\uccode\itemno
+  }%
+}
+
+% Call \doitemize, adding a period to the first argument and supplying the
+% common last two arguments.  Also subtract one from the initial value in
+% \itemno, since @item increments \itemno.
+%
+\def\startenumeration#1{%
+  \advance\itemno by -1
+  \doitemize{#1.}\flushcr
+}
+
+% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
+% to @enumerate.
+%
+\def\alphaenumerate{\enumerate{a}}
+\def\capsenumerate{\enumerate{A}}
+\def\Ealphaenumerate{\Eenumerate}
+\def\Ecapsenumerate{\Eenumerate}
+
+
+% @multitable macros
+% Amy Hendrickson, 8/18/94, 3/6/96
+%
+% @multitable ... @end multitable will make as many columns as desired.
+% Contents of each column will wrap at width given in preamble.  Width
+% can be specified either with sample text given in a template line,
+% or in percent of \hsize, the current width of text on page.
+
+% Table can continue over pages but will only break between lines.
+
+% To make preamble:
+%
+% Either define widths of columns in terms of percent of \hsize:
+%   @multitable @columnfractions .25 .3 .45
+%   @item ...
+%
+%   Numbers following @columnfractions are the percent of the total
+%   current hsize to be used for each column. You may use as many
+%   columns as desired.
+
+
+% Or use a template:
+%   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
+%   @item ...
+%   using the widest term desired in each column.
+
+% Each new table line starts with @item, each subsequent new column
+% starts with @tab. Empty columns may be produced by supplying @tab's
+% with nothing between them for as many times as empty columns are needed,
+% ie, @tab@tab@tab will produce two empty columns.
+
+% @item, @tab do not need to be on their own lines, but it will not hurt
+% if they are.
+
+% Sample multitable:
+
+%   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
+%   @item first col stuff @tab second col stuff @tab third col
+%   @item
+%   first col stuff
+%   @tab
+%   second col stuff
+%   @tab
+%   third col
+%   @item first col stuff @tab second col stuff
+%   @tab Many paragraphs of text may be used in any column.
+%
+%         They will wrap at the width determined by the template.
+%   @item@tab@tab This will be in third column.
+%   @end multitable
+
+% Default dimensions may be reset by user.
+% @multitableparskip is vertical space between paragraphs in table.
+% @multitableparindent is paragraph indent in table.
+% @multitablecolmargin is horizontal space to be left between columns.
+% @multitablelinespace is space to leave between table items, baseline
+%                                                            to baseline.
+%   0pt means it depends on current normal line spacing.
+%
+\newskip\multitableparskip
+\newskip\multitableparindent
+\newdimen\multitablecolspace
+\newskip\multitablelinespace
+\multitableparskip=0pt
+\multitableparindent=6pt
+\multitablecolspace=12pt
+\multitablelinespace=0pt
+
+% Macros used to set up halign preamble:
+%
+\let\endsetuptable\relax
+\def\xendsetuptable{\endsetuptable}
+\let\columnfractions\relax
+\def\xcolumnfractions{\columnfractions}
+\newif\ifsetpercent
+
+% #1 is the @columnfraction, usually a decimal number like .5, but might
+% be just 1.  We just use it, whatever it is.
+%
+\def\pickupwholefraction#1 {%
+  \global\advance\colcount by 1
+  \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
+  \setuptable
+}
+
+\newcount\colcount
+\def\setuptable#1{%
+  \def\firstarg{#1}%
+  \ifx\firstarg\xendsetuptable
+    \let\go = \relax
+  \else
+    \ifx\firstarg\xcolumnfractions
+      \global\setpercenttrue
+    \else
+      \ifsetpercent
+         \let\go\pickupwholefraction
+      \else
+         \global\advance\colcount by 1
+         \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
+                   % separator; typically that is always in the input, anyway.
+         \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
+      \fi
+    \fi
+    \ifx\go\pickupwholefraction
+      % Put the argument back for the \pickupwholefraction call, so
+      % we'll always have a period there to be parsed.
+      \def\go{\pickupwholefraction#1}%
+    \else
+      \let\go = \setuptable
+    \fi%
+  \fi
+  \go
+}
+
+% multitable-only commands.
+%
+% @headitem starts a heading row, which we typeset in bold.
+% Assignments have to be global since we are inside the implicit group
+% of an alignment entry.  Note that \everycr resets \everytab.
+\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
+%
+% A \tab used to include \hskip1sp.  But then the space in a template
+% line is not enough.  That is bad.  So let's go back to just `&' until
+% we encounter the problem it was intended to solve again.
+%					--karl, nathan@acm.org, 20apr99.
+\def\tab{\checkenv\multitable &\the\everytab}%
+
+% @multitable ... @end multitable definitions:
+%
+\newtoks\everytab  % insert after every tab.
+%
+\envdef\multitable{%
+  \vskip\parskip
+  \startsavinginserts
+  %
+  % @item within a multitable starts a normal row.
+  % We use \def instead of \let so that if one of the multitable entries
+  % contains an @itemize, we don't choke on the \item (seen as \crcr aka
+  % \endtemplate) expanding \doitemize.
+  \def\item{\crcr}%
+  %
+  \tolerance=9500
+  \hbadness=9500
+  \setmultitablespacing
+  \parskip=\multitableparskip
+  \parindent=\multitableparindent
+  \overfullrule=0pt
+  \global\colcount=0
+  %
+  \everycr = {%
+    \noalign{%
+      \global\everytab={}%
+      \global\colcount=0 % Reset the column counter.
+      % Check for saved footnotes, etc.
+      \checkinserts
+      % Keeps underfull box messages off when table breaks over pages.
+      %\filbreak
+	% Maybe so, but it also creates really weird page breaks when the
+	% table breaks over pages. Wouldn't \vfil be better?  Wait until the
+	% problem manifests itself, so it can be fixed for real --karl.
+    }%
+  }%
+  %
+  \parsearg\domultitable
+}
+\def\domultitable#1{%
+  % To parse everything between @multitable and @item:
+  \setuptable#1 \endsetuptable
+  %
+  % This preamble sets up a generic column definition, which will
+  % be used as many times as user calls for columns.
+  % \vtop will set a single line and will also let text wrap and
+  % continue for many paragraphs if desired.
+  \halign\bgroup &%
+    \global\advance\colcount by 1
+    \multistrut
+    \vtop{%
+      % Use the current \colcount to find the correct column width:
+      \hsize=\expandafter\csname col\the\colcount\endcsname
+      %
+      % In order to keep entries from bumping into each other
+      % we will add a \leftskip of \multitablecolspace to all columns after
+      % the first one.
+      %
+      % If a template has been used, we will add \multitablecolspace
+      % to the width of each template entry.
+      %
+      % If the user has set preamble in terms of percent of \hsize we will
+      % use that dimension as the width of the column, and the \leftskip
+      % will keep entries from bumping into each other.  Table will start at
+      % left margin and final column will justify at right margin.
+      %
+      % Make sure we don't inherit \rightskip from the outer environment.
+      \rightskip=0pt
+      \ifnum\colcount=1
+	% The first column will be indented with the surrounding text.
+	\advance\hsize by\leftskip
+      \else
+	\ifsetpercent \else
+	  % If user has not set preamble in terms of percent of \hsize
+	  % we will advance \hsize by \multitablecolspace.
+	  \advance\hsize by \multitablecolspace
+	\fi
+       % In either case we will make \leftskip=\multitablecolspace:
+      \leftskip=\multitablecolspace
+      \fi
+      % Ignoring space at the beginning and end avoids an occasional spurious
+      % blank line, when TeX decides to break the line at the space before the
+      % box from the multistrut, so the strut ends up on a line by itself.
+      % For example:
+      % @multitable @columnfractions .11 .89
+      % @item @code{#}
+      % @tab Legal holiday which is valid in major parts of the whole country.
+      % Is automatically provided with highlighting sequences respectively
+      % marking characters.
+      \noindent\ignorespaces##\unskip\multistrut
+    }\cr
+}
+\def\Emultitable{%
+  \crcr
+  \egroup % end the \halign
+  \global\setpercentfalse
+}
+
+\def\setmultitablespacing{%
+  \def\multistrut{\strut}% just use the standard line spacing
+  %
+  % Compute \multitablelinespace (if not defined by user) for use in
+  % \multitableparskip calculation.  We used define \multistrut based on
+  % this, but (ironically) that caused the spacing to be off.
+  % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
+\ifdim\multitablelinespace=0pt
+\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
+\global\advance\multitablelinespace by-\ht0
+\fi
+%% Test to see if parskip is larger than space between lines of
+%% table. If not, do nothing.
+%%        If so, set to same dimension as multitablelinespace.
+\ifdim\multitableparskip>\multitablelinespace
+\global\multitableparskip=\multitablelinespace
+\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
+                                      %% than skip between lines in the table.
+\fi%
+\ifdim\multitableparskip=0pt
+\global\multitableparskip=\multitablelinespace
+\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
+                                      %% than skip between lines in the table.
+\fi}
+
+
+\message{conditionals,}
+
+% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
+% @ifnotxml always succeed.  They currently do nothing; we don't
+% attempt to check whether the conditionals are properly nested.  But we
+% have to remember that they are conditionals, so that @end doesn't
+% attempt to close an environment group.
+%
+\def\makecond#1{%
+  \expandafter\let\csname #1\endcsname = \relax
+  \expandafter\let\csname iscond.#1\endcsname = 1
+}
+\makecond{iftex}
+\makecond{ifnotdocbook}
+\makecond{ifnothtml}
+\makecond{ifnotinfo}
+\makecond{ifnotplaintext}
+\makecond{ifnotxml}
+
+% Ignore @ignore, @ifhtml, @ifinfo, and the like.
+%
+\def\direntry{\doignore{direntry}}
+\def\documentdescription{\doignore{documentdescription}}
+\def\docbook{\doignore{docbook}}
+\def\html{\doignore{html}}
+\def\ifdocbook{\doignore{ifdocbook}}
+\def\ifhtml{\doignore{ifhtml}}
+\def\ifinfo{\doignore{ifinfo}}
+\def\ifnottex{\doignore{ifnottex}}
+\def\ifplaintext{\doignore{ifplaintext}}
+\def\ifxml{\doignore{ifxml}}
+\def\ignore{\doignore{ignore}}
+\def\menu{\doignore{menu}}
+\def\xml{\doignore{xml}}
+
+% Ignore text until a line `@end #1', keeping track of nested conditionals.
+%
+% A count to remember the depth of nesting.
+\newcount\doignorecount
+
+\def\doignore#1{\begingroup
+  % Scan in ``verbatim'' mode:
+  \catcode`\@ = \other
+  \catcode`\{ = \other
+  \catcode`\} = \other
+  %
+  % Make sure that spaces turn into tokens that match what \doignoretext wants.
+  \spaceisspace
+  %
+  % Count number of #1's that we've seen.
+  \doignorecount = 0
+  %
+  % Swallow text until we reach the matching `@end #1'.
+  \dodoignore{#1}%
+}
+
+{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
+  \obeylines %
+  %
+  \gdef\dodoignore#1{%
+    % #1 contains the command name as a string, e.g., `ifinfo'.
+    %
+    % Define a command to find the next `@end #1', which must be on a line
+    % by itself.
+    \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
+    % And this command to find another #1 command, at the beginning of a
+    % line.  (Otherwise, we would consider a line `@c @ifset', for
+    % example, to count as an @ifset for nesting.)
+    \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
+    %
+    % And now expand that command.
+    \obeylines %
+    \doignoretext ^^M%
+  }%
+}
+
+\def\doignoreyyy#1{%
+  \def\temp{#1}%
+  \ifx\temp\empty			% Nothing found.
+    \let\next\doignoretextzzz
+  \else					% Found a nested condition, ...
+    \advance\doignorecount by 1
+    \let\next\doignoretextyyy		% ..., look for another.
+    % If we're here, #1 ends with ^^M\ifinfo (for example).
+  \fi
+  \next #1% the token \_STOP_ is present just after this macro.
+}
+
+% We have to swallow the remaining "\_STOP_".
+%
+\def\doignoretextzzz#1{%
+  \ifnum\doignorecount = 0	% We have just found the outermost @end.
+    \let\next\enddoignore
+  \else				% Still inside a nested condition.
+    \advance\doignorecount by -1
+    \let\next\doignoretext      % Look for the next @end.
+  \fi
+  \next
+}
+
+% Finish off ignored text.
+\def\enddoignore{\endgroup\ignorespaces}
+
+
+% @set VAR sets the variable VAR to an empty value.
+% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
+%
+% Since we want to separate VAR from REST-OF-LINE (which might be
+% empty), we can't just use \parsearg; we have to insert a space of our
+% own to delimit the rest of the line, and then take it out again if we
+% didn't need it.
+% We rely on the fact that \parsearg sets \catcode`\ =10.
+%
+\parseargdef\set{\setyyy#1 \endsetyyy}
+\def\setyyy#1 #2\endsetyyy{%
+  {%
+    \makevalueexpandable
+    \def\temp{#2}%
+    \edef\next{\gdef\makecsname{SET#1}}%
+    \ifx\temp\empty
+      \next{}%
+    \else
+      \setzzz#2\endsetzzz
+    \fi
+  }%
+}
+% Remove the trailing space \setxxx inserted.
+\def\setzzz#1 \endsetzzz{\next{#1}}
+
+% @clear VAR clears (i.e., unsets) the variable VAR.
+%
+\parseargdef\clear{%
+  {%
+    \makevalueexpandable
+    \global\expandafter\let\csname SET#1\endcsname=\relax
+  }%
+}
+
+% @value{foo} gets the text saved in variable foo.
+\def\value{\begingroup\makevalueexpandable\valuexxx}
+\def\valuexxx#1{\expandablevalue{#1}\endgroup}
+{
+  \catcode`\- = \active \catcode`\_ = \active
+  %
+  \gdef\makevalueexpandable{%
+    \let\value = \expandablevalue
+    % We don't want these characters active, ...
+    \catcode`\-=\other \catcode`\_=\other
+    % ..., but we might end up with active ones in the argument if
+    % we're called from @code, as @code{@value{foo-bar_}}, though.
+    % So \let them to their normal equivalents.
+    \let-\realdash \let_\normalunderscore
+  }
+}
+
+% We have this subroutine so that we can handle at least some @value's
+% properly in indexes (we call \makevalueexpandable in \indexdummies).
+% The command has to be fully expandable (if the variable is set), since
+% the result winds up in the index file.  This means that if the
+% variable's value contains other Texinfo commands, it's almost certain
+% it will fail (although perhaps we could fix that with sufficient work
+% to do a one-level expansion on the result, instead of complete).
+%
+\def\expandablevalue#1{%
+  \expandafter\ifx\csname SET#1\endcsname\relax
+    {[No value for ``#1'']}%
+    \message{Variable `#1', used in @value, is not set.}%
+  \else
+    \csname SET#1\endcsname
+  \fi
+}
+
+% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
+% with @set.
+%
+% To get special treatment of `@end ifset,' call \makeond and the redefine.
+%
+\makecond{ifset}
+\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
+\def\doifset#1#2{%
+  {%
+    \makevalueexpandable
+    \let\next=\empty
+    \expandafter\ifx\csname SET#2\endcsname\relax
+      #1% If not set, redefine \next.
+    \fi
+    \expandafter
+  }\next
+}
+\def\ifsetfail{\doignore{ifset}}
+
+% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
+% defined with @set, or has been undefined with @clear.
+%
+% The `\else' inside the `\doifset' parameter is a trick to reuse the
+% above code: if the variable is not set, do nothing, if it is set,
+% then redefine \next to \ifclearfail.
+%
+\makecond{ifclear}
+\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
+\def\ifclearfail{\doignore{ifclear}}
+
+% @dircategory CATEGORY  -- specify a category of the dir file
+% which this file should belong to.  Ignore this in TeX.
+\let\dircategory=\comment
+
+% @defininfoenclose.
+\let\definfoenclose=\comment
+
+
+\message{indexing,}
+% Index generation facilities
+
+% Define \newwrite to be identical to plain tex's \newwrite
+% except not \outer, so it can be used within macros and \if's.
+\edef\newwrite{\makecsname{ptexnewwrite}}
+
+% \newindex {foo} defines an index named foo.
+% It automatically defines \fooindex such that
+% \fooindex ...rest of line... puts an entry in the index foo.
+% It also defines \fooindfile to be the number of the output channel for
+% the file that accumulates this index.  The file's extension is foo.
+% The name of an index should be no more than 2 characters long
+% for the sake of vms.
+%
+\def\newindex#1{%
+  \iflinks
+    \expandafter\newwrite \csname#1indfile\endcsname
+    \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
+  \fi
+  \expandafter\xdef\csname#1index\endcsname{%     % Define @#1index
+    \noexpand\doindex{#1}}
+}
+
+% @defindex foo  ==  \newindex{foo}
+%
+\def\defindex{\parsearg\newindex}
+
+% Define @defcodeindex, like @defindex except put all entries in @code.
+%
+\def\defcodeindex{\parsearg\newcodeindex}
+%
+\def\newcodeindex#1{%
+  \iflinks
+    \expandafter\newwrite \csname#1indfile\endcsname
+    \openout \csname#1indfile\endcsname \jobname.#1
+  \fi
+  \expandafter\xdef\csname#1index\endcsname{%
+    \noexpand\docodeindex{#1}}%
+}
+
+
+% @synindex foo bar    makes index foo feed into index bar.
+% Do this instead of @defindex foo if you don't want it as a separate index.
+%
+% @syncodeindex foo bar   similar, but put all entries made for index foo
+% inside @code.
+%
+\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
+\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
+
+% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
+% #3 the target index (bar).
+\def\dosynindex#1#2#3{%
+  % Only do \closeout if we haven't already done it, else we'll end up
+  % closing the target index.
+  \expandafter \ifx\csname donesynindex#2\endcsname \undefined
+    % The \closeout helps reduce unnecessary open files; the limit on the
+    % Acorn RISC OS is a mere 16 files.
+    \expandafter\closeout\csname#2indfile\endcsname
+    \expandafter\let\csname\donesynindex#2\endcsname = 1
+  \fi
+  % redefine \fooindfile:
+  \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
+  \expandafter\let\csname#2indfile\endcsname=\temp
+  % redefine \fooindex:
+  \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}%
+}
+
+% Define \doindex, the driver for all \fooindex macros.
+% Argument #1 is generated by the calling \fooindex macro,
+%  and it is "foo", the name of the index.
+
+% \doindex just uses \parsearg; it calls \doind for the actual work.
+% This is because \doind is more useful to call from other macros.
+
+% There is also \dosubind {index}{topic}{subtopic}
+% which makes an entry in a two-level index such as the operation index.
+
+\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer}
+\def\singleindexer #1{\doind{\indexname}{#1}}
+
+% like the previous two, but they put @code around the argument.
+\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
+\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
+
+% Take care of Texinfo commands that can appear in an index entry.
+% Since there are some commands we want to expand, and others we don't,
+% we have to laboriously prevent expansion for those that we don't.
+%
+\def\indexdummies{%
+  \escapechar = `\\     % use backslash in output files.
+  \def\@{@}% change to @@ when we switch to @ as escape char in index files.
+  \def\ {\realbackslash\space }%
+  % Need these in case \tex is in effect and \{ is a \delimiter again.
+  % But can't use \lbracecmd and \rbracecmd because texindex assumes
+  % braces and backslashes are used only as delimiters.
+  \let\{ = \mylbrace
+  \let\} = \myrbrace
+  %
+  % Do the redefinitions.
+  \commondummies
+}
+
+% For the aux and toc files, @ is the escape character.  So we want to
+% redefine everything using @ as the escape character (instead of
+% \realbackslash, still used for index files).  When everything uses @,
+% this will be simpler.
+%
+\def\atdummies{%
+  \def\@{@@}%
+  \def\ {@ }%
+  \let\{ = \lbraceatcmd
+  \let\} = \rbraceatcmd
+  %
+  % Do the redefinitions.
+  \commondummies
+}
+
+% Called from \indexdummies and \atdummies.
+%
+\def\commondummies{%
+  %
+  % \definedummyword defines \#1 as \string\#1\space, thus effectively
+  % preventing its expansion.  This is used only for control% words,
+  % not control letters, because the \space would be incorrect for
+  % control characters, but is needed to separate the control word
+  % from whatever follows.
+  %
+  % For control letters, we have \definedummyletter, which omits the
+  % space.
+  %
+  % These can be used both for control words that take an argument and
+  % those that do not.  If it is followed by {arg} in the input, then
+  % that will dutifully get written to the index (or wherever).
+  %
+  \def\definedummyword  ##1{\def##1{\string##1\space}}%
+  \def\definedummyletter##1{\def##1{\string##1}}%
+  \let\definedummyaccent\definedummyletter
+  %
+  \commondummiesnofonts
+  %
+  \definedummyletter\_%
+  %
+  % Non-English letters.
+  \definedummyword\AA
+  \definedummyword\AE
+  \definedummyword\L
+  \definedummyword\OE
+  \definedummyword\O
+  \definedummyword\aa
+  \definedummyword\ae
+  \definedummyword\l
+  \definedummyword\oe
+  \definedummyword\o
+  \definedummyword\ss
+  \definedummyword\exclamdown
+  \definedummyword\questiondown
+  \definedummyword\ordf
+  \definedummyword\ordm
+  %
+  % Although these internal commands shouldn't show up, sometimes they do.
+  \definedummyword\bf
+  \definedummyword\gtr
+  \definedummyword\hat
+  \definedummyword\less
+  \definedummyword\sf
+  \definedummyword\sl
+  \definedummyword\tclose
+  \definedummyword\tt
+  %
+  \definedummyword\LaTeX
+  \definedummyword\TeX
+  %
+  % Assorted special characters.
+  \definedummyword\bullet
+  \definedummyword\comma
+  \definedummyword\copyright
+  \definedummyword\registeredsymbol
+  \definedummyword\dots
+  \definedummyword\enddots
+  \definedummyword\equiv
+  \definedummyword\error
+  \definedummyword\euro
+  \definedummyword\expansion
+  \definedummyword\minus
+  \definedummyword\pounds
+  \definedummyword\point
+  \definedummyword\print
+  \definedummyword\result
+  %
+  % We want to disable all macros so that they are not expanded by \write.
+  \macrolist
+  %
+  \normalturnoffactive
+  %
+  % Handle some cases of @value -- where it does not contain any
+  % (non-fully-expandable) commands.
+  \makevalueexpandable
+}
+
+% \commondummiesnofonts: common to \commondummies and \indexnofonts.
+%
+% Better have this without active chars.
+{
+  \catcode`\~=\other
+  \gdef\commondummiesnofonts{%
+    % Control letters and accents.
+    \definedummyletter\!%
+    \definedummyaccent\"%
+    \definedummyaccent\'%
+    \definedummyletter\*%
+    \definedummyaccent\,%
+    \definedummyletter\.%
+    \definedummyletter\/%
+    \definedummyletter\:%
+    \definedummyaccent\=%
+    \definedummyletter\?%
+    \definedummyaccent\^%
+    \definedummyaccent\`%
+    \definedummyaccent\~%
+    \definedummyword\u
+    \definedummyword\v
+    \definedummyword\H
+    \definedummyword\dotaccent
+    \definedummyword\ringaccent
+    \definedummyword\tieaccent
+    \definedummyword\ubaraccent
+    \definedummyword\udotaccent
+    \definedummyword\dotless
+    %
+    % Texinfo font commands.
+    \definedummyword\b
+    \definedummyword\i
+    \definedummyword\r
+    \definedummyword\sc
+    \definedummyword\t
+    %
+    % Commands that take arguments.
+    \definedummyword\acronym
+    \definedummyword\cite
+    \definedummyword\code
+    \definedummyword\command
+    \definedummyword\dfn
+    \definedummyword\emph
+    \definedummyword\env
+    \definedummyword\file
+    \definedummyword\kbd
+    \definedummyword\key
+    \definedummyword\math
+    \definedummyword\option
+    \definedummyword\samp
+    \definedummyword\strong
+    \definedummyword\tie
+    \definedummyword\uref
+    \definedummyword\url
+    \definedummyword\var
+    \definedummyword\verb
+    \definedummyword\w
+  }
+}
+
+% \indexnofonts is used when outputting the strings to sort the index
+% by, and when constructing control sequence names.  It eliminates all
+% control sequences and just writes whatever the best ASCII sort string
+% would be for a given command (usually its argument).
+%
+\def\indexnofonts{%
+  % Accent commands should become @asis.
+  \def\definedummyaccent##1{\let##1\asis}%
+  % We can just ignore other control letters.
+  \def\definedummyletter##1{\let##1\empty}%
+  % Hopefully, all control words can become @asis.
+  \let\definedummyword\definedummyaccent
+  %
+  \commondummiesnofonts
+  %
+  % Don't no-op \tt, since it isn't a user-level command
+  % and is used in the definitions of the active chars like <, >, |, etc.
+  % Likewise with the other plain tex font commands.
+  %\let\tt=\asis
+  %
+  \def\ { }%
+  \def\@{@}%
+  % how to handle braces?
+  \def\_{\normalunderscore}%
+  %
+  % Non-English letters.
+  \def\AA{AA}%
+  \def\AE{AE}%
+  \def\L{L}%
+  \def\OE{OE}%
+  \def\O{O}%
+  \def\aa{aa}%
+  \def\ae{ae}%
+  \def\l{l}%
+  \def\oe{oe}%
+  \def\o{o}%
+  \def\ss{ss}%
+  \def\exclamdown{!}%
+  \def\questiondown{?}%
+  \def\ordf{a}%
+  \def\ordm{o}%
+  %
+  \def\LaTeX{LaTeX}%
+  \def\TeX{TeX}%
+  %
+  % Assorted special characters.
+  % (The following {} will end up in the sort string, but that's ok.)
+  \def\bullet{bullet}%
+  \def\comma{,}%
+  \def\copyright{copyright}%
+  \def\registeredsymbol{R}%
+  \def\dots{...}%
+  \def\enddots{...}%
+  \def\equiv{==}%
+  \def\error{error}%
+  \def\euro{euro}%
+  \def\expansion{==>}%
+  \def\minus{-}%
+  \def\pounds{pounds}%
+  \def\point{.}%
+  \def\print{-|}%
+  \def\result{=>}%
+  %
+  % We need to get rid of all macros, leaving only the arguments (if present).
+  % Of course this is not nearly correct, but it is the best we can do for now.
+  % makeinfo does not expand macros in the argument to @deffn, which ends up
+  % writing an index entry, and texindex isn't prepared for an index sort entry
+  % that starts with \.
+  % 
+  % Since macro invocations are followed by braces, we can just redefine them
+  % to take a single TeX argument.  The case of a macro invocation that
+  % goes to end-of-line is not handled.
+  % 
+  \macrolist
+}
+
+\let\indexbackslash=0  %overridden during \printindex.
+\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
+
+% Most index entries go through here, but \dosubind is the general case.
+% #1 is the index name, #2 is the entry text.
+\def\doind#1#2{\dosubind{#1}{#2}{}}
+
+% Workhorse for all \fooindexes.
+% #1 is name of index, #2 is stuff to put there, #3 is subentry --
+% empty if called from \doind, as we usually are (the main exception
+% is with most defuns, which call us directly).
+%
+\def\dosubind#1#2#3{%
+  \iflinks
+  {%
+    % Store the main index entry text (including the third arg).
+    \toks0 = {#2}%
+    % If third arg is present, precede it with a space.
+    \def\thirdarg{#3}%
+    \ifx\thirdarg\empty \else
+      \toks0 = \expandafter{\the\toks0 \space #3}%
+    \fi
+    %
+    \edef\writeto{\csname#1indfile\endcsname}%
+    %
+    \ifvmode
+      \dosubindsanitize
+    \else
+      \dosubindwrite
+    \fi
+  }%
+  \fi
+}
+
+% Write the entry in \toks0 to the index file:
+%
+\def\dosubindwrite{%
+  % Put the index entry in the margin if desired.
+  \ifx\SETmarginindex\relax\else
+    \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
+  \fi
+  %
+  % Remember, we are within a group.
+  \indexdummies % Must do this here, since \bf, etc expand at this stage
+  \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
+      % so it will be output as is; and it will print as backslash.
+  %
+  % Process the index entry with all font commands turned off, to
+  % get the string to sort by.
+  {\indexnofonts
+   \edef\temp{\the\toks0}% need full expansion
+   \xdef\indexsorttmp{\temp}%
+  }%
+  %
+  % Set up the complete index entry, with both the sort key and
+  % the original text, including any font commands.  We write
+  % three arguments to \entry to the .?? file (four in the
+  % subentry case), texindex reduces to two when writing the .??s
+  % sorted result.
+  \edef\temp{%
+    \write\writeto{%
+      \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}%
+  }%
+  \temp
+}
+
+% Take care of unwanted page breaks:
+%
+% If a skip is the last thing on the list now, preserve it
+% by backing up by \lastskip, doing the \write, then inserting
+% the skip again.  Otherwise, the whatsit generated by the
+% \write will make \lastskip zero.  The result is that sequences
+% like this:
+% @end defun
+% @tindex whatever
+% @defun ...
+% will have extra space inserted, because the \medbreak in the
+% start of the @defun won't see the skip inserted by the @end of
+% the previous defun.
+%
+% But don't do any of this if we're not in vertical mode.  We
+% don't want to do a \vskip and prematurely end a paragraph.
+%
+% Avoid page breaks due to these extra skips, too.
+%
+% But wait, there is a catch there:
+% We'll have to check whether \lastskip is zero skip.  \ifdim is not
+% sufficient for this purpose, as it ignores stretch and shrink parts
+% of the skip.  The only way seems to be to check the textual
+% representation of the skip.
+%
+% The following is almost like \def\zeroskipmacro{0.0pt} except that
+% the ``p'' and ``t'' characters have catcode \other, not 11 (letter).
+%
+\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
+%
+% ..., ready, GO:
+%
+\def\dosubindsanitize{%
+  % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
+  \skip0 = \lastskip
+  \edef\lastskipmacro{\the\lastskip}%
+  \count255 = \lastpenalty
+  %
+  % If \lastskip is nonzero, that means the last item was a
+  % skip.  And since a skip is discardable, that means this
+  % -\skip0 glue we're inserting is preceded by a
+  % non-discardable item, therefore it is not a potential
+  % breakpoint, therefore no \nobreak needed.
+  \ifx\lastskipmacro\zeroskipmacro
+  \else
+    \vskip-\skip0
+  \fi
+  %
+  \dosubindwrite
+  %
+  \ifx\lastskipmacro\zeroskipmacro
+    % If \lastskip was zero, perhaps the last item was a penalty, and
+    % perhaps it was >=10000, e.g., a \nobreak.  In that case, we want
+    % to re-insert the same penalty (values >10000 are used for various
+    % signals); since we just inserted a non-discardable item, any
+    % following glue (such as a \parskip) would be a breakpoint.  For example:
+    % 
+    %   @deffn deffn-whatever
+    %   @vindex index-whatever
+    %   Description.
+    % would allow a break between the index-whatever whatsit
+    % and the "Description." paragraph.
+    \ifnum\count255>9999 \penalty\count255 \fi
+  \else
+    % On the other hand, if we had a nonzero \lastskip,
+    % this make-up glue would be preceded by a non-discardable item
+    % (the whatsit from the \write), so we must insert a \nobreak.
+    \nobreak\vskip\skip0
+  \fi
+}
+
+% The index entry written in the file actually looks like
+%  \entry {sortstring}{page}{topic}
+% or
+%  \entry {sortstring}{page}{topic}{subtopic}
+% The texindex program reads in these files and writes files
+% containing these kinds of lines:
+%  \initial {c}
+%     before the first topic whose initial is c
+%  \entry {topic}{pagelist}
+%     for a topic that is used without subtopics
+%  \primary {topic}
+%     for the beginning of a topic that is used with subtopics
+%  \secondary {subtopic}{pagelist}
+%     for each subtopic.
+
+% Define the user-accessible indexing commands
+% @findex, @vindex, @kindex, @cindex.
+
+\def\findex {\fnindex}
+\def\kindex {\kyindex}
+\def\cindex {\cpindex}
+\def\vindex {\vrindex}
+\def\tindex {\tpindex}
+\def\pindex {\pgindex}
+
+\def\cindexsub {\begingroup\obeylines\cindexsub}
+{\obeylines %
+\gdef\cindexsub "#1" #2^^M{\endgroup %
+\dosubind{cp}{#2}{#1}}}
+
+% Define the macros used in formatting output of the sorted index material.
+
+% @printindex causes a particular index (the ??s file) to get printed.
+% It does not print any chapter heading (usually an @unnumbered).
+%
+\parseargdef\printindex{\begingroup
+  \dobreak \chapheadingskip{10000}%
+  %
+  \smallfonts \rm
+  \tolerance = 9500
+  \everypar = {}% don't want the \kern\-parindent from indentation suppression.
+  %
+  % See if the index file exists and is nonempty.
+  % Change catcode of @ here so that if the index file contains
+  % \initial {@}
+  % as its first line, TeX doesn't complain about mismatched braces
+  % (because it thinks @} is a control sequence).
+  \catcode`\@ = 11
+  \openin 1 \jobname.#1s
+  \ifeof 1
+    % \enddoublecolumns gets confused if there is no text in the index,
+    % and it loses the chapter title and the aux file entries for the
+    % index.  The easiest way to prevent this problem is to make sure
+    % there is some text.
+    \putwordIndexNonexistent
+  \else
+    %
+    % If the index file exists but is empty, then \openin leaves \ifeof
+    % false.  We have to make TeX try to read something from the file, so
+    % it can discover if there is anything in it.
+    \read 1 to \temp
+    \ifeof 1
+      \putwordIndexIsEmpty
+    \else
+      % Index files are almost Texinfo source, but we use \ as the escape
+      % character.  It would be better to use @, but that's too big a change
+      % to make right now.
+      \def\indexbackslash{\backslashcurfont}%
+      \catcode`\\ = 0
+      \escapechar = `\\
+      \begindoublecolumns
+      \input \jobname.#1s
+      \enddoublecolumns
+    \fi
+  \fi
+  \closein 1
+\endgroup}
+
+% These macros are used by the sorted index file itself.
+% Change them to control the appearance of the index.
+
+\def\initial#1{{%
+  % Some minor font changes for the special characters.
+  \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
+  %
+  % Remove any glue we may have, we'll be inserting our own.
+  \removelastskip
+  %
+  % We like breaks before the index initials, so insert a bonus.
+  \nobreak
+  \vskip 0pt plus 3\baselineskip
+  \penalty 0
+  \vskip 0pt plus -3\baselineskip
+  %
+  % Typeset the initial.  Making this add up to a whole number of
+  % baselineskips increases the chance of the dots lining up from column
+  % to column.  It still won't often be perfect, because of the stretch
+  % we need before each entry, but it's better.
+  %
+  % No shrink because it confuses \balancecolumns.
+  \vskip 1.67\baselineskip plus .5\baselineskip
+  \leftline{\secbf #1}%
+  % Do our best not to break after the initial.
+  \nobreak
+  \vskip .33\baselineskip plus .1\baselineskip
+}}
+
+% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
+% then page number (#2) flushed to the right margin.  It is used for index
+% and table of contents entries.  The paragraph is indented by \leftskip.
+%
+% A straightforward implementation would start like this:
+%	\def\entry#1#2{...
+% But this frozes the catcodes in the argument, and can cause problems to
+% @code, which sets - active.  This problem was fixed by a kludge---
+% ``-'' was active throughout whole index, but this isn't really right.
+%
+% The right solution is to prevent \entry from swallowing the whole text.
+%                                 --kasal, 21nov03
+\def\entry{%
+  \begingroup
+    %
+    % Start a new paragraph if necessary, so our assignments below can't
+    % affect previous text.
+    \par
+    %
+    % Do not fill out the last line with white space.
+    \parfillskip = 0in
+    %
+    % No extra space above this paragraph.
+    \parskip = 0in
+    %
+    % Do not prefer a separate line ending with a hyphen to fewer lines.
+    \finalhyphendemerits = 0
+    %
+    % \hangindent is only relevant when the entry text and page number
+    % don't both fit on one line.  In that case, bob suggests starting the
+    % dots pretty far over on the line.  Unfortunately, a large
+    % indentation looks wrong when the entry text itself is broken across
+    % lines.  So we use a small indentation and put up with long leaders.
+    %
+    % \hangafter is reset to 1 (which is the value we want) at the start
+    % of each paragraph, so we need not do anything with that.
+    \hangindent = 2em
+    %
+    % When the entry text needs to be broken, just fill out the first line
+    % with blank space.
+    \rightskip = 0pt plus1fil
+    %
+    % A bit of stretch before each entry for the benefit of balancing
+    % columns.
+    \vskip 0pt plus1pt
+    %
+    % Swallow the left brace of the text (first parameter):
+    \afterassignment\doentry
+    \let\temp =
+}
+\def\doentry{%
+    \bgroup % Instead of the swallowed brace.
+      \noindent
+      \aftergroup\finishentry
+      % And now comes the text of the entry.
+}
+\def\finishentry#1{%
+    % #1 is the page number.
+    %
+    % The following is kludged to not output a line of dots in the index if
+    % there are no page numbers.  The next person who breaks this will be
+    % cursed by a Unix daemon.
+    \def\tempa{{\rm }}%
+    \def\tempb{#1}%
+    \edef\tempc{\tempa}%
+    \edef\tempd{\tempb}%
+    \ifx\tempc\tempd
+      \ %
+    \else
+      %
+      % If we must, put the page number on a line of its own, and fill out
+      % this line with blank space.  (The \hfil is overwhelmed with the
+      % fill leaders glue in \indexdotfill if the page number does fit.)
+      \hfil\penalty50
+      \null\nobreak\indexdotfill % Have leaders before the page number.
+      %
+      % The `\ ' here is removed by the implicit \unskip that TeX does as
+      % part of (the primitive) \par.  Without it, a spurious underfull
+      % \hbox ensues.
+      \ifpdf
+	\pdfgettoks#1.%
+	\ \the\toksA
+      \else
+	\ #1%
+      \fi
+    \fi
+    \par
+  \endgroup
+}
+
+% Like \dotfill except takes at least 1 em.
+\def\indexdotfill{\cleaders
+  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
+
+\def\primary #1{\line{#1\hfil}}
+
+\newskip\secondaryindent \secondaryindent=0.5cm
+\def\secondary#1#2{{%
+  \parfillskip=0in
+  \parskip=0in
+  \hangindent=1in
+  \hangafter=1
+  \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
+  \ifpdf
+    \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
+  \else
+    #2
+  \fi
+  \par
+}}
+
+% Define two-column mode, which we use to typeset indexes.
+% Adapted from the TeXbook, page 416, which is to say,
+% the manmac.tex format used to print the TeXbook itself.
+\catcode`\@=11
+
+\newbox\partialpage
+\newdimen\doublecolumnhsize
+
+\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
+  % Grab any single-column material above us.
+  \output = {%
+    %
+    % Here is a possibility not foreseen in manmac: if we accumulate a
+    % whole lot of material, we might end up calling this \output
+    % routine twice in a row (see the doublecol-lose test, which is
+    % essentially a couple of indexes with @setchapternewpage off).  In
+    % that case we just ship out what is in \partialpage with the normal
+    % output routine.  Generally, \partialpage will be empty when this
+    % runs and this will be a no-op.  See the indexspread.tex test case.
+    \ifvoid\partialpage \else
+      \onepageout{\pagecontents\partialpage}%
+    \fi
+    %
+    \global\setbox\partialpage = \vbox{%
+      % Unvbox the main output page.
+      \unvbox\PAGE
+      \kern-\topskip \kern\baselineskip
+    }%
+  }%
+  \eject % run that output routine to set \partialpage
+  %
+  % Use the double-column output routine for subsequent pages.
+  \output = {\doublecolumnout}%
+  %
+  % Change the page size parameters.  We could do this once outside this
+  % routine, in each of @smallbook, @afourpaper, and the default 8.5x11
+  % format, but then we repeat the same computation.  Repeating a couple
+  % of assignments once per index is clearly meaningless for the
+  % execution time, so we may as well do it in one place.
+  %
+  % First we halve the line length, less a little for the gutter between
+  % the columns.  We compute the gutter based on the line length, so it
+  % changes automatically with the paper format.  The magic constant
+  % below is chosen so that the gutter has the same value (well, +-<1pt)
+  % as it did when we hard-coded it.
+  %
+  % We put the result in a separate register, \doublecolumhsize, so we
+  % can restore it in \pagesofar, after \hsize itself has (potentially)
+  % been clobbered.
+  %
+  \doublecolumnhsize = \hsize
+    \advance\doublecolumnhsize by -.04154\hsize
+    \divide\doublecolumnhsize by 2
+  \hsize = \doublecolumnhsize
+  %
+  % Double the \vsize as well.  (We don't need a separate register here,
+  % since nobody clobbers \vsize.)
+  \vsize = 2\vsize
+}
+
+% The double-column output routine for all double-column pages except
+% the last.
+%
+\def\doublecolumnout{%
+  \splittopskip=\topskip \splitmaxdepth=\maxdepth
+  % Get the available space for the double columns -- the normal
+  % (undoubled) page height minus any material left over from the
+  % previous page.
+  \dimen@ = \vsize
+  \divide\dimen@ by 2
+  \advance\dimen@ by -\ht\partialpage
+  %
+  % box0 will be the left-hand column, box2 the right.
+  \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
+  \onepageout\pagesofar
+  \unvbox255
+  \penalty\outputpenalty
+}
+%
+% Re-output the contents of the output page -- any previous material,
+% followed by the two boxes we just split, in box0 and box2.
+\def\pagesofar{%
+  \unvbox\partialpage
+  %
+  \hsize = \doublecolumnhsize
+  \wd0=\hsize \wd2=\hsize
+  \hbox to\pagewidth{\box0\hfil\box2}%
+}
+%
+% All done with double columns.
+\def\enddoublecolumns{%
+  \output = {%
+    % Split the last of the double-column material.  Leave it on the
+    % current page, no automatic page break.
+    \balancecolumns
+    %
+    % If we end up splitting too much material for the current page,
+    % though, there will be another page break right after this \output
+    % invocation ends.  Having called \balancecolumns once, we do not
+    % want to call it again.  Therefore, reset \output to its normal
+    % definition right away.  (We hope \balancecolumns will never be
+    % called on to balance too much material, but if it is, this makes
+    % the output somewhat more palatable.)
+    \global\output = {\onepageout{\pagecontents\PAGE}}%
+  }%
+  \eject
+  \endgroup % started in \begindoublecolumns
+  %
+  % \pagegoal was set to the doubled \vsize above, since we restarted
+  % the current page.  We're now back to normal single-column
+  % typesetting, so reset \pagegoal to the normal \vsize (after the
+  % \endgroup where \vsize got restored).
+  \pagegoal = \vsize
+}
+%
+% Called at the end of the double column material.
+\def\balancecolumns{%
+  \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
+  \dimen@ = \ht0
+  \advance\dimen@ by \topskip
+  \advance\dimen@ by-\baselineskip
+  \divide\dimen@ by 2 % target to split to
+  %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}%
+  \splittopskip = \topskip
+  % Loop until we get a decent breakpoint.
+  {%
+    \vbadness = 10000
+    \loop
+      \global\setbox3 = \copy0
+      \global\setbox1 = \vsplit3 to \dimen@
+    \ifdim\ht3>\dimen@
+      \global\advance\dimen@ by 1pt
+    \repeat
+  }%
+  %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}%
+  \setbox0=\vbox to\dimen@{\unvbox1}%
+  \setbox2=\vbox to\dimen@{\unvbox3}%
+  %
+  \pagesofar
+}
+\catcode`\@ = \other
+
+
+\message{sectioning,}
+% Chapters, sections, etc.
+
+% \unnumberedno is an oxymoron, of course.  But we count the unnumbered
+% sections so that we can refer to them unambiguously in the pdf
+% outlines by their "section number".  We avoid collisions with chapter
+% numbers by starting them at 10000.  (If a document ever has 10000
+% chapters, we're in trouble anyway, I'm sure.)
+\newcount\unnumberedno \unnumberedno = 10000
+\newcount\chapno
+\newcount\secno        \secno=0
+\newcount\subsecno     \subsecno=0
+\newcount\subsubsecno  \subsubsecno=0
+
+% This counter is funny since it counts through charcodes of letters A, B, ...
+\newcount\appendixno  \appendixno = `\@
+%
+% \def\appendixletter{\char\the\appendixno}
+% We do the following ugly conditional instead of the above simple
+% construct for the sake of pdftex, which needs the actual
+% letter in the expansion, not just typeset.
+%
+\def\appendixletter{%
+  \ifnum\appendixno=`A A%
+  \else\ifnum\appendixno=`B B%
+  \else\ifnum\appendixno=`C C%
+  \else\ifnum\appendixno=`D D%
+  \else\ifnum\appendixno=`E E%
+  \else\ifnum\appendixno=`F F%
+  \else\ifnum\appendixno=`G G%
+  \else\ifnum\appendixno=`H H%
+  \else\ifnum\appendixno=`I I%
+  \else\ifnum\appendixno=`J J%
+  \else\ifnum\appendixno=`K K%
+  \else\ifnum\appendixno=`L L%
+  \else\ifnum\appendixno=`M M%
+  \else\ifnum\appendixno=`N N%
+  \else\ifnum\appendixno=`O O%
+  \else\ifnum\appendixno=`P P%
+  \else\ifnum\appendixno=`Q Q%
+  \else\ifnum\appendixno=`R R%
+  \else\ifnum\appendixno=`S S%
+  \else\ifnum\appendixno=`T T%
+  \else\ifnum\appendixno=`U U%
+  \else\ifnum\appendixno=`V V%
+  \else\ifnum\appendixno=`W W%
+  \else\ifnum\appendixno=`X X%
+  \else\ifnum\appendixno=`Y Y%
+  \else\ifnum\appendixno=`Z Z%
+  % The \the is necessary, despite appearances, because \appendixletter is
+  % expanded while writing the .toc file.  \char\appendixno is not
+  % expandable, thus it is written literally, thus all appendixes come out
+  % with the same letter (or @) in the toc without it.
+  \else\char\the\appendixno
+  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+
+% Each @chapter defines this as the name of the chapter.
+% page headings and footings can use it.  @section does likewise.
+% However, they are not reliable, because we don't use marks.
+\def\thischapter{}
+\def\thissection{}
+
+\newcount\absseclevel % used to calculate proper heading level
+\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
+
+% @raisesections: treat @section as chapter, @subsection as section, etc.
+\def\raisesections{\global\advance\secbase by -1}
+\let\up=\raisesections % original BFox name
+
+% @lowersections: treat @chapter as section, @section as subsection, etc.
+\def\lowersections{\global\advance\secbase by 1}
+\let\down=\lowersections % original BFox name
+
+% we only have subsub.
+\chardef\maxseclevel = 3
+%
+% A numbered section within an unnumbered changes to unnumbered too.
+% To achive this, remember the "biggest" unnum. sec. we are currently in:
+\chardef\unmlevel = \maxseclevel
+%
+% Trace whether the current chapter is an appendix or not:
+% \chapheadtype is "N" or "A", unnumbered chapters are ignored.
+\def\chapheadtype{N}
+
+% Choose a heading macro
+% #1 is heading type
+% #2 is heading level
+% #3 is text for heading
+\def\genhead#1#2#3{%
+  % Compute the abs. sec. level:
+  \absseclevel=#2
+  \advance\absseclevel by \secbase
+  % Make sure \absseclevel doesn't fall outside the range:
+  \ifnum \absseclevel < 0
+    \absseclevel = 0
+  \else
+    \ifnum \absseclevel > 3
+      \absseclevel = 3
+    \fi
+  \fi
+  % The heading type:
+  \def\headtype{#1}%
+  \if \headtype U%
+    \ifnum \absseclevel < \unmlevel
+      \chardef\unmlevel = \absseclevel
+    \fi
+  \else
+    % Check for appendix sections:
+    \ifnum \absseclevel = 0
+      \edef\chapheadtype{\headtype}%
+    \else
+      \if \headtype A\if \chapheadtype N%
+	\errmessage{@appendix... within a non-appendix chapter}%
+      \fi\fi
+    \fi
+    % Check for numbered within unnumbered:
+    \ifnum \absseclevel > \unmlevel
+      \def\headtype{U}%
+    \else
+      \chardef\unmlevel = 3
+    \fi
+  \fi
+  % Now print the heading:
+  \if \headtype U%
+    \ifcase\absseclevel
+	\unnumberedzzz{#3}%
+    \or \unnumberedseczzz{#3}%
+    \or \unnumberedsubseczzz{#3}%
+    \or \unnumberedsubsubseczzz{#3}%
+    \fi
+  \else
+    \if \headtype A%
+      \ifcase\absseclevel
+	  \appendixzzz{#3}%
+      \or \appendixsectionzzz{#3}%
+      \or \appendixsubseczzz{#3}%
+      \or \appendixsubsubseczzz{#3}%
+      \fi
+    \else
+      \ifcase\absseclevel
+	  \chapterzzz{#3}%
+      \or \seczzz{#3}%
+      \or \numberedsubseczzz{#3}%
+      \or \numberedsubsubseczzz{#3}%
+      \fi
+    \fi
+  \fi
+  \suppressfirstparagraphindent
+}
+
+% an interface:
+\def\numhead{\genhead N}
+\def\apphead{\genhead A}
+\def\unnmhead{\genhead U}
+
+% @chapter, @appendix, @unnumbered.  Increment top-level counter, reset
+% all lower-level sectioning counters to zero.
+%
+% Also set \chaplevelprefix, which we prepend to @float sequence numbers
+% (e.g., figures), q.v.  By default (before any chapter), that is empty.
+\let\chaplevelprefix = \empty
+%
+\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
+\def\chapterzzz#1{%
+  % section resetting is \global in case the chapter is in a group, such
+  % as an @include file.
+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
+    \global\advance\chapno by 1
+  %
+  % Used for \float.
+  \gdef\chaplevelprefix{\the\chapno.}%
+  \resetallfloatnos
+  %
+  \message{\putwordChapter\space \the\chapno}%
+  %
+  % Write the actual heading.
+  \chapmacro{#1}{Ynumbered}{\the\chapno}%
+  %
+  % So @section and the like are numbered underneath this chapter.
+  \global\let\section = \numberedsec
+  \global\let\subsection = \numberedsubsec
+  \global\let\subsubsection = \numberedsubsubsec
+}
+
+\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
+\def\appendixzzz#1{%
+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
+    \global\advance\appendixno by 1
+  \gdef\chaplevelprefix{\appendixletter.}%
+  \resetallfloatnos
+  %
+  \def\appendixnum{\putwordAppendix\space \appendixletter}%
+  \message{\appendixnum}%
+  %
+  \chapmacro{#1}{Yappendix}{\appendixletter}%
+  %
+  \global\let\section = \appendixsec
+  \global\let\subsection = \appendixsubsec
+  \global\let\subsubsection = \appendixsubsubsec
+}
+
+\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
+\def\unnumberedzzz#1{%
+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
+    \global\advance\unnumberedno by 1
+  %
+  % Since an unnumbered has no number, no prefix for figures.
+  \global\let\chaplevelprefix = \empty
+  \resetallfloatnos
+  %
+  % This used to be simply \message{#1}, but TeX fully expands the
+  % argument to \message.  Therefore, if #1 contained @-commands, TeX
+  % expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
+  % expanded @cite (which turns out to cause errors because \cite is meant
+  % to be executed, not expanded).
+  %
+  % Anyway, we don't want the fully-expanded definition of @cite to appear
+  % as a result of the \message, we just want `@cite' itself.  We use
+  % \the<toks register> to achieve this: TeX expands \the<toks> only once,
+  % simply yielding the contents of <toks register>.  (We also do this for
+  % the toc entries.)
+  \toks0 = {#1}%
+  \message{(\the\toks0)}%
+  %
+  \chapmacro{#1}{Ynothing}{\the\unnumberedno}%
+  %
+  \global\let\section = \unnumberedsec
+  \global\let\subsection = \unnumberedsubsec
+  \global\let\subsubsection = \unnumberedsubsubsec
+}
+
+% @centerchap is like @unnumbered, but the heading is centered.
+\outer\parseargdef\centerchap{%
+  % Well, we could do the following in a group, but that would break
+  % an assumption that \chapmacro is called at the outermost level.
+  % Thus we are safer this way:		--kasal, 24feb04
+  \let\centerparametersmaybe = \centerparameters
+  \unnmhead0{#1}%
+  \let\centerparametersmaybe = \relax
+}
+
+% @top is like @unnumbered.
+\let\top\unnumbered
+
+% Sections.
+\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
+\def\seczzz#1{%
+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
+  \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
+}
+
+\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
+\def\appendixsectionzzz#1{%
+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
+  \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
+}
+\let\appendixsec\appendixsection
+
+\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
+\def\unnumberedseczzz#1{%
+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
+  \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
+}
+
+% Subsections.
+\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
+\def\numberedsubseczzz#1{%
+  \global\subsubsecno=0  \global\advance\subsecno by 1
+  \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
+}
+
+\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
+\def\appendixsubseczzz#1{%
+  \global\subsubsecno=0  \global\advance\subsecno by 1
+  \sectionheading{#1}{subsec}{Yappendix}%
+                 {\appendixletter.\the\secno.\the\subsecno}%
+}
+
+\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
+\def\unnumberedsubseczzz#1{%
+  \global\subsubsecno=0  \global\advance\subsecno by 1
+  \sectionheading{#1}{subsec}{Ynothing}%
+                 {\the\unnumberedno.\the\secno.\the\subsecno}%
+}
+
+% Subsubsections.
+\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
+\def\numberedsubsubseczzz#1{%
+  \global\advance\subsubsecno by 1
+  \sectionheading{#1}{subsubsec}{Ynumbered}%
+                 {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
+}
+
+\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
+\def\appendixsubsubseczzz#1{%
+  \global\advance\subsubsecno by 1
+  \sectionheading{#1}{subsubsec}{Yappendix}%
+                 {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
+}
+
+\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
+\def\unnumberedsubsubseczzz#1{%
+  \global\advance\subsubsecno by 1
+  \sectionheading{#1}{subsubsec}{Ynothing}%
+                 {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
+}
+
+% These macros control what the section commands do, according
+% to what kind of chapter we are in (ordinary, appendix, or unnumbered).
+% Define them by default for a numbered chapter.
+\let\section = \numberedsec
+\let\subsection = \numberedsubsec
+\let\subsubsection = \numberedsubsubsec
+
+% Define @majorheading, @heading and @subheading
+
+% NOTE on use of \vbox for chapter headings, section headings, and such:
+%       1) We use \vbox rather than the earlier \line to permit
+%          overlong headings to fold.
+%       2) \hyphenpenalty is set to 10000 because hyphenation in a
+%          heading is obnoxious; this forbids it.
+%       3) Likewise, headings look best if no \parindent is used, and
+%          if justification is not attempted.  Hence \raggedright.
+
+
+\def\majorheading{%
+  {\advance\chapheadingskip by 10pt \chapbreak }%
+  \parsearg\chapheadingzzz
+}
+
+\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
+\def\chapheadingzzz#1{%
+  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+                    \parindent=0pt\raggedright
+                    \rm #1\hfill}}%
+  \bigskip \par\penalty 200\relax
+  \suppressfirstparagraphindent
+}
+
+% @heading, @subheading, @subsubheading.
+\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{}
+  \suppressfirstparagraphindent}
+\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{}
+  \suppressfirstparagraphindent}
+\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{}
+  \suppressfirstparagraphindent}
+
+% These macros generate a chapter, section, etc. heading only
+% (including whitespace, linebreaking, etc. around it),
+% given all the information in convenient, parsed form.
+
+%%% Args are the skip and penalty (usually negative)
+\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
+
+%%% Define plain chapter starts, and page on/off switching for it
+% Parameter controlling skip before chapter headings (if needed)
+
+\newskip\chapheadingskip
+
+\def\chapbreak{\dobreak \chapheadingskip {-4000}}
+\def\chappager{\par\vfill\supereject}
+\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
+
+\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
+
+\def\CHAPPAGoff{%
+\global\let\contentsalignmacro = \chappager
+\global\let\pchapsepmacro=\chapbreak
+\global\let\pagealignmacro=\chappager}
+
+\def\CHAPPAGon{%
+\global\let\contentsalignmacro = \chappager
+\global\let\pchapsepmacro=\chappager
+\global\let\pagealignmacro=\chappager
+\global\def\HEADINGSon{\HEADINGSsingle}}
+
+\def\CHAPPAGodd{%
+\global\let\contentsalignmacro = \chapoddpage
+\global\let\pchapsepmacro=\chapoddpage
+\global\let\pagealignmacro=\chapoddpage
+\global\def\HEADINGSon{\HEADINGSdouble}}
+
+\CHAPPAGon
+
+% Chapter opening.
+%
+% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
+% Yappendix, Yomitfromtoc), #3 the chapter number.
+%
+% To test against our argument.
+\def\Ynothingkeyword{Ynothing}
+\def\Yomitfromtockeyword{Yomitfromtoc}
+\def\Yappendixkeyword{Yappendix}
+%
+\def\chapmacro#1#2#3{%
+  \pchapsepmacro
+  {%
+    \chapfonts \rm
+    %
+    % Have to define \thissection before calling \donoderef, because the
+    % xref code eventually uses it.  On the other hand, it has to be called
+    % after \pchapsepmacro, or the headline will change too soon.
+    \gdef\thissection{#1}%
+    \gdef\thischaptername{#1}%
+    %
+    % Only insert the separating space if we have a chapter/appendix
+    % number, and don't print the unnumbered ``number''.
+    \def\temptype{#2}%
+    \ifx\temptype\Ynothingkeyword
+      \setbox0 = \hbox{}%
+      \def\toctype{unnchap}%
+      \gdef\thischapter{#1}%
+    \else\ifx\temptype\Yomitfromtockeyword
+      \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
+      \def\toctype{omit}%
+      \gdef\thischapter{}%
+    \else\ifx\temptype\Yappendixkeyword
+      \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
+      \def\toctype{app}%
+      % We don't substitute the actual chapter name into \thischapter
+      % because we don't want its macros evaluated now.  And we don't
+      % use \thissection because that changes with each section.
+      %
+      \xdef\thischapter{\putwordAppendix{} \appendixletter:
+                        \noexpand\thischaptername}%
+    \else
+      \setbox0 = \hbox{#3\enspace}%
+      \def\toctype{numchap}%
+      \xdef\thischapter{\putwordChapter{} \the\chapno:
+                        \noexpand\thischaptername}%
+    \fi\fi\fi
+    %
+    % Write the toc entry for this chapter.  Must come before the
+    % \donoderef, because we include the current node name in the toc
+    % entry, and \donoderef resets it to empty.
+    \writetocentry{\toctype}{#1}{#3}%
+    %
+    % For pdftex, we have to write out the node definition (aka, make
+    % the pdfdest) after any page break, but before the actual text has
+    % been typeset.  If the destination for the pdf outline is after the
+    % text, then jumping from the outline may wind up with the text not
+    % being visible, for instance under high magnification.
+    \donoderef{#2}%
+    %
+    % Typeset the actual heading.
+    \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
+          \hangindent=\wd0 \centerparametersmaybe
+          \unhbox0 #1\par}%
+  }%
+  \nobreak\bigskip % no page break after a chapter title
+  \nobreak
+}
+
+% @centerchap -- centered and unnumbered.
+\let\centerparametersmaybe = \relax
+\def\centerparameters{%
+  \advance\rightskip by 3\rightskip
+  \leftskip = \rightskip
+  \parfillskip = 0pt
+}
+
+
+% I don't think this chapter style is supported any more, so I'm not
+% updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
+%
+\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
+%
+\def\unnchfopen #1{%
+\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+                       \parindent=0pt\raggedright
+                       \rm #1\hfill}}\bigskip \par\nobreak
+}
+\def\chfopen #1#2{\chapoddpage {\chapfonts
+\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
+\par\penalty 5000 %
+}
+\def\centerchfopen #1{%
+\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+                       \parindent=0pt
+                       \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
+}
+\def\CHAPFopen{%
+  \global\let\chapmacro=\chfopen
+  \global\let\centerchapmacro=\centerchfopen}
+
+
+% Section titles.  These macros combine the section number parts and
+% call the generic \sectionheading to do the printing.
+%
+\newskip\secheadingskip
+\def\secheadingbreak{\dobreak \secheadingskip{-1000}}
+
+% Subsection titles.
+\newskip\subsecheadingskip
+\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}}
+
+% Subsubsection titles.
+\def\subsubsecheadingskip{\subsecheadingskip}
+\def\subsubsecheadingbreak{\subsecheadingbreak}
+
+
+% Print any size, any type, section title.
+%
+% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
+% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
+% section number.
+%
+\def\sectionheading#1#2#3#4{%
+  {%
+    % Switch to the right set of fonts.
+    \csname #2fonts\endcsname \rm
+    %
+    % Insert space above the heading.
+    \csname #2headingbreak\endcsname
+    %
+    % Only insert the space after the number if we have a section number.
+    \def\sectionlevel{#2}%
+    \def\temptype{#3}%
+    %
+    \ifx\temptype\Ynothingkeyword
+      \setbox0 = \hbox{}%
+      \def\toctype{unn}%
+      \gdef\thissection{#1}%
+    \else\ifx\temptype\Yomitfromtockeyword
+      % for @headings -- no section number, don't include in toc,
+      % and don't redefine \thissection.
+      \setbox0 = \hbox{}%
+      \def\toctype{omit}%
+      \let\sectionlevel=\empty
+    \else\ifx\temptype\Yappendixkeyword
+      \setbox0 = \hbox{#4\enspace}%
+      \def\toctype{app}%
+      \gdef\thissection{#1}%
+    \else
+      \setbox0 = \hbox{#4\enspace}%
+      \def\toctype{num}%
+      \gdef\thissection{#1}%
+    \fi\fi\fi
+    %
+    % Write the toc entry (before \donoderef).  See comments in \chfplain.
+    \writetocentry{\toctype\sectionlevel}{#1}{#4}%
+    %
+    % Write the node reference (= pdf destination for pdftex).
+    % Again, see comments in \chfplain.
+    \donoderef{#3}%
+    %
+    % Output the actual section heading.
+    \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
+          \hangindent=\wd0  % zero if no section number
+          \unhbox0 #1}%
+  }%
+  % Add extra space after the heading -- half of whatever came above it.
+  % Don't allow stretch, though.
+  \kern .5 \csname #2headingskip\endcsname
+  %
+  % Do not let the kern be a potential breakpoint, as it would be if it
+  % was followed by glue.
+  \nobreak
+  %
+  % We'll almost certainly start a paragraph next, so don't let that
+  % glue accumulate.  (Not a breakpoint because it's preceded by a
+  % discardable item.)
+  \vskip-\parskip
+  % 
+  % This is purely so the last item on the list is a known \penalty >
+  % 10000.  This is so \startdefun can avoid allowing breakpoints after
+  % section headings.  Otherwise, it would insert a valid breakpoint between:
+  % 
+  %   @section sec-whatever
+  %   @deffn def-whatever
+  \penalty 10001
+}
+
+
+\message{toc,}
+% Table of contents.
+\newwrite\tocfile
+
+% Write an entry to the toc file, opening it if necessary.
+% Called from @chapter, etc.
+%
+% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
+% We append the current node name (if any) and page number as additional
+% arguments for the \{chap,sec,...}entry macros which will eventually
+% read this.  The node name is used in the pdf outlines as the
+% destination to jump to.
+%
+% We open the .toc file for writing here instead of at @setfilename (or
+% any other fixed time) so that @contents can be anywhere in the document.
+% But if #1 is `omit', then we don't do anything.  This is used for the
+% table of contents chapter openings themselves.
+%
+\newif\iftocfileopened
+\def\omitkeyword{omit}%
+%
+\def\writetocentry#1#2#3{%
+  \edef\writetoctype{#1}%
+  \ifx\writetoctype\omitkeyword \else
+    \iftocfileopened\else
+      \immediate\openout\tocfile = \jobname.toc
+      \global\tocfileopenedtrue
+    \fi
+    %
+    \iflinks
+      {\atdummies
+       \edef\temp{%
+         \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
+       \temp
+      }
+    \fi
+  \fi
+  %
+  % Tell \shipout to create a pdf destination on each page, if we're
+  % writing pdf.  These are used in the table of contents.  We can't
+  % just write one on every page because the title pages are numbered
+  % 1 and 2 (the page numbers aren't printed), and so are the first
+  % two pages of the document.  Thus, we'd have two destinations named
+  % `1', and two named `2'.
+  \ifpdf \global\pdfmakepagedesttrue \fi
+}
+
+
+% These characters do not print properly in the Computer Modern roman
+% fonts, so we must take special care.  This is more or less redundant
+% with the Texinfo input format setup at the end of this file.
+% 
+\def\activecatcodes{%
+  \catcode`\"=\active
+  \catcode`\$=\active
+  \catcode`\<=\active
+  \catcode`\>=\active
+  \catcode`\\=\active
+  \catcode`\^=\active
+  \catcode`\_=\active
+  \catcode`\|=\active
+  \catcode`\~=\active
+}
+
+
+% Read the toc file, which is essentially Texinfo input.
+\def\readtocfile{%
+  \setupdatafile
+  \activecatcodes
+  \input \jobname.toc
+}
+
+\newskip\contentsrightmargin \contentsrightmargin=1in
+\newcount\savepageno
+\newcount\lastnegativepageno \lastnegativepageno = -1
+
+% Prepare to read what we've written to \tocfile.
+%
+\def\startcontents#1{%
+  % If @setchapternewpage on, and @headings double, the contents should
+  % start on an odd page, unlike chapters.  Thus, we maintain
+  % \contentsalignmacro in parallel with \pagealignmacro.
+  % From: Torbjorn Granlund <tege@matematik.su.se>
+  \contentsalignmacro
+  \immediate\closeout\tocfile
+  %
+  % Don't need to put `Contents' or `Short Contents' in the headline.
+  % It is abundantly clear what they are.
+  \def\thischapter{}%
+  \chapmacro{#1}{Yomitfromtoc}{}%
+  %
+  \savepageno = \pageno
+  \begingroup                  % Set up to handle contents files properly.
+    \raggedbottom              % Worry more about breakpoints than the bottom.
+    \advance\hsize by -\contentsrightmargin % Don't use the full line length.
+    %
+    % Roman numerals for page numbers.
+    \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
+}
+
+
+% Normal (long) toc.
+\def\contents{%
+  \startcontents{\putwordTOC}%
+    \openin 1 \jobname.toc
+    \ifeof 1 \else
+      \readtocfile
+    \fi
+    \vfill \eject
+    \contentsalignmacro % in case @setchapternewpage odd is in effect
+    \ifeof 1 \else
+      \pdfmakeoutlines
+    \fi
+    \closein 1
+  \endgroup
+  \lastnegativepageno = \pageno
+  \global\pageno = \savepageno
+}
+
+% And just the chapters.
+\def\summarycontents{%
+  \startcontents{\putwordShortTOC}%
+    %
+    \let\numchapentry = \shortchapentry
+    \let\appentry = \shortchapentry
+    \let\unnchapentry = \shortunnchapentry
+    % We want a true roman here for the page numbers.
+    \secfonts
+    \let\rm=\shortcontrm \let\bf=\shortcontbf
+    \let\sl=\shortcontsl \let\tt=\shortconttt
+    \rm
+    \hyphenpenalty = 10000
+    \advance\baselineskip by 1pt % Open it up a little.
+    \def\numsecentry##1##2##3##4{}
+    \let\appsecentry = \numsecentry
+    \let\unnsecentry = \numsecentry
+    \let\numsubsecentry = \numsecentry
+    \let\appsubsecentry = \numsecentry
+    \let\unnsubsecentry = \numsecentry
+    \let\numsubsubsecentry = \numsecentry
+    \let\appsubsubsecentry = \numsecentry
+    \let\unnsubsubsecentry = \numsecentry
+    \openin 1 \jobname.toc
+    \ifeof 1 \else
+      \readtocfile
+    \fi
+    \closein 1
+    \vfill \eject
+    \contentsalignmacro % in case @setchapternewpage odd is in effect
+  \endgroup
+  \lastnegativepageno = \pageno
+  \global\pageno = \savepageno
+}
+\let\shortcontents = \summarycontents
+
+% Typeset the label for a chapter or appendix for the short contents.
+% The arg is, e.g., `A' for an appendix, or `3' for a chapter.
+%
+\def\shortchaplabel#1{%
+  % This space should be enough, since a single number is .5em, and the
+  % widest letter (M) is 1em, at least in the Computer Modern fonts.
+  % But use \hss just in case.
+  % (This space doesn't include the extra space that gets added after
+  % the label; that gets put in by \shortchapentry above.)
+  %
+  % We'd like to right-justify chapter numbers, but that looks strange
+  % with appendix letters.  And right-justifying numbers and
+  % left-justifying letters looks strange when there is less than 10
+  % chapters.  Have to read the whole toc once to know how many chapters
+  % there are before deciding ...
+  \hbox to 1em{#1\hss}%
+}
+
+% These macros generate individual entries in the table of contents.
+% The first argument is the chapter or section name.
+% The last argument is the page number.
+% The arguments in between are the chapter number, section number, ...
+
+% Chapters, in the main contents.
+\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
+%
+% Chapters, in the short toc.
+% See comments in \dochapentry re vbox and related settings.
+\def\shortchapentry#1#2#3#4{%
+  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
+}
+
+% Appendices, in the main contents.
+% Need the word Appendix, and a fixed-size box.
+%
+\def\appendixbox#1{%
+  % We use M since it's probably the widest letter.
+  \setbox0 = \hbox{\putwordAppendix{} M}%
+  \hbox to \wd0{\putwordAppendix{} #1\hss}}
+%
+\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
+
+% Unnumbered chapters.
+\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
+\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
+
+% Sections.
+\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
+\let\appsecentry=\numsecentry
+\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
+
+% Subsections.
+\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
+\let\appsubsecentry=\numsubsecentry
+\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
+
+% And subsubsections.
+\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
+\let\appsubsubsecentry=\numsubsubsecentry
+\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
+
+% This parameter controls the indentation of the various levels.
+% Same as \defaultparindent.
+\newdimen\tocindent \tocindent = 15pt
+
+% Now for the actual typesetting. In all these, #1 is the text and #2 is the
+% page number.
+%
+% If the toc has to be broken over pages, we want it to be at chapters
+% if at all possible; hence the \penalty.
+\def\dochapentry#1#2{%
+   \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
+   \begingroup
+     \chapentryfonts
+     \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+   \endgroup
+   \nobreak\vskip .25\baselineskip plus.1\baselineskip
+}
+
+\def\dosecentry#1#2{\begingroup
+  \secentryfonts \leftskip=\tocindent
+  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+\endgroup}
+
+\def\dosubsecentry#1#2{\begingroup
+  \subsecentryfonts \leftskip=2\tocindent
+  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+\endgroup}
+
+\def\dosubsubsecentry#1#2{\begingroup
+  \subsubsecentryfonts \leftskip=3\tocindent
+  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+\endgroup}
+
+% We use the same \entry macro as for the index entries.
+\let\tocentry = \entry
+
+% Space between chapter (or whatever) number and the title.
+\def\labelspace{\hskip1em \relax}
+
+\def\dopageno#1{{\rm #1}}
+\def\doshortpageno#1{{\rm #1}}
+
+\def\chapentryfonts{\secfonts \rm}
+\def\secentryfonts{\textfonts}
+\def\subsecentryfonts{\textfonts}
+\def\subsubsecentryfonts{\textfonts}
+
+
+\message{environments,}
+% @foo ... @end foo.
+
+% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
+%
+% Since these characters are used in examples, it should be an even number of
+% \tt widths. Each \tt character is 1en, so two makes it 1em.
+%
+\def\point{$\star$}
+\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
+\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
+\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
+\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
+
+% The @error{} command.
+% Adapted from the TeXbook's \boxit.
+%
+\newbox\errorbox
+%
+{\tentt \global\dimen0 = 3em}% Width of the box.
+\dimen2 = .55pt % Thickness of rules
+% The text. (`r' is open on the right, `e' somewhat less so on the left.)
+\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
+%
+\setbox\errorbox=\hbox to \dimen0{\hfil
+   \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
+   \advance\hsize by -2\dimen2 % Rules.
+   \vbox{%
+      \hrule height\dimen2
+      \hbox{\vrule width\dimen2 \kern3pt          % Space to left of text.
+         \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
+         \kern3pt\vrule width\dimen2}% Space to right.
+      \hrule height\dimen2}
+    \hfil}
+%
+\def\error{\leavevmode\lower.7ex\copy\errorbox}
+
+% @tex ... @end tex    escapes into raw Tex temporarily.
+% One exception: @ is still an escape character, so that @end tex works.
+% But \@ or @@ will get a plain tex @ character.
+
+\envdef\tex{%
+  \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
+  \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
+  \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
+  \catcode `\%=14
+  \catcode `\+=\other
+  \catcode `\"=\other
+  \catcode `\|=\other
+  \catcode `\<=\other
+  \catcode `\>=\other
+  \escapechar=`\\
+  %
+  \let\b=\ptexb
+  \let\bullet=\ptexbullet
+  \let\c=\ptexc
+  \let\,=\ptexcomma
+  \let\.=\ptexdot
+  \let\dots=\ptexdots
+  \let\equiv=\ptexequiv
+  \let\!=\ptexexclam
+  \let\i=\ptexi
+  \let\indent=\ptexindent
+  \let\noindent=\ptexnoindent
+  \let\{=\ptexlbrace
+  \let\+=\tabalign
+  \let\}=\ptexrbrace
+  \let\/=\ptexslash
+  \let\*=\ptexstar
+  \let\t=\ptext
+  \let\frenchspacing=\plainfrenchspacing
+  %
+  \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
+  \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
+  \def\@{@}%
+}
+% There is no need to define \Etex.
+
+% Define @lisp ... @end lisp.
+% @lisp environment forms a group so it can rebind things,
+% including the definition of @end lisp (which normally is erroneous).
+
+% Amount to narrow the margins by for @lisp.
+\newskip\lispnarrowing \lispnarrowing=0.4in
+
+% This is the definition that ^^M gets inside @lisp, @example, and other
+% such environments.  \null is better than a space, since it doesn't
+% have any width.
+\def\lisppar{\null\endgraf}
+
+% This space is always present above and below environments.
+\newskip\envskipamount \envskipamount = 0pt
+
+% Make spacing and below environment symmetrical.  We use \parskip here
+% to help in doing that, since in @example-like environments \parskip
+% is reset to zero; thus the \afterenvbreak inserts no space -- but the
+% start of the next paragraph will insert \parskip.
+%
+\def\aboveenvbreak{{%
+  % =10000 instead of <10000 because of a special case in \itemzzz and
+  % \sectionheading, q.v.
+  \ifnum \lastpenalty=10000 \else
+    \advance\envskipamount by \parskip
+    \endgraf
+    \ifdim\lastskip<\envskipamount
+      \removelastskip
+      % it's not a good place to break if the last penalty was \nobreak
+      % or better ...
+      \ifnum\lastpenalty<10000 \penalty-50 \fi
+      \vskip\envskipamount
+    \fi
+  \fi
+}}
+
+\let\afterenvbreak = \aboveenvbreak
+
+% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
+% also clear it, so that its embedded environments do the narrowing again.
+\let\nonarrowing=\relax
+
+% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
+% environment contents.
+\font\circle=lcircle10
+\newdimen\circthick
+\newdimen\cartouter\newdimen\cartinner
+\newskip\normbskip\newskip\normpskip\newskip\normlskip
+\circthick=\fontdimen8\circle
+%
+\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
+\def\ctr{{\hskip 6pt\circle\char'010}}
+\def\cbl{{\circle\char'012\hskip -6pt}}
+\def\cbr{{\hskip 6pt\circle\char'011}}
+\def\carttop{\hbox to \cartouter{\hskip\lskip
+        \ctl\leaders\hrule height\circthick\hfil\ctr
+        \hskip\rskip}}
+\def\cartbot{\hbox to \cartouter{\hskip\lskip
+        \cbl\leaders\hrule height\circthick\hfil\cbr
+        \hskip\rskip}}
+%
+\newskip\lskip\newskip\rskip
+
+\envdef\cartouche{%
+  \ifhmode\par\fi  % can't be in the midst of a paragraph.
+  \startsavinginserts
+  \lskip=\leftskip \rskip=\rightskip
+  \leftskip=0pt\rightskip=0pt % we want these *outside*.
+  \cartinner=\hsize \advance\cartinner by-\lskip
+  \advance\cartinner by-\rskip
+  \cartouter=\hsize
+  \advance\cartouter by 18.4pt	% allow for 3pt kerns on either
+				% side, and for 6pt waste from
+				% each corner char, and rule thickness
+  \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
+  % Flag to tell @lisp, etc., not to narrow margin.
+  \let\nonarrowing = t%
+  \vbox\bgroup
+      \baselineskip=0pt\parskip=0pt\lineskip=0pt
+      \carttop
+      \hbox\bgroup
+	  \hskip\lskip
+	  \vrule\kern3pt
+	  \vbox\bgroup
+	      \kern3pt
+	      \hsize=\cartinner
+	      \baselineskip=\normbskip
+	      \lineskip=\normlskip
+	      \parskip=\normpskip
+	      \vskip -\parskip
+	      \comment % For explanation, see the end of \def\group.
+}
+\def\Ecartouche{%
+              \ifhmode\par\fi
+	      \kern3pt
+	  \egroup
+	  \kern3pt\vrule
+	  \hskip\rskip
+      \egroup
+      \cartbot
+  \egroup
+  \checkinserts
+}
+
+
+% This macro is called at the beginning of all the @example variants,
+% inside a group.
+\def\nonfillstart{%
+  \aboveenvbreak
+  \hfuzz = 12pt % Don't be fussy
+  \sepspaces % Make spaces be word-separators rather than space tokens.
+  \let\par = \lisppar % don't ignore blank lines
+  \obeylines % each line of input is a line of output
+  \parskip = 0pt
+  \parindent = 0pt
+  \emergencystretch = 0pt % don't try to avoid overfull boxes
+  \ifx\nonarrowing\relax
+    \advance \leftskip by \lispnarrowing
+    \exdentamount=\lispnarrowing
+  \else
+    \let\nonarrowing = \relax
+  \fi
+  \let\exdent=\nofillexdent
+}
+
+% If you want all examples etc. small: @set dispenvsize small.
+% If you want even small examples the full size: @set dispenvsize nosmall.
+% This affects the following displayed environments:
+%    @example, @display, @format, @lisp
+%
+\def\smallword{small}
+\def\nosmallword{nosmall}
+\let\SETdispenvsize\relax
+\def\setnormaldispenv{%
+  \ifx\SETdispenvsize\smallword
+    \smallexamplefonts \rm
+  \fi
+}
+\def\setsmalldispenv{%
+  \ifx\SETdispenvsize\nosmallword
+  \else
+    \smallexamplefonts \rm
+  \fi
+}
+
+% We often define two environments, @foo and @smallfoo.
+% Let's do it by one command:
+\def\makedispenv #1#2{
+  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
+  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
+  \expandafter\let\csname E#1\endcsname \afterenvbreak
+  \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
+}
+
+% Define two synonyms:
+\def\maketwodispenvs #1#2#3{
+  \makedispenv{#1}{#3}
+  \makedispenv{#2}{#3}
+}
+
+% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
+%
+% @smallexample and @smalllisp: use smaller fonts.
+% Originally contributed by Pavel@xerox.
+%
+\maketwodispenvs {lisp}{example}{%
+  \nonfillstart
+  \tt
+  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
+  \gobble       % eat return
+}
+
+% @display/@smalldisplay: same as @lisp except keep current font.
+%
+\makedispenv {display}{%
+  \nonfillstart
+  \gobble
+}
+
+% @format/@smallformat: same as @display except don't narrow margins.
+%
+\makedispenv{format}{%
+  \let\nonarrowing = t%
+  \nonfillstart
+  \gobble
+}
+
+% @flushleft: same as @format, but doesn't obey \SETdispenvsize.
+\envdef\flushleft{%
+  \let\nonarrowing = t%
+  \nonfillstart
+  \gobble
+}
+\let\Eflushleft = \afterenvbreak
+
+% @flushright.
+%
+\envdef\flushright{%
+  \let\nonarrowing = t%
+  \nonfillstart
+  \advance\leftskip by 0pt plus 1fill
+  \gobble
+}
+\let\Eflushright = \afterenvbreak
+
+
+% @quotation does normal linebreaking (hence we can't use \nonfillstart)
+% and narrows the margins.  We keep \parskip nonzero in general, since
+% we're doing normal filling.  So, when using \aboveenvbreak and
+% \afterenvbreak, temporarily make \parskip 0.
+%
+\envdef\quotation{%
+  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+  \parindent=0pt
+  %
+  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \ifx\nonarrowing\relax
+    \advance\leftskip by \lispnarrowing
+    \advance\rightskip by \lispnarrowing
+    \exdentamount = \lispnarrowing
+  \else
+    \let\nonarrowing = \relax
+  \fi
+  \parsearg\quotationlabel
+}
+
+% We have retained a nonzero parskip for the environment, since we're
+% doing normal filling.
+%
+\def\Equotation{%
+  \par
+  \ifx\quotationauthor\undefined\else
+    % indent a bit.
+    \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
+  \fi
+  {\parskip=0pt \afterenvbreak}%
+}
+
+% If we're given an argument, typeset it in bold with a colon after.
+\def\quotationlabel#1{%
+  \def\temp{#1}%
+  \ifx\temp\empty \else
+    {\bf #1: }%
+  \fi
+}
+
+
+% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
+% If we want to allow any <char> as delimiter,
+% we need the curly braces so that makeinfo sees the @verb command, eg:
+% `@verbx...x' would look like the '@verbx' command.  --janneke@gnu.org
+%
+% [Knuth]: Donald Ervin Knuth, 1996.  The TeXbook.
+%
+% [Knuth] p.344; only we need to do the other characters Texinfo sets
+% active too.  Otherwise, they get lost as the first character on a
+% verbatim line.
+\def\dospecials{%
+  \do\ \do\\\do\{\do\}\do\$\do\&%
+  \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
+  \do\<\do\>\do\|\do\@\do+\do\"%
+}
+%
+% [Knuth] p. 380
+\def\uncatcodespecials{%
+  \def\do##1{\catcode`##1=\other}\dospecials}
+%
+% [Knuth] pp. 380,381,391
+% Disable Spanish ligatures ?` and !` of \tt font
+\begingroup
+  \catcode`\`=\active\gdef`{\relax\lq}
+\endgroup
+%
+% Setup for the @verb command.
+%
+% Eight spaces for a tab
+\begingroup
+  \catcode`\^^I=\active
+  \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }}
+\endgroup
+%
+\def\setupverb{%
+  \tt  % easiest (and conventionally used) font for verbatim
+  \def\par{\leavevmode\endgraf}%
+  \catcode`\`=\active
+  \tabeightspaces
+  % Respect line breaks,
+  % print special symbols as themselves, and
+  % make each space count
+  % must do in this order:
+  \obeylines \uncatcodespecials \sepspaces
+}
+
+% Setup for the @verbatim environment
+%
+% Real tab expansion
+\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
+%
+\def\starttabbox{\setbox0=\hbox\bgroup}
+\begingroup
+  \catcode`\^^I=\active
+  \gdef\tabexpand{%
+    \catcode`\^^I=\active
+    \def^^I{\leavevmode\egroup
+      \dimen0=\wd0 % the width so far, or since the previous tab
+      \divide\dimen0 by\tabw
+      \multiply\dimen0 by\tabw % compute previous multiple of \tabw
+      \advance\dimen0 by\tabw  % advance to next multiple of \tabw
+      \wd0=\dimen0 \box0 \starttabbox
+    }%
+  }
+\endgroup
+\def\setupverbatim{%
+  \let\nonarrowing = t%
+  \nonfillstart
+  % Easiest (and conventionally used) font for verbatim
+  \tt
+  \def\par{\leavevmode\egroup\box0\endgraf}%
+  \catcode`\`=\active
+  \tabexpand
+  % Respect line breaks,
+  % print special symbols as themselves, and
+  % make each space count
+  % must do in this order:
+  \obeylines \uncatcodespecials \sepspaces
+  \everypar{\starttabbox}%
+}
+
+% Do the @verb magic: verbatim text is quoted by unique
+% delimiter characters.  Before first delimiter expect a
+% right brace, after last delimiter expect closing brace:
+%
+%    \def\doverb'{'<char>#1<char>'}'{#1}
+%
+% [Knuth] p. 382; only eat outer {}
+\begingroup
+  \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other
+  \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
+\endgroup
+%
+\def\verb{\begingroup\setupverb\doverb}
+%
+%
+% Do the @verbatim magic: define the macro \doverbatim so that
+% the (first) argument ends when '@end verbatim' is reached, ie:
+%
+%     \def\doverbatim#1@end verbatim{#1}
+%
+% For Texinfo it's a lot easier than for LaTeX,
+% because texinfo's \verbatim doesn't stop at '\end{verbatim}':
+% we need not redefine '\', '{' and '}'.
+%
+% Inspired by LaTeX's verbatim command set [latex.ltx]
+%
+\begingroup
+  \catcode`\ =\active
+  \obeylines %
+  % ignore everything up to the first ^^M, that's the newline at the end
+  % of the @verbatim input line itself.  Otherwise we get an extra blank
+  % line in the output.
+  \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}%
+  % We really want {...\end verbatim} in the body of the macro, but
+  % without the active space; thus we have to use \xdef and \gobble.
+\endgroup
+%
+\envdef\verbatim{%
+    \setupverbatim\doverbatim
+}
+\let\Everbatim = \afterenvbreak
+
+
+% @verbatiminclude FILE - insert text of file in verbatim environment.
+%
+\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude}
+%
+\def\doverbatiminclude#1{%
+  {%
+    \makevalueexpandable
+    \setupverbatim
+    \input #1
+    \afterenvbreak
+  }%
+}
+
+% @copying ... @end copying.
+% Save the text away for @insertcopying later.
+%
+% We save the uninterpreted tokens, rather than creating a box.
+% Saving the text in a box would be much easier, but then all the
+% typesetting commands (@smallbook, font changes, etc.) have to be done
+% beforehand -- and a) we want @copying to be done first in the source
+% file; b) letting users define the frontmatter in as flexible order as
+% possible is very desirable.
+%
+\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
+\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
+%
+\def\insertcopying{%
+  \begingroup
+    \parindent = 0pt  % paragraph indentation looks wrong on title page
+    \scanexp\copyingtext
+  \endgroup
+}
+
+\message{defuns,}
+% @defun etc.
+
+\newskip\defbodyindent \defbodyindent=.4in
+\newskip\defargsindent \defargsindent=50pt
+\newskip\deflastargmargin \deflastargmargin=18pt
+
+% Start the processing of @deffn:
+\def\startdefun{%
+  \ifnum\lastpenalty<10000
+    \medbreak
+  \else
+    % If there are two @def commands in a row, we'll have a \nobreak,
+    % which is there to keep the function description together with its
+    % header.  But if there's nothing but headers, we need to allow a
+    % break somewhere.  Check specifically for penalty 10002, inserted
+    % by \defargscommonending, instead of 10000, since the sectioning
+    % commands also insert a nobreak penalty, and we don't want to allow
+    % a break between a section heading and a defun.
+    % 
+    \ifnum\lastpenalty=10002 \penalty2000 \fi
+    %
+    % Similarly, after a section heading, do not allow a break.
+    % But do insert the glue.
+    \medskip  % preceded by discardable penalty, so not a breakpoint
+  \fi
+  %
+  \parindent=0in
+  \advance\leftskip by \defbodyindent
+  \exdentamount=\defbodyindent
+}
+
+\def\dodefunx#1{%
+  % First, check whether we are in the right environment:
+  \checkenv#1%
+  %
+  % As above, allow line break if we have multiple x headers in a row.
+  % It's not a great place, though.
+  \ifnum\lastpenalty=10002 \penalty3000 \fi
+  %
+  % And now, it's time to reuse the body of the original defun:
+  \expandafter\gobbledefun#1%
+}
+\def\gobbledefun#1\startdefun{}
+
+% \printdefunline \deffnheader{text}
+%
+\def\printdefunline#1#2{%
+  \begingroup
+    % call \deffnheader:
+    #1#2 \endheader
+    % common ending:
+    \interlinepenalty = 10000
+    \advance\rightskip by 0pt plus 1fil
+    \endgraf
+    \nobreak\vskip -\parskip
+    \penalty 10002  % signal to \startdefun and \dodefunx
+    % Some of the @defun-type tags do not enable magic parentheses,
+    % rendering the following check redundant.  But we don't optimize.
+    \checkparencounts
+  \endgroup
+}
+
+\def\Edefun{\endgraf\medbreak}
+
+% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
+% the only thing remainnig is to define \deffnheader.
+%
+\def\makedefun#1{%
+  \expandafter\let\csname E#1\endcsname = \Edefun
+  \edef\temp{\noexpand\domakedefun
+    \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
+  \temp
+}
+
+% \domakedefun \deffn \deffnx \deffnheader
+%
+% Define \deffn and \deffnx, without parameters.
+% \deffnheader has to be defined explicitly.
+%
+\def\domakedefun#1#2#3{%
+  \envdef#1{%
+    \startdefun
+    \parseargusing\activeparens{\printdefunline#3}%
+  }%
+  \def#2{\dodefunx#1}%
+  \def#3%
+}
+
+%%% Untyped functions:
+
+% @deffn category name args
+\makedefun{deffn}{\deffngeneral{}}
+
+% @deffn category class name args
+\makedefun{defop}#1 {\defopon{#1\ \putwordon}}
+
+% \defopon {category on}class name args
+\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
+
+% \deffngeneral {subind}category name args
+%
+\def\deffngeneral#1#2 #3 #4\endheader{%
+  % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
+  \dosubind{fn}{\code{#3}}{#1}%
+  \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
+}
+
+%%% Typed functions:
+
+% @deftypefn category type name args
+\makedefun{deftypefn}{\deftypefngeneral{}}
+
+% @deftypeop category class type name args
+\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
+
+% \deftypeopon {category on}class type name args
+\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
+
+% \deftypefngeneral {subind}category type name args
+%
+\def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
+  \dosubind{fn}{\code{#4}}{#1}%
+  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
+}
+
+%%% Typed variables:
+
+% @deftypevr category type var args
+\makedefun{deftypevr}{\deftypecvgeneral{}}
+
+% @deftypecv category class type var args
+\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
+
+% \deftypecvof {category of}class type var args
+\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
+
+% \deftypecvgeneral {subind}category type var args
+%
+\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
+  \dosubind{vr}{\code{#4}}{#1}%
+  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
+}
+
+%%% Untyped variables:
+
+% @defvr category var args
+\makedefun{defvr}#1 {\deftypevrheader{#1} {} }
+
+% @defcv category class var args
+\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
+
+% \defcvof {category of}class var args
+\def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
+
+%%% Type:
+% @deftp category name args
+\makedefun{deftp}#1 #2 #3\endheader{%
+  \doind{tp}{\code{#2}}%
+  \defname{#1}{}{#2}\defunargs{#3\unskip}%
+}
+
+% Remaining @defun-like shortcuts:
+\makedefun{defun}{\deffnheader{\putwordDeffunc} }
+\makedefun{defmac}{\deffnheader{\putwordDefmac} }
+\makedefun{defspec}{\deffnheader{\putwordDefspec} }
+\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} }
+\makedefun{defvar}{\defvrheader{\putwordDefvar} }
+\makedefun{defopt}{\defvrheader{\putwordDefopt} }
+\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
+\makedefun{defmethod}{\defopon\putwordMethodon}
+\makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
+\makedefun{defivar}{\defcvof\putwordInstanceVariableof}
+\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
+
+% \defname, which formats the name of the @def (not the args).
+% #1 is the category, such as "Function".
+% #2 is the return type, if any.
+% #3 is the function name.
+%
+% We are followed by (but not passed) the arguments, if any.
+%
+\def\defname#1#2#3{%
+  % Get the values of \leftskip and \rightskip as they were outside the @def...
+  \advance\leftskip by -\defbodyindent
+  %
+  % How we'll format the type name.  Putting it in brackets helps
+  % distinguish it from the body text that may end up on the next line
+  % just below it.
+  \def\temp{#1}%
+  \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
+  %
+  % Figure out line sizes for the paragraph shape.
+  % The first line needs space for \box0; but if \rightskip is nonzero,
+  % we need only space for the part of \box0 which exceeds it:
+  \dimen0=\hsize  \advance\dimen0 by -\wd0  \advance\dimen0 by \rightskip
+  % The continuations:
+  \dimen2=\hsize  \advance\dimen2 by -\defargsindent
+  % (plain.tex says that \dimen1 should be used only as global.)
+  \parshape 2 0in \dimen0 \defargsindent \dimen2
+  %
+  % Put the type name to the right margin.
+  \noindent
+  \hbox to 0pt{%
+    \hfil\box0 \kern-\hsize
+    % \hsize has to be shortened this way:
+    \kern\leftskip
+    % Intentionally do not respect \rightskip, since we need the space.
+  }%
+  %
+  % Allow all lines to be underfull without complaint:
+  \tolerance=10000 \hbadness=10000
+  \exdentamount=\defbodyindent
+  {%
+    % defun fonts. We use typewriter by default (used to be bold) because:
+    % . we're printing identifiers, they should be in tt in principle.
+    % . in languages with many accents, such as Czech or French, it's
+    %   common to leave accents off identifiers.  The result looks ok in
+    %   tt, but exceedingly strange in rm.
+    % . we don't want -- and --- to be treated as ligatures.
+    % . this still does not fix the ?` and !` ligatures, but so far no
+    %   one has made identifiers using them :).
+    \df \tt
+    \def\temp{#2}% return value type
+    \ifx\temp\empty\else \tclose{\temp} \fi
+    #3% output function name
+  }%
+  {\rm\enskip}% hskip 0.5 em of \tenrm
+  %
+  \boldbrax
+  % arguments will be output next, if any.
+}
+
+% Print arguments in slanted roman (not ttsl), inconsistently with using
+% tt for the name.  This is because literal text is sometimes needed in
+% the argument list (groff manual), and ttsl and tt are not very
+% distinguishable.  Prevent hyphenation at `-' chars.
+%
+\def\defunargs#1{%
+  % use sl by default (not ttsl),
+  % tt for the names.
+  \df \sl \hyphenchar\font=0
+  %
+  % On the other hand, if an argument has two dashes (for instance), we
+  % want a way to get ttsl.  Let's try @var for that.
+  \let\var=\ttslanted
+  #1%
+  \sl\hyphenchar\font=45
+}
+
+% We want ()&[] to print specially on the defun line.
+%
+\def\activeparens{%
+  \catcode`\(=\active \catcode`\)=\active
+  \catcode`\[=\active \catcode`\]=\active
+  \catcode`\&=\active
+}
+
+% Make control sequences which act like normal parenthesis chars.
+\let\lparen = ( \let\rparen = )
+
+% Be sure that we always have a definition for `(', etc.  For example,
+% if the fn name has parens in it, \boldbrax will not be in effect yet,
+% so TeX would otherwise complain about undefined control sequence.
+{
+  \activeparens
+  \global\let(=\lparen \global\let)=\rparen
+  \global\let[=\lbrack \global\let]=\rbrack
+  \global\let& = \&
+
+  \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
+  \gdef\magicamp{\let&=\amprm}
+}
+
+\newcount\parencount
+
+% If we encounter &foo, then turn on ()-hacking afterwards
+\newif\ifampseen
+\def\amprm#1 {\ampseentrue{\bf\&#1 }}
+
+\def\parenfont{%
+  \ifampseen
+    % At the first level, print parens in roman,
+    % otherwise use the default font.
+    \ifnum \parencount=1 \rm \fi
+  \else
+    % The \sf parens (in \boldbrax) actually are a little bolder than
+    % the contained text.  This is especially needed for [ and ] .
+    \sf
+  \fi
+}
+\def\infirstlevel#1{%
+  \ifampseen
+    \ifnum\parencount=1
+      #1%
+    \fi
+  \fi
+}
+\def\bfafterword#1 {#1 \bf}
+
+\def\opnr{%
+  \global\advance\parencount by 1
+  {\parenfont(}%
+  \infirstlevel \bfafterword
+}
+\def\clnr{%
+  {\parenfont)}%
+  \infirstlevel \sl
+  \global\advance\parencount by -1
+}
+
+\newcount\brackcount
+\def\lbrb{%
+  \global\advance\brackcount by 1
+  {\bf[}%
+}
+\def\rbrb{%
+  {\bf]}%
+  \global\advance\brackcount by -1
+}
+
+\def\checkparencounts{%
+  \ifnum\parencount=0 \else \badparencount \fi
+  \ifnum\brackcount=0 \else \badbrackcount \fi
+}
+\def\badparencount{%
+  \errmessage{Unbalanced parentheses in @def}%
+  \global\parencount=0
+}
+\def\badbrackcount{%
+  \errmessage{Unbalanced square braces in @def}%
+  \global\brackcount=0
+}
+
+
+\message{macros,}
+% @macro.
+
+% To do this right we need a feature of e-TeX, \scantokens,
+% which we arrange to emulate with a temporary file in ordinary TeX.
+\ifx\eTeXversion\undefined
+  \newwrite\macscribble
+  \def\scantokens#1{%
+    \toks0={#1}%
+    \immediate\openout\macscribble=\jobname.tmp
+    \immediate\write\macscribble{\the\toks0}%
+    \immediate\closeout\macscribble
+    \input \jobname.tmp
+  }
+\fi
+
+\def\scanmacro#1{%
+  \begingroup
+    \newlinechar`\^^M
+    \let\xeatspaces\eatspaces
+    % Undo catcode changes of \startcontents and \doprintindex
+    % When called from @insertcopying or (short)caption, we need active
+    % backslash to get it printed correctly.  Previously, we had
+    % \catcode`\\=\other instead.  We'll see whether a problem appears
+    % with macro expansion.				--kasal, 19aug04
+    \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
+    % ... and \example
+    \spaceisspace
+    %
+    % Append \endinput to make sure that TeX does not see the ending newline.
+    %
+    % I've verified that it is necessary both for e-TeX and for ordinary TeX
+    %							--kasal, 29nov03
+    \scantokens{#1\endinput}%
+  \endgroup
+}
+
+\def\scanexp#1{%
+  \edef\temp{\noexpand\scanmacro{#1}}%
+  \temp
+}
+
+\newcount\paramno   % Count of parameters
+\newtoks\macname    % Macro name
+\newif\ifrecursive  % Is it recursive?
+
+% List of all defined macros in the form
+%    \definedummyword\macro1\definedummyword\macro2...
+% Currently is also contains all @aliases; the list can be split
+% if there is a need.
+\def\macrolist{}
+
+% Add the macro to \macrolist
+\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
+\def\addtomacrolistxxx#1{%
+     \toks0 = \expandafter{\macrolist\definedummyword#1}%
+     \xdef\macrolist{\the\toks0}%
+}
+
+% Utility routines.
+% This does \let #1 = #2, with \csnames; that is,
+%   \let \csname#1\endcsname = \csname#2\endcsname
+% (except of course we have to play expansion games).
+% 
+\def\cslet#1#2{%
+  \expandafter\let
+  \csname#1\expandafter\endcsname
+  \csname#2\endcsname
+}
+
+% Trim leading and trailing spaces off a string.
+% Concepts from aro-bend problem 15 (see CTAN).
+{\catcode`\@=11
+\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }}
+\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@}
+\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @}
+\def\unbrace#1{#1}
+\unbrace{\gdef\trim@@@ #1 } #2@{#1}
+}
+
+% Trim a single trailing ^^M off a string.
+{\catcode`\^^M=\other \catcode`\Q=3%
+\gdef\eatcr #1{\eatcra #1Q^^MQ}%
+\gdef\eatcra#1^^MQ{\eatcrb#1Q}%
+\gdef\eatcrb#1Q#2Q{#1}%
+}
+
+% Macro bodies are absorbed as an argument in a context where
+% all characters are catcode 10, 11 or 12, except \ which is active
+% (as in normal texinfo). It is necessary to change the definition of \.
+
+% It's necessary to have hard CRs when the macro is executed. This is
+% done by  making ^^M (\endlinechar) catcode 12 when reading the macro
+% body, and then making it the \newlinechar in \scanmacro.
+
+\def\scanctxt{%
+  \catcode`\"=\other
+  \catcode`\+=\other
+  \catcode`\<=\other
+  \catcode`\>=\other
+  \catcode`\@=\other
+  \catcode`\^=\other
+  \catcode`\_=\other
+  \catcode`\|=\other
+  \catcode`\~=\other
+}
+
+\def\scanargctxt{%
+  \scanctxt
+  \catcode`\\=\other
+  \catcode`\^^M=\other
+}
+
+\def\macrobodyctxt{%
+  \scanctxt
+  \catcode`\{=\other
+  \catcode`\}=\other
+  \catcode`\^^M=\other
+  \usembodybackslash
+}
+
+\def\macroargctxt{%
+  \scanctxt
+  \catcode`\\=\other
+}
+
+% \mbodybackslash is the definition of \ in @macro bodies.
+% It maps \foo\ => \csname macarg.foo\endcsname => #N
+% where N is the macro parameter number.
+% We define \csname macarg.\endcsname to be \realbackslash, so
+% \\ in macro replacement text gets you a backslash.
+
+{\catcode`@=0 @catcode`@\=@active
+ @gdef@usembodybackslash{@let\=@mbodybackslash}
+ @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname}
+}
+\expandafter\def\csname macarg.\endcsname{\realbackslash}
+
+\def\macro{\recursivefalse\parsearg\macroxxx}
+\def\rmacro{\recursivetrue\parsearg\macroxxx}
+
+\def\macroxxx#1{%
+  \getargs{#1}%           now \macname is the macname and \argl the arglist
+  \ifx\argl\empty       % no arguments
+     \paramno=0%
+  \else
+     \expandafter\parsemargdef \argl;%
+  \fi
+  \if1\csname ismacro.\the\macname\endcsname
+     \message{Warning: redefining \the\macname}%
+  \else
+     \expandafter\ifx\csname \the\macname\endcsname \relax
+     \else \errmessage{Macro name \the\macname\space already defined}\fi
+     \global\cslet{macsave.\the\macname}{\the\macname}%
+     \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
+     \addtomacrolist{\the\macname}%
+  \fi
+  \begingroup \macrobodyctxt
+  \ifrecursive \expandafter\parsermacbody
+  \else \expandafter\parsemacbody
+  \fi}
+
+\parseargdef\unmacro{%
+  \if1\csname ismacro.#1\endcsname
+    \global\cslet{#1}{macsave.#1}%
+    \global\expandafter\let \csname ismacro.#1\endcsname=0%
+    % Remove the macro name from \macrolist:
+    \begingroup
+      \expandafter\let\csname#1\endcsname \relax
+      \let\definedummyword\unmacrodo
+      \xdef\macrolist{\macrolist}%
+    \endgroup
+  \else
+    \errmessage{Macro #1 not defined}%
+  \fi
+}
+
+% Called by \do from \dounmacro on each macro.  The idea is to omit any
+% macro definitions that have been changed to \relax.
+%
+\def\unmacrodo#1{%
+  \ifx #1\relax
+    % remove this
+  \else
+    \noexpand\definedummyword \noexpand#1%
+  \fi
+}
+
+% This makes use of the obscure feature that if the last token of a
+% <parameter list> is #, then the preceding argument is delimited by
+% an opening brace, and that opening brace is not consumed.
+\def\getargs#1{\getargsxxx#1{}}
+\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
+\def\getmacname #1 #2\relax{\macname={#1}}
+\def\getmacargs#1{\def\argl{#1}}
+
+% Parse the optional {params} list.  Set up \paramno and \paramlist
+% so \defmacro knows what to do.  Define \macarg.blah for each blah
+% in the params list, to be ##N where N is the position in that list.
+% That gets used by \mbodybackslash (above).
+
+% We need to get `macro parameter char #' into several definitions.
+% The technique used is stolen from LaTeX:  let \hash be something
+% unexpandable, insert that wherever you need a #, and then redefine
+% it to # just before using the token list produced.
+%
+% The same technique is used to protect \eatspaces till just before
+% the macro is used.
+
+\def\parsemargdef#1;{\paramno=0\def\paramlist{}%
+        \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
+\def\parsemargdefxxx#1,{%
+  \if#1;\let\next=\relax
+  \else \let\next=\parsemargdefxxx
+    \advance\paramno by 1%
+    \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
+        {\xeatspaces{\hash\the\paramno}}%
+    \edef\paramlist{\paramlist\hash\the\paramno,}%
+  \fi\next}
+
+% These two commands read recursive and nonrecursive macro bodies.
+% (They're different since rec and nonrec macros end differently.)
+
+\long\def\parsemacbody#1@end macro%
+{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
+\long\def\parsermacbody#1@end rmacro%
+{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
+
+% This defines the macro itself. There are six cases: recursive and
+% nonrecursive macros of zero, one, and many arguments.
+% Much magic with \expandafter here.
+% \xdef is used so that macro definitions will survive the file
+% they're defined in; @include reads the file inside a group.
+\def\defmacro{%
+  \let\hash=##% convert placeholders to macro parameter chars
+  \ifrecursive
+    \ifcase\paramno
+    % 0
+      \expandafter\xdef\csname\the\macname\endcsname{%
+        \noexpand\scanmacro{\temp}}%
+    \or % 1
+      \expandafter\xdef\csname\the\macname\endcsname{%
+         \bgroup\noexpand\macroargctxt
+         \noexpand\braceorline
+         \expandafter\noexpand\csname\the\macname xxx\endcsname}%
+      \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
+         \egroup\noexpand\scanmacro{\temp}}%
+    \else % many
+      \expandafter\xdef\csname\the\macname\endcsname{%
+         \bgroup\noexpand\macroargctxt
+         \noexpand\csname\the\macname xx\endcsname}%
+      \expandafter\xdef\csname\the\macname xx\endcsname##1{%
+          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+      \expandafter\expandafter
+      \expandafter\xdef
+      \expandafter\expandafter
+        \csname\the\macname xxx\endcsname
+          \paramlist{\egroup\noexpand\scanmacro{\temp}}%
+    \fi
+  \else
+    \ifcase\paramno
+    % 0
+      \expandafter\xdef\csname\the\macname\endcsname{%
+        \noexpand\norecurse{\the\macname}%
+        \noexpand\scanmacro{\temp}\egroup}%
+    \or % 1
+      \expandafter\xdef\csname\the\macname\endcsname{%
+         \bgroup\noexpand\macroargctxt
+         \noexpand\braceorline
+         \expandafter\noexpand\csname\the\macname xxx\endcsname}%
+      \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
+        \egroup
+        \noexpand\norecurse{\the\macname}%
+        \noexpand\scanmacro{\temp}\egroup}%
+    \else % many
+      \expandafter\xdef\csname\the\macname\endcsname{%
+         \bgroup\noexpand\macroargctxt
+         \expandafter\noexpand\csname\the\macname xx\endcsname}%
+      \expandafter\xdef\csname\the\macname xx\endcsname##1{%
+          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+      \expandafter\expandafter
+      \expandafter\xdef
+      \expandafter\expandafter
+      \csname\the\macname xxx\endcsname
+      \paramlist{%
+          \egroup
+          \noexpand\norecurse{\the\macname}%
+          \noexpand\scanmacro{\temp}\egroup}%
+    \fi
+  \fi}
+
+\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
+
+% \braceorline decides whether the next nonwhitespace character is a
+% {.  If so it reads up to the closing }, if not, it reads the whole
+% line.  Whatever was read is then fed to the next control sequence
+% as an argument (by \parsebrace or \parsearg)
+\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorlinexxx{%
+  \ifx\nchar\bgroup\else
+    \expandafter\parsearg
+  \fi \next}
+
+
+% @alias.
+% We need some trickery to remove the optional spaces around the equal
+% sign.  Just make them active and then expand them all to nothing.
+\def\alias{\parseargusing\obeyspaces\aliasxxx}
+\def\aliasxxx #1{\aliasyyy#1\relax}
+\def\aliasyyy #1=#2\relax{%
+  {%
+    \expandafter\let\obeyedspace=\empty
+    \addtomacrolist{#1}%
+    \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
+  }%
+  \next
+}
+
+
+\message{cross references,}
+
+\newwrite\auxfile
+
+\newif\ifhavexrefs    % True if xref values are known.
+\newif\ifwarnedxrefs  % True if we warned once that they aren't known.
+
+% @inforef is relatively simple.
+\def\inforef #1{\inforefzzz #1,,,,**}
+\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
+  node \samp{\ignorespaces#1{}}}
+
+% @node's only job in TeX is to define \lastnode, which is used in
+% cross-references.  The @node line might or might not have commas, and
+% might or might not have spaces before the first comma, like:
+% @node foo , bar , ...
+% We don't want such trailing spaces in the node name.
+%
+\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
+%
+% also remove a trailing comma, in case of something like this:
+% @node Help-Cross,  ,  , Cross-refs
+\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
+\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+
+\let\nwnode=\node
+\let\lastnode=\empty
+
+% Write a cross-reference definition for the current node.  #1 is the
+% type (Ynumbered, Yappendix, Ynothing).
+%
+\def\donoderef#1{%
+  \ifx\lastnode\empty\else
+    \setref{\lastnode}{#1}%
+    \global\let\lastnode=\empty
+  \fi
+}
+
+% @anchor{NAME} -- define xref target at arbitrary point.
+%
+\newcount\savesfregister
+%
+\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
+\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
+\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
+
+% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
+% anchor), which consists of three parts:
+% 1) NAME-title - the current sectioning name taken from \thissection,
+%                 or the anchor name.
+% 2) NAME-snt   - section number and type, passed as the SNT arg, or
+%                 empty for anchors.
+% 3) NAME-pg    - the page number.
+%
+% This is called from \donoderef, \anchor, and \dofloat.  In the case of
+% floats, there is an additional part, which is not written here:
+% 4) NAME-lof   - the text as it should appear in a @listoffloats.
+%
+\def\setref#1#2{%
+  \pdfmkdest{#1}%
+  \iflinks
+    {%
+      \atdummies  % preserve commands, but don't expand them
+      \edef\writexrdef##1##2{%
+	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
+	  ##1}{##2}}% these are parameters of \writexrdef
+      }%
+      \toks0 = \expandafter{\thissection}%
+      \immediate \writexrdef{title}{\the\toks0 }%
+      \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
+      \writexrdef{pg}{\folio}% will be written later, during \shipout
+    }%
+  \fi
+}
+
+% @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
+% the node name, #2 the name of the Info cross-reference, #3 the printed
+% node name, #4 the name of the Info file, #5 the name of the printed
+% manual.  All but the node name can be omitted.
+%
+\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
+\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
+\def\ref#1{\xrefX[#1,,,,,,,]}
+\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
+  \unsepspaces
+  \def\printedmanual{\ignorespaces #5}%
+  \def\printedrefname{\ignorespaces #3}%
+  \setbox1=\hbox{\printedmanual\unskip}%
+  \setbox0=\hbox{\printedrefname\unskip}%
+  \ifdim \wd0 = 0pt
+    % No printed node name was explicitly given.
+    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
+      % Use the node name inside the square brackets.
+      \def\printedrefname{\ignorespaces #1}%
+    \else
+      % Use the actual chapter/section title appear inside
+      % the square brackets.  Use the real section title if we have it.
+      \ifdim \wd1 > 0pt
+        % It is in another manual, so we don't have it.
+        \def\printedrefname{\ignorespaces #1}%
+      \else
+        \ifhavexrefs
+          % We know the real title if we have the xref values.
+          \def\printedrefname{\refx{#1-title}{}}%
+        \else
+          % Otherwise just copy the Info node name.
+          \def\printedrefname{\ignorespaces #1}%
+        \fi%
+      \fi
+    \fi
+  \fi
+  %
+  % Make link in pdf output.
+  \ifpdf
+    \leavevmode
+    \getfilename{#4}%
+    {\turnoffactive
+     % See comments at \activebackslashdouble.
+     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
+      \backslashparens\pdfxrefdest}%
+     %
+     \ifnum\filenamelength>0
+       \startlink attr{/Border [0 0 0]}%
+         goto file{\the\filename.pdf} name{\pdfxrefdest}%
+     \else
+       \startlink attr{/Border [0 0 0]}%
+         goto name{\pdfmkpgn{\pdfxrefdest}}%
+     \fi
+    }%
+    \linkcolor
+  \fi
+  %
+  % Float references are printed completely differently: "Figure 1.2"
+  % instead of "[somenode], p.3".  We distinguish them by the
+  % LABEL-title being set to a magic string.
+  {%
+    % Have to otherify everything special to allow the \csname to
+    % include an _ in the xref name, etc.
+    \indexnofonts
+    \turnoffactive
+    \expandafter\global\expandafter\let\expandafter\Xthisreftitle
+      \csname XR#1-title\endcsname
+  }%
+  \iffloat\Xthisreftitle
+    % If the user specified the print name (third arg) to the ref,
+    % print it instead of our usual "Figure 1.2".
+    \ifdim\wd0 = 0pt
+      \refx{#1-snt}%
+    \else
+      \printedrefname
+    \fi
+    %
+    % if the user also gave the printed manual name (fifth arg), append
+    % "in MANUALNAME".
+    \ifdim \wd1 > 0pt
+      \space \putwordin{} \cite{\printedmanual}%
+    \fi
+  \else
+    % node/anchor (non-float) references.
+    %
+    % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
+    % insert empty discretionaries after hyphens, which means that it will
+    % not find a line break at a hyphen in a node names.  Since some manuals
+    % are best written with fairly long node names, containing hyphens, this
+    % is a loss.  Therefore, we give the text of the node name again, so it
+    % is as if TeX is seeing it for the first time.
+    \ifdim \wd1 > 0pt
+      \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+    \else
+      % _ (for example) has to be the character _ for the purposes of the
+      % control sequence corresponding to the node, but it has to expand
+      % into the usual \leavevmode...\vrule stuff for purposes of
+      % printing. So we \turnoffactive for the \refx-snt, back on for the
+      % printing, back off for the \refx-pg.
+      {\turnoffactive
+       % Only output a following space if the -snt ref is nonempty; for
+       % @unnumbered and @anchor, it won't be.
+       \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
+       \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
+      }%
+      % output the `[mynode]' via a macro so it can be overridden.
+      \xrefprintnodename\printedrefname
+      %
+      % But we always want a comma and a space:
+      ,\space
+      %
+      % output the `page 3'.
+      \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
+    \fi
+  \fi
+  \endlink
+\endgroup}
+
+% This macro is called from \xrefX for the `[nodename]' part of xref
+% output.  It's a separate macro only so it can be changed more easily,
+% since square brackets don't work well in some documents.  Particularly
+% one that Bob is working on :).
+%
+\def\xrefprintnodename#1{[#1]}
+
+% Things referred to by \setref.
+%
+\def\Ynothing{}
+\def\Yomitfromtoc{}
+\def\Ynumbered{%
+  \ifnum\secno=0
+    \putwordChapter@tie \the\chapno
+  \else \ifnum\subsecno=0
+    \putwordSection@tie \the\chapno.\the\secno
+  \else \ifnum\subsubsecno=0
+    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno
+  \else
+    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
+  \fi\fi\fi
+}
+\def\Yappendix{%
+  \ifnum\secno=0
+     \putwordAppendix@tie @char\the\appendixno{}%
+  \else \ifnum\subsecno=0
+     \putwordSection@tie @char\the\appendixno.\the\secno
+  \else \ifnum\subsubsecno=0
+    \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno
+  \else
+    \putwordSection@tie
+      @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
+  \fi\fi\fi
+}
+
+% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
+% If its value is nonempty, SUFFIX is output afterward.
+%
+\def\refx#1#2{%
+  {%
+    \indexnofonts
+    \otherbackslash
+    \expandafter\global\expandafter\let\expandafter\thisrefX
+      \csname XR#1\endcsname
+  }%
+  \ifx\thisrefX\relax
+    % If not defined, say something at least.
+    \angleleft un\-de\-fined\angleright
+    \iflinks
+      \ifhavexrefs
+        \message{\linenumber Undefined cross reference `#1'.}%
+      \else
+        \ifwarnedxrefs\else
+          \global\warnedxrefstrue
+          \message{Cross reference values unknown; you must run TeX again.}%
+        \fi
+      \fi
+    \fi
+  \else
+    % It's defined, so just use it.
+    \thisrefX
+  \fi
+  #2% Output the suffix in any case.
+}
+
+% This is the macro invoked by entries in the aux file.  Usually it's
+% just a \def (we prepend XR to the control sequence name to avoid
+% collisions).  But if this is a float type, we have more work to do.
+%
+\def\xrdef#1#2{%
+  \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
+  %
+  % Was that xref control sequence that we just defined for a float?
+  \expandafter\iffloat\csname XR#1\endcsname
+    % it was a float, and we have the (safe) float type in \iffloattype.
+    \expandafter\let\expandafter\floatlist
+      \csname floatlist\iffloattype\endcsname
+    %
+    % Is this the first time we've seen this float type?
+    \expandafter\ifx\floatlist\relax
+      \toks0 = {\do}% yes, so just \do
+    \else
+      % had it before, so preserve previous elements in list.
+      \toks0 = \expandafter{\floatlist\do}%
+    \fi
+    %
+    % Remember this xref in the control sequence \floatlistFLOATTYPE,
+    % for later use in \listoffloats.
+    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
+  \fi
+}
+
+% Read the last existing aux file, if any.  No error if none exists.
+%
+\def\tryauxfile{%
+  \openin 1 \jobname.aux
+  \ifeof 1 \else
+    \readdatafile{aux}%
+    \global\havexrefstrue
+  \fi
+  \closein 1
+}
+
+\def\setupdatafile{%
+  \catcode`\^^@=\other
+  \catcode`\^^A=\other
+  \catcode`\^^B=\other
+  \catcode`\^^C=\other
+  \catcode`\^^D=\other
+  \catcode`\^^E=\other
+  \catcode`\^^F=\other
+  \catcode`\^^G=\other
+  \catcode`\^^H=\other
+  \catcode`\^^K=\other
+  \catcode`\^^L=\other
+  \catcode`\^^N=\other
+  \catcode`\^^P=\other
+  \catcode`\^^Q=\other
+  \catcode`\^^R=\other
+  \catcode`\^^S=\other
+  \catcode`\^^T=\other
+  \catcode`\^^U=\other
+  \catcode`\^^V=\other
+  \catcode`\^^W=\other
+  \catcode`\^^X=\other
+  \catcode`\^^Z=\other
+  \catcode`\^^[=\other
+  \catcode`\^^\=\other
+  \catcode`\^^]=\other
+  \catcode`\^^^=\other
+  \catcode`\^^_=\other
+  % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
+  % in xref tags, i.e., node names.  But since ^^e4 notation isn't
+  % supported in the main text, it doesn't seem desirable.  Furthermore,
+  % that is not enough: for node names that actually contain a ^
+  % character, we would end up writing a line like this: 'xrdef {'hat
+  % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
+  % argument, and \hat is not an expandable control sequence.  It could
+  % all be worked out, but why?  Either we support ^^ or we don't.
+  %
+  % The other change necessary for this was to define \auxhat:
+  % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
+  % and then to call \auxhat in \setq.
+  %
+  \catcode`\^=\other
+  %
+  % Special characters.  Should be turned off anyway, but...
+  \catcode`\~=\other
+  \catcode`\[=\other
+  \catcode`\]=\other
+  \catcode`\"=\other
+  \catcode`\_=\other
+  \catcode`\|=\other
+  \catcode`\<=\other
+  \catcode`\>=\other
+  \catcode`\$=\other
+  \catcode`\#=\other
+  \catcode`\&=\other
+  \catcode`\%=\other
+  \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
+  %
+  % This is to support \ in node names and titles, since the \
+  % characters end up in a \csname.  It's easier than
+  % leaving it active and making its active definition an actual \
+  % character.  What I don't understand is why it works in the *value*
+  % of the xrdef.  Seems like it should be a catcode12 \, and that
+  % should not typeset properly.  But it works, so I'm moving on for
+  % now.  --karl, 15jan04.
+  \catcode`\\=\other
+  %
+  % Make the characters 128-255 be printing characters.
+  {%
+    \count1=128
+    \def\loop{%
+      \catcode\count1=\other
+      \advance\count1 by 1
+      \ifnum \count1<256 \loop \fi
+    }%
+  }%
+  %
+  % @ is our escape character in .aux files, and we need braces.
+  \catcode`\{=1
+  \catcode`\}=2
+  \catcode`\@=0
+}
+
+\def\readdatafile#1{%
+\begingroup
+  \setupdatafile
+  \input\jobname.#1
+\endgroup}
+
+\message{insertions,}
+% including footnotes.
+
+\newcount \footnoteno
+
+% The trailing space in the following definition for supereject is
+% vital for proper filling; pages come out unaligned when you do a
+% pagealignmacro call if that space before the closing brace is
+% removed. (Generally, numeric constants should always be followed by a
+% space to prevent strange expansion errors.)
+\def\supereject{\par\penalty -20000\footnoteno =0 }
+
+% @footnotestyle is meaningful for info output only.
+\let\footnotestyle=\comment
+
+{\catcode `\@=11
+%
+% Auto-number footnotes.  Otherwise like plain.
+\gdef\footnote{%
+  \let\indent=\ptexindent
+  \let\noindent=\ptexnoindent
+  \global\advance\footnoteno by \@ne
+  \edef\thisfootno{$^{\the\footnoteno}$}%
+  %
+  % In case the footnote comes at the end of a sentence, preserve the
+  % extra spacing after we do the footnote number.
+  \let\@sf\empty
+  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
+  %
+  % Remove inadvertent blank space before typesetting the footnote number.
+  \unskip
+  \thisfootno\@sf
+  \dofootnote
+}%
+
+% Don't bother with the trickery in plain.tex to not require the
+% footnote text as a parameter.  Our footnotes don't need to be so general.
+%
+% Oh yes, they do; otherwise, @ifset (and anything else that uses
+% \parseargline) fails inside footnotes because the tokens are fixed when
+% the footnote is read.  --karl, 16nov96.
+%
+\gdef\dofootnote{%
+  \insert\footins\bgroup
+  % We want to typeset this text as a normal paragraph, even if the
+  % footnote reference occurs in (for example) a display environment.
+  % So reset some parameters.
+  \hsize=\pagewidth
+  \interlinepenalty\interfootnotelinepenalty
+  \splittopskip\ht\strutbox % top baseline for broken footnotes
+  \splitmaxdepth\dp\strutbox
+  \floatingpenalty\@MM
+  \leftskip\z@skip
+  \rightskip\z@skip
+  \spaceskip\z@skip
+  \xspaceskip\z@skip
+  \parindent\defaultparindent
+  %
+  \smallfonts \rm
+  %
+  % Because we use hanging indentation in footnotes, a @noindent appears
+  % to exdent this text, so make it be a no-op.  makeinfo does not use
+  % hanging indentation so @noindent can still be needed within footnote
+  % text after an @example or the like (not that this is good style).
+  \let\noindent = \relax
+  %
+  % Hang the footnote text off the number.  Use \everypar in case the
+  % footnote extends for more than one paragraph.
+  \everypar = {\hang}%
+  \textindent{\thisfootno}%
+  %
+  % Don't crash into the line above the footnote text.  Since this
+  % expands into a box, it must come within the paragraph, lest it
+  % provide a place where TeX can split the footnote.
+  \footstrut
+  \futurelet\next\fo@t
+}
+}%end \catcode `\@=11
+
+% In case a @footnote appears in a vbox, save the footnote text and create
+% the real \insert just after the vbox finished.  Otherwise, the insertion
+% would be lost.
+% Similarily, if a @footnote appears inside an alignment, save the footnote
+% text to a box and make the \insert when a row of the table is finished.
+% And the same can be done for other insert classes.  --kasal, 16nov03.
+
+% Replace the \insert primitive by a cheating macro.
+% Deeper inside, just make sure that the saved insertions are not spilled
+% out prematurely.
+%
+\def\startsavinginserts{%
+  \ifx \insert\ptexinsert
+    \let\insert\saveinsert
+  \else
+    \let\checkinserts\relax
+  \fi
+}
+
+% This \insert replacement works for both \insert\footins{foo} and
+% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
+%
+\def\saveinsert#1{%
+  \edef\next{\noexpand\savetobox \makeSAVEname#1}%
+  \afterassignment\next
+  % swallow the left brace
+  \let\temp =
+}
+\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}}
+\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1}
+
+\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi}
+
+\def\placesaveins#1{%
+  \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname
+    {\box#1}%
+}
+
+% eat @SAVE -- beware, all of them have catcode \other:
+{
+  \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials  %  ;-)
+  \gdef\gobblesave @SAVE{}
+}
+
+% initialization:
+\def\newsaveins #1{%
+  \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}%
+  \next
+}
+\def\newsaveinsX #1{%
+  \csname newbox\endcsname #1%
+  \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts
+    \checksaveins #1}%
+}
+
+% initialize:
+\let\checkinserts\empty
+\newsaveins\footins
+\newsaveins\margin
+
+
+% @image.  We use the macros from epsf.tex to support this.
+% If epsf.tex is not installed and @image is used, we complain.
+%
+% Check for and read epsf.tex up front.  If we read it only at @image
+% time, we might be inside a group, and then its definitions would get
+% undone and the next image would fail.
+\openin 1 = epsf.tex
+\ifeof 1 \else
+  % Do not bother showing banner with epsf.tex v2.7k (available in
+  % doc/epsf.tex and on ctan).
+  \def\epsfannounce{\toks0 = }%
+  \input epsf.tex
+\fi
+\closein 1
+%
+% We will only complain once about lack of epsf.tex.
+\newif\ifwarnednoepsf
+\newhelp\noepsfhelp{epsf.tex must be installed for images to
+  work.  It is also included in the Texinfo distribution, or you can get
+  it from ftp://tug.org/tex/epsf.tex.}
+%
+\def\image#1{%
+  \ifx\epsfbox\undefined
+    \ifwarnednoepsf \else
+      \errhelp = \noepsfhelp
+      \errmessage{epsf.tex not found, images will be ignored}%
+      \global\warnednoepsftrue
+    \fi
+  \else
+    \imagexxx #1,,,,,\finish
+  \fi
+}
+%
+% Arguments to @image:
+% #1 is (mandatory) image filename; we tack on .eps extension.
+% #2 is (optional) width, #3 is (optional) height.
+% #4 is (ignored optional) html alt text.
+% #5 is (ignored optional) extension.
+% #6 is just the usual extra ignored arg for parsing this stuff.
+\newif\ifimagevmode
+\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
+  \catcode`\^^M = 5     % in case we're inside an example
+  \normalturnoffactive  % allow _ et al. in names
+  % If the image is by itself, center it.
+  \ifvmode
+    \imagevmodetrue
+    \nobreak\bigskip
+    % Usually we'll have text after the image which will insert
+    % \parskip glue, so insert it here too to equalize the space
+    % above and below.
+    \nobreak\vskip\parskip
+    \nobreak
+    \line\bgroup\hss
+  \fi
+  %
+  % Output the image.
+  \ifpdf
+    \dopdfimage{#1}{#2}{#3}%
+  \else
+    % \epsfbox itself resets \epsf?size at each figure.
+    \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
+    \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
+    \epsfbox{#1.eps}%
+  \fi
+  %
+  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
+\endgroup}
+
+
+% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables,
+% etc.  We don't actually implement floating yet, we always include the
+% float "here".  But it seemed the best name for the future.
+%
+\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish}
+
+% There may be a space before second and/or third parameter; delete it.
+\def\eatcommaspace#1, {#1,}
+
+% #1 is the optional FLOATTYPE, the text label for this float, typically
+% "Figure", "Table", "Example", etc.  Can't contain commas.  If omitted,
+% this float will not be numbered and cannot be referred to.
+%
+% #2 is the optional xref label.  Also must be present for the float to
+% be referable.
+%
+% #3 is the optional positioning argument; for now, it is ignored.  It
+% will somehow specify the positions allowed to float to (here, top, bottom).
+%
+% We keep a separate counter for each FLOATTYPE, which we reset at each
+% chapter-level command.
+\let\resetallfloatnos=\empty
+%
+\def\dofloat#1,#2,#3,#4\finish{%
+  \let\thiscaption=\empty
+  \let\thisshortcaption=\empty
+  %
+  % don't lose footnotes inside @float.
+  %
+  % BEWARE: when the floats start float, we have to issue warning whenever an
+  % insert appears inside a float which could possibly float. --kasal, 26may04
+  %
+  \startsavinginserts
+  %
+  % We can't be used inside a paragraph.
+  \par
+  %
+  \vtop\bgroup
+    \def\floattype{#1}%
+    \def\floatlabel{#2}%
+    \def\floatloc{#3}% we do nothing with this yet.
+    %
+    \ifx\floattype\empty
+      \let\safefloattype=\empty
+    \else
+      {%
+        % the floattype might have accents or other special characters,
+        % but we need to use it in a control sequence name.
+        \indexnofonts
+        \turnoffactive
+        \xdef\safefloattype{\floattype}%
+      }%
+    \fi
+    %
+    % If label is given but no type, we handle that as the empty type.
+    \ifx\floatlabel\empty \else
+      % We want each FLOATTYPE to be numbered separately (Figure 1,
+      % Table 1, Figure 2, ...).  (And if no label, no number.)
+      %
+      \expandafter\getfloatno\csname\safefloattype floatno\endcsname
+      \global\advance\floatno by 1
+      %
+      {%
+        % This magic value for \thissection is output by \setref as the
+        % XREFLABEL-title value.  \xrefX uses it to distinguish float
+        % labels (which have a completely different output format) from
+        % node and anchor labels.  And \xrdef uses it to construct the
+        % lists of floats.
+        %
+        \edef\thissection{\floatmagic=\safefloattype}%
+        \setref{\floatlabel}{Yfloat}%
+      }%
+    \fi
+    %
+    % start with \parskip glue, I guess.
+    \vskip\parskip
+    %
+    % Don't suppress indentation if a float happens to start a section.
+    \restorefirstparagraphindent
+}
+
+% we have these possibilities:
+% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
+% @float Foo,lbl & no caption:    Foo 1.1
+% @float Foo & @caption{Cap}:     Foo: Cap
+% @float Foo & no caption:        Foo
+% @float ,lbl & Caption{Cap}:     1.1: Cap
+% @float ,lbl & no caption:       1.1
+% @float & @caption{Cap}:         Cap
+% @float & no caption:
+%
+\def\Efloat{%
+    \let\floatident = \empty
+    %
+    % In all cases, if we have a float type, it comes first.
+    \ifx\floattype\empty \else \def\floatident{\floattype}\fi
+    %
+    % If we have an xref label, the number comes next.
+    \ifx\floatlabel\empty \else
+      \ifx\floattype\empty \else % if also had float type, need tie first.
+        \appendtomacro\floatident{\tie}%
+      \fi
+      % the number.
+      \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
+    \fi
+    %
+    % Start the printed caption with what we've constructed in
+    % \floatident, but keep it separate; we need \floatident again.
+    \let\captionline = \floatident
+    %
+    \ifx\thiscaption\empty \else
+      \ifx\floatident\empty \else
+	\appendtomacro\captionline{: }% had ident, so need a colon between
+      \fi
+      %
+      % caption text.
+      \appendtomacro\captionline{\scanexp\thiscaption}%
+    \fi
+    %
+    % If we have anything to print, print it, with space before.
+    % Eventually this needs to become an \insert.
+    \ifx\captionline\empty \else
+      \vskip.5\parskip
+      \captionline
+      %
+      % Space below caption.
+      \vskip\parskip
+    \fi
+    %
+    % If have an xref label, write the list of floats info.  Do this
+    % after the caption, to avoid chance of it being a breakpoint.
+    \ifx\floatlabel\empty \else
+      % Write the text that goes in the lof to the aux file as
+      % \floatlabel-lof.  Besides \floatident, we include the short
+      % caption if specified, else the full caption if specified, else nothing.
+      {%
+        \atdummies
+        % since we read the caption text in the macro world, where ^^M
+        % is turned into a normal character, we have to scan it back, so
+        % we don't write the literal three characters "^^M" into the aux file.
+	\scanexp{%
+	  \xdef\noexpand\gtemp{%
+	    \ifx\thisshortcaption\empty
+	      \thiscaption
+	    \else
+	      \thisshortcaption
+	    \fi
+	  }%
+	}%
+        \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
+	  \ifx\gtemp\empty \else : \gtemp \fi}}%
+      }%
+    \fi
+  \egroup  % end of \vtop
+  %
+  % place the captured inserts
+  %
+  % BEWARE: when the floats start float, we have to issue warning whenever an
+  % insert appears inside a float which could possibly float. --kasal, 26may04
+  %
+  \checkinserts
+}
+
+% Append the tokens #2 to the definition of macro #1, not expanding either.
+%
+\def\appendtomacro#1#2{%
+  \expandafter\def\expandafter#1\expandafter{#1#2}%
+}
+
+% @caption, @shortcaption
+%
+\def\caption{\docaption\thiscaption}
+\def\shortcaption{\docaption\thisshortcaption}
+\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
+\def\defcaption#1#2{\egroup \def#1{#2}}
+
+% The parameter is the control sequence identifying the counter we are
+% going to use.  Create it if it doesn't exist and assign it to \floatno.
+\def\getfloatno#1{%
+  \ifx#1\relax
+      % Haven't seen this figure type before.
+      \csname newcount\endcsname #1%
+      %
+      % Remember to reset this floatno at the next chap.
+      \expandafter\gdef\expandafter\resetallfloatnos
+        \expandafter{\resetallfloatnos #1=0 }%
+  \fi
+  \let\floatno#1%
+}
+
+% \setref calls this to get the XREFLABEL-snt value.  We want an @xref
+% to the FLOATLABEL to expand to "Figure 3.1".  We call \setref when we
+% first read the @float command.
+%
+\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}%
+
+% Magic string used for the XREFLABEL-title value, so \xrefX can
+% distinguish floats from other xref types.
+\def\floatmagic{!!float!!}
+
+% #1 is the control sequence we are passed; we expand into a conditional
+% which is true if #1 represents a float ref.  That is, the magic
+% \thissection value which we \setref above.
+%
+\def\iffloat#1{\expandafter\doiffloat#1==\finish}
+%
+% #1 is (maybe) the \floatmagic string.  If so, #2 will be the
+% (safe) float type for this float.  We set \iffloattype to #2.
+%
+\def\doiffloat#1=#2=#3\finish{%
+  \def\temp{#1}%
+  \def\iffloattype{#2}%
+  \ifx\temp\floatmagic
+}
+
+% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
+%
+\parseargdef\listoffloats{%
+  \def\floattype{#1}% floattype
+  {%
+    % the floattype might have accents or other special characters,
+    % but we need to use it in a control sequence name.
+    \indexnofonts
+    \turnoffactive
+    \xdef\safefloattype{\floattype}%
+  }%
+  %
+  % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
+  \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
+    \ifhavexrefs
+      % if the user said @listoffloats foo but never @float foo.
+      \message{\linenumber No `\safefloattype' floats to list.}%
+    \fi
+  \else
+    \begingroup
+      \leftskip=\tocindent  % indent these entries like a toc
+      \let\do=\listoffloatsdo
+      \csname floatlist\safefloattype\endcsname
+    \endgroup
+  \fi
+}
+
+% This is called on each entry in a list of floats.  We're passed the
+% xref label, in the form LABEL-title, which is how we save it in the
+% aux file.  We strip off the -title and look up \XRLABEL-lof, which
+% has the text we're supposed to typeset here.
+%
+% Figures without xref labels will not be included in the list (since
+% they won't appear in the aux file).
+%
+\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
+\def\listoffloatsdoentry#1-title\finish{{%
+  % Can't fully expand XR#1-lof because it can contain anything.  Just
+  % pass the control sequence.  On the other hand, XR#1-pg is just the
+  % page number, and we want to fully expand that so we can get a link
+  % in pdf output.
+  \toksA = \expandafter{\csname XR#1-lof\endcsname}%
+  %
+  % use the same \entry macro we use to generate the TOC and index.
+  \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
+  \writeentry
+}}
+
+\message{localization,}
+% and i18n.
+
+% @documentlanguage is usually given very early, just after
+% @setfilename.  If done too late, it may not override everything
+% properly.  Single argument is the language abbreviation.
+% It would be nice if we could set up a hyphenation file here.
+%
+\parseargdef\documentlanguage{%
+  \tex % read txi-??.tex file in plain TeX.
+    % Read the file if it exists.
+    \openin 1 txi-#1.tex
+    \ifeof 1
+      \errhelp = \nolanghelp
+      \errmessage{Cannot read language file txi-#1.tex}%
+    \else
+      \input txi-#1.tex
+    \fi
+    \closein 1
+  \endgroup
+}
+\newhelp\nolanghelp{The given language definition file cannot be found or
+is empty.  Maybe you need to install it?  In the current directory
+should work if nowhere else does.}
+
+
+% @documentencoding should change something in TeX eventually, most
+% likely, but for now just recognize it.
+\let\documentencoding = \comment
+
+
+% Page size parameters.
+%
+\newdimen\defaultparindent \defaultparindent = 15pt
+
+\chapheadingskip = 15pt plus 4pt minus 2pt
+\secheadingskip = 12pt plus 3pt minus 2pt
+\subsecheadingskip = 9pt plus 2pt minus 2pt
+
+% Prevent underfull vbox error messages.
+\vbadness = 10000
+
+% Don't be so finicky about underfull hboxes, either.
+\hbadness = 2000
+
+% Following George Bush, just get rid of widows and orphans.
+\widowpenalty=10000
+\clubpenalty=10000
+
+% Use TeX 3.0's \emergencystretch to help line breaking, but if we're
+% using an old version of TeX, don't do anything.  We want the amount of
+% stretch added to depend on the line length, hence the dependence on
+% \hsize.  We call this whenever the paper size is set.
+%
+\def\setemergencystretch{%
+  \ifx\emergencystretch\thisisundefined
+    % Allow us to assign to \emergencystretch anyway.
+    \def\emergencystretch{\dimen0}%
+  \else
+    \emergencystretch = .15\hsize
+  \fi
+}
+
+% Parameters in order: 1) textheight; 2) textwidth;
+% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
+% 7) physical page height; 8) physical page width.
+%
+% We also call \setleading{\textleading}, so the caller should define
+% \textleading.  The caller should also set \parskip.
+%
+\def\internalpagesizes#1#2#3#4#5#6#7#8{%
+  \voffset = #3\relax
+  \topskip = #6\relax
+  \splittopskip = \topskip
+  %
+  \vsize = #1\relax
+  \advance\vsize by \topskip
+  \outervsize = \vsize
+  \advance\outervsize by 2\topandbottommargin
+  \pageheight = \vsize
+  %
+  \hsize = #2\relax
+  \outerhsize = \hsize
+  \advance\outerhsize by 0.5in
+  \pagewidth = \hsize
+  %
+  \normaloffset = #4\relax
+  \bindingoffset = #5\relax
+  %
+  \ifpdf
+    \pdfpageheight #7\relax
+    \pdfpagewidth #8\relax
+  \fi
+  %
+  \setleading{\textleading}
+  %
+  \parindent = \defaultparindent
+  \setemergencystretch
+}
+
+% @letterpaper (the default).
+\def\letterpaper{{\globaldefs = 1
+  \parskip = 3pt plus 2pt minus 1pt
+  \textleading = 13.2pt
+  %
+  % If page is nothing but text, make it come out even.
+  \internalpagesizes{46\baselineskip}{6in}%
+                    {\voffset}{.25in}%
+                    {\bindingoffset}{36pt}%
+                    {11in}{8.5in}%
+}}
+
+% Use @smallbook to reset parameters for 7x9.25 trim size.
+\def\smallbook{{\globaldefs = 1
+  \parskip = 2pt plus 1pt
+  \textleading = 12pt
+  %
+  \internalpagesizes{7.5in}{5in}%
+                    {\voffset}{.25in}%
+                    {\bindingoffset}{16pt}%
+                    {9.25in}{7in}%
+  %
+  \lispnarrowing = 0.3in
+  \tolerance = 700
+  \hfuzz = 1pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = .5cm
+}}
+
+% Use @smallerbook to reset parameters for 6x9 trim size.
+% (Just testing, parameters still in flux.)
+\def\smallerbook{{\globaldefs = 1
+  \parskip = 1.5pt plus 1pt
+  \textleading = 12pt
+  %
+  \internalpagesizes{7.4in}{4.8in}%
+                    {-.2in}{-.4in}%
+                    {0pt}{14pt}%
+                    {9in}{6in}%
+  %
+  \lispnarrowing = 0.25in
+  \tolerance = 700
+  \hfuzz = 1pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = .4cm
+}}
+
+% Use @afourpaper to print on European A4 paper.
+\def\afourpaper{{\globaldefs = 1
+  \parskip = 3pt plus 2pt minus 1pt
+  \textleading = 13.2pt
+  %
+  % Double-side printing via postscript on Laserjet 4050
+  % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
+  % To change the settings for a different printer or situation, adjust
+  % \normaloffset until the front-side and back-side texts align.  Then
+  % do the same for \bindingoffset.  You can set these for testing in
+  % your texinfo source file like this:
+  % @tex
+  % \global\normaloffset = -6mm
+  % \global\bindingoffset = 10mm
+  % @end tex
+  \internalpagesizes{51\baselineskip}{160mm}
+                    {\voffset}{\hoffset}%
+                    {\bindingoffset}{44pt}%
+                    {297mm}{210mm}%
+  %
+  \tolerance = 700
+  \hfuzz = 1pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = 5mm
+}}
+
+% Use @afivepaper to print on European A5 paper.
+% From romildo@urano.iceb.ufop.br, 2 July 2000.
+% He also recommends making @example and @lisp be small.
+\def\afivepaper{{\globaldefs = 1
+  \parskip = 2pt plus 1pt minus 0.1pt
+  \textleading = 12.5pt
+  %
+  \internalpagesizes{160mm}{120mm}%
+                    {\voffset}{\hoffset}%
+                    {\bindingoffset}{8pt}%
+                    {210mm}{148mm}%
+  %
+  \lispnarrowing = 0.2in
+  \tolerance = 800
+  \hfuzz = 1.2pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = 2mm
+  \tableindent = 12mm
+}}
+
+% A specific text layout, 24x15cm overall, intended for A4 paper.
+\def\afourlatex{{\globaldefs = 1
+  \afourpaper
+  \internalpagesizes{237mm}{150mm}%
+                    {\voffset}{4.6mm}%
+                    {\bindingoffset}{7mm}%
+                    {297mm}{210mm}%
+  %
+  % Must explicitly reset to 0 because we call \afourpaper.
+  \globaldefs = 0
+}}
+
+% Use @afourwide to print on A4 paper in landscape format.
+\def\afourwide{{\globaldefs = 1
+  \afourpaper
+  \internalpagesizes{241mm}{165mm}%
+                    {\voffset}{-2.95mm}%
+                    {\bindingoffset}{7mm}%
+                    {297mm}{210mm}%
+  \globaldefs = 0
+}}
+
+% @pagesizes TEXTHEIGHT[,TEXTWIDTH]
+% Perhaps we should allow setting the margins, \topskip, \parskip,
+% and/or leading, also. Or perhaps we should compute them somehow.
+%
+\parseargdef\pagesizes{\pagesizesyyy #1,,\finish}
+\def\pagesizesyyy#1,#2,#3\finish{{%
+  \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
+  \globaldefs = 1
+  %
+  \parskip = 3pt plus 2pt minus 1pt
+  \setleading{\textleading}%
+  %
+  \dimen0 = #1
+  \advance\dimen0 by \voffset
+  %
+  \dimen2 = \hsize
+  \advance\dimen2 by \normaloffset
+  %
+  \internalpagesizes{#1}{\hsize}%
+                    {\voffset}{\normaloffset}%
+                    {\bindingoffset}{44pt}%
+                    {\dimen0}{\dimen2}%
+}}
+
+% Set default to letter.
+%
+\letterpaper
+
+
+\message{and turning on texinfo input format.}
+
+% Define macros to output various characters with catcode for normal text.
+\catcode`\"=\other
+\catcode`\~=\other
+\catcode`\^=\other
+\catcode`\_=\other
+\catcode`\|=\other
+\catcode`\<=\other
+\catcode`\>=\other
+\catcode`\+=\other
+\catcode`\$=\other
+\def\normaldoublequote{"}
+\def\normaltilde{~}
+\def\normalcaret{^}
+\def\normalunderscore{_}
+\def\normalverticalbar{|}
+\def\normalless{<}
+\def\normalgreater{>}
+\def\normalplus{+}
+\def\normaldollar{$}%$ font-lock fix
+
+% This macro is used to make a character print one way in \tt
+% (where it can probably be output as-is), and another way in other fonts,
+% where something hairier probably needs to be done.
+%
+% #1 is what to print if we are indeed using \tt; #2 is what to print
+% otherwise.  Since all the Computer Modern typewriter fonts have zero
+% interword stretch (and shrink), and it is reasonable to expect all
+% typewriter fonts to have this, we can check that font parameter.
+%
+\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi}
+
+% Same as above, but check for italic font.  Actually this also catches
+% non-italic slanted fonts since it is impossible to distinguish them from
+% italic fonts.  But since this is only used by $ and it uses \sl anyway
+% this is not a problem.
+\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi}
+
+% Turn off all special characters except @
+% (and those which the user can use as if they were ordinary).
+% Most of these we simply print from the \tt font, but for some, we can
+% use math or other variants that look better in normal text.
+
+\catcode`\"=\active
+\def\activedoublequote{{\tt\char34}}
+\let"=\activedoublequote
+\catcode`\~=\active
+\def~{{\tt\char126}}
+\chardef\hat=`\^
+\catcode`\^=\active
+\def^{{\tt \hat}}
+
+\catcode`\_=\active
+\def_{\ifusingtt\normalunderscore\_}
+\let\realunder=_
+% Subroutine for the previous macro.
+\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
+
+\catcode`\|=\active
+\def|{{\tt\char124}}
+\chardef \less=`\<
+\catcode`\<=\active
+\def<{{\tt \less}}
+\chardef \gtr=`\>
+\catcode`\>=\active
+\def>{{\tt \gtr}}
+\catcode`\+=\active
+\def+{{\tt \char 43}}
+\catcode`\$=\active
+\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
+
+% If a .fmt file is being used, characters that might appear in a file
+% name cannot be active until we have parsed the command line.
+% So turn them off again, and have \everyjob (or @setfilename) turn them on.
+% \otherifyactive is called near the end of this file.
+\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
+
+\catcode`\@=0
+
+% \backslashcurfont outputs one backslash character in current font,
+% as in \char`\\.
+\global\chardef\backslashcurfont=`\\
+\global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
+
+% \rawbackslash defines an active \ to do \backslashcurfont.
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
+{\catcode`\\=\active
+ @gdef@rawbackslash{@let\=@backslashcurfont}
+ @gdef@otherbackslash{@let\=@realbackslash}
+}
+
+% \realbackslash is an actual character `\' with catcode other, and
+% \doublebackslash is two of them (for the pdf outlines).
+{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
+
+% \normalbackslash outputs one backslash in fixed width font.
+\def\normalbackslash{{\tt\backslashcurfont}}
+
+\catcode`\\=\active
+
+% Used sometimes to turn off (effectively) the active characters
+% even after parsing them.
+@def@turnoffactive{%
+  @let"=@normaldoublequote
+  @let\=@realbackslash
+  @let~=@normaltilde
+  @let^=@normalcaret
+  @let_=@normalunderscore
+  @let|=@normalverticalbar
+  @let<=@normalless
+  @let>=@normalgreater
+  @let+=@normalplus
+  @let$=@normaldollar %$ font-lock fix
+  @unsepspaces
+}
+
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.  (Thus, \ is not expandable when this is in
+% effect.)
+%
+@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
+
+% Make _ and + \other characters, temporarily.
+% This is canceled by @fixbackslash.
+@otherifyactive
+
+% If a .fmt file is being used, we don't want the `\input texinfo' to show up.
+% That is what \eatinput is for; after that, the `\' should revert to printing
+% a backslash.
+%
+@gdef@eatinput input texinfo{@fixbackslash}
+@global@let\ = @eatinput
+
+% On the other hand, perhaps the file did not have a `\input texinfo'. Then
+% the first `\{ in the file would cause an error. This macro tries to fix
+% that, assuming it is called before the first `\' could plausibly occur.
+% Also turn back on active characters that might appear in the input
+% file name, in case not using a pre-dumped format.
+%
+@gdef@fixbackslash{%
+  @ifx\@eatinput @let\ = @normalbackslash @fi
+  @catcode`+=@active
+  @catcode`@_=@active
+}
+
+% Say @foo, not \foo, in error messages.
+@escapechar = `@@
+
+% These look ok in all fonts, so just make them not special.
+@catcode`@& = @other
+@catcode`@# = @other
+@catcode`@% = @other
+
+
+@c Local variables:
+@c eval: (add-hook 'write-file-hooks 'time-stamp)
+@c page-delimiter: "^\\\\message"
+@c time-stamp-start: "def\\\\texinfoversion{"
+@c time-stamp-format: "%:y-%02m-%02d.%02H"
+@c time-stamp-end: "}"
+@c End:
+
+@c vim:sw=2:
+
+@ignore
+   arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
+@end ignore
diff --git a/configure b/configure
index 6d73b2195..f8713512d 100755
--- a/configure
+++ b/configure
@@ -1,749 +1,27747 @@
-#!/bin/sh
-# Configure script for util-linux - aeb, 990205
-#
-# We need to find out the following things:
-#
-# Version of gcc
-#
-# Existence of header files:
-# H1. For fdisksunlabel.c: is there a <scsi/scsi.h>?
-# H2. For fdisk.c: is there a <linux/blkpg.h>?
-# H3. For kbd_rate.c: does <linux/kd.h> exist?
-# H4. For nls.h: do we have <locale.h>?
-# H5. For cal.c: do we have <langinfo.h>?
-# H6. For mkswap.c: do we have <sys/user.h> or <asm/page.h>?
-# H6a For mkswap.c: do we have <uuid/uuid.h>?
-# H7. For nfsmount.c: do we have <rpcsvc/nfs_prot.h>?
-# H8. For nfsmount.h (nfsmount_xdr.c: int32_t): do we have <asm/types.h>?
-# H9. For raw.c: do we have <linux/raw.h>?
-# H10. For md5.c: do we have <stdint.h>?
-# H11. For cmos.c: do we have <sys/io.h>?
-#
-# Existence of functions:
-# F1. For nfsmount.c: is inet_aton() available?
-# F2. For mkswap.c: is fsync() available?
-# F3. For agetty.c: is getdomainname() available?
-# F4. For hwclock/kd.c: do we have nanosleep()?
-# F5. For mkswap.c: do we have personality()?
-# F6. For agetty.c: is updwtmp() available?
-# F7. For pg.c: are fseeko() and ftello() available?
-# F8. For fsck.cramfs.c: is lchown() available?
-# F9. For cfdisk.c: is rpmatch() available?
-#
-#  1. Deleted.
-#  2. For cfdisk, setterm, more, ul: do we have ncurses? How installed?
-#  3. For more: do we have libtermcap?
-#  4. For chfn, chsh, login, newgrp, passwd: do we need -lcrypt?
-#  5. For sln: does static compilation work?
-#  6. For lib/nls.h: do we have <libintl.h> and gettext()?
-#  7. For xgettext: does it take the option --foreign-user?
-#  8. For err.c: do we have __progname?
-#  9. For script.c: do we have <pty.h> and openpty()?
-# 10. For lib/widechar.h: do we have wide character support?
-# 11. For pivot_root.c: does <sys/syscall.h> define SYS_pivot_root?
-# 12. For hwclock.c: does struct tm have a field tm_gmtoff?
-# 13. For nfsmount: does the output of rpcgen compile?
-# 14. For fsck.cramfs, mkfs.cramfs: do we have libz?
-# 15. For mount, do we have blkid?
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.59 for util-linux 2.13-pre1.
+#
+# Report bugs to <bunk@stusta.de>.
+#
+# Copyright (C) 2003 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.  ##
+## --------------------- ##
 
-rm -f make_include defines.h
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
-VERSION=`cat VERSION`
-echo
-echo configuring util-linux-$VERSION
-echo
-echo "VERSION=$VERSION" > make_include
-echo '#define UTIL_LINUX_VERSION "'$VERSION'"' > defines.h
-echo '#define util_linux_version "util-linux-'$VERSION'"' >> defines.h
-echo >> defines.h
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
 
-CC=${CC-cc}
-CFLAGS=${CFLAGS-"-O2"}
-LDFLAGS=${LDFLAGS-"-s"}
-echo CC=$CC >> make_include
-echo CFLAGS=$CFLAGS >> make_include
-echo LDFLAGS=$LDFLAGS >> make_include
 
-DEFS=
-LIBS=
-compile='$CC $CFLAGS $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1'
-compile_with_warnings='$CC $CFLAGS $DEFS conftest.c -o conftest $LIBS 2>&1'
-static_compile='$CC -static $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1'
-eval COMPILE='"'$compile'"'
-export COMPILE
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
 
-rm -f conftest.c conftest
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
 
-#
-# Old gcc (e.g. 2.5.8 and 2.7.2.3) wants options like -m486, and these
-# are still accepted by 2.95.3 and RedHat's 2.96, but gcc 3.0 says:
-#  `-m486' is deprecated. Use `-march=i486' or `-mcpu=i486' instead.
-#
-# Later gcc (e.g. 2.95.3 and 3.3.4) wants options like -mcpu=i486
-# and has never heard about -mtune=i486.
-#
-# I am told that gcc >= 3.4.0 wants options like -mtune=i486
-#  -mtune gives the CPU to optimize for
-#  -march gives the architecture
-#
-# Various versions of gcc react to unknown options with strings
-# containing "Invalid option" or "invalid option".
-#
-echo "
-int main(){ exit(0); }
-" > conftest.c
-gccout=`$CC $CFLAGS -mtune=i486 conftest.c -o conftest 2>&1 | grep "nvalid"`
-if test -z "$gccout"; then
-    echo "HAVE_NEW_GCC=yes" >> make_include
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; 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
-    gccout=`$CC $CFLAGS -m386 conftest.c -o conftest 2>&1 | grep "march="`
-    if test -z "$gccout"; then
-        echo "HAVE_OLD_GCC=yes" >> make_include
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# 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
+
+# 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
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  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
+
+       ;;
+  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
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); 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 sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# 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'"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
     fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "$0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 fi
-rm -f conftest conftest.c
+
+
+
+
+tagnames=${tagnames+${tagnames},}CXX
+
+tagnames=${tagnames+${tagnames},}F77
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
 
 #
-# Find out about the existence of header files
+# Initializations.
 #
+ac_default_prefix=/usr/local
+ac_config_libobj_dir=.
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Identity of this package.
+PACKAGE_NAME='util-linux'
+PACKAGE_TARNAME='util-linux'
+PACKAGE_VERSION='2.13-pre1'
+PACKAGE_STRING='util-linux 2.13-pre1'
+PACKAGE_BUGREPORT='bunk@stusta.de'
+
+ac_unique_file="mount/mount.c"
+ac_default_prefix=/
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PERL HAVE_RAW_TRUE HAVE_RAW_FALSE HAVE_PAM_TRUE HAVE_PAM_FALSE HAVE_UUID_TRUE HAVE_UUID_FALSE HAVE_LIBUTIL_TRUE HAVE_LIBUTIL_FALSE HAVE_TERMCAP_TRUE HAVE_TERMCAP_FALSE HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE HAVE_BLKID_TRUE HAVE_BLKID_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB HAVE_NCURSES_TRUE HAVE_NCURSES_FALSE USE_SLANG_TRUE USE_SLANG_FALSE NEED_LIBCRYPT_TRUE NEED_LIBCRYPT_FALSE HAVE_PIVOT_ROOT_TRUE HAVE_PIVOT_ROOT_FALSE INTEL_TRUE INTEL_FALSE SPARC_TRUE SPARC_FALSE BUILD_AGETTY_TRUE BUILD_AGETTY_FALSE BUILD_ELVTUNE_TRUE BUILD_ELVTUNE_FALSE BUILD_INIT_TRUE BUILD_INIT_FALSE BUILD_KILL_TRUE BUILD_KILL_FALSE BUILD_LAST_TRUE BUILD_LAST_FALSE BUILD_MESG_TRUE BUILD_MESG_FALSE BUILD_PARTX_TRUE BUILD_PARTX_FALSE BUILD_RAW_TRUE BUILD_RAW_FALSE BUILD_RDEV_TRUE BUILD_RDEV_FALSE BUILD_RENAME_TRUE BUILD_RENAME_FALSE BUILD_RESET_TRUE BUILD_RESET_FALSE BUILD_LOGIN_UTILS_TRUE BUILD_LOGIN_UTILS_FALSE BUILD_SCHEDUTILS_TRUE BUILD_SCHEDUTILS_FALSE BUILD_WALL_TRUE BUILD_WALL_FALSE BUILD_WRITE_TRUE BUILD_WRITE_FALSE USE_TTY_GROUP_TRUE USE_TTY_GROUP_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_files=''
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+# 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.
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+ac_prev=
+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
+
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_option in
+
+  -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 | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_$ac_feature='$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 ;;
+
+  -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 ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    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 ;;
+
+  -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_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_$ac_package='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=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 ;;
+
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      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'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+	      localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+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
+    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
+
+
+# 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 its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    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
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+  fi
+fi
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+   { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP
+ac_env_F77_set=${F77+set}
+ac_env_F77_value=$F77
+ac_cv_env_F77_set=${F77+set}
+ac_cv_env_F77_value=$F77
+ac_env_FFLAGS_set=${FFLAGS+set}
+ac_env_FFLAGS_value=$FFLAGS
+ac_cv_env_FFLAGS_set=${FFLAGS+set}
+ac_cv_env_FFLAGS_value=$FFLAGS
 
 #
-# H1. For fdisk/fdisksunlabel.c: is <scsi/scsi.h> available?
-#     Some kernels have <scsi/scsi.h> that uses u_char
-#     But maybe there is already a typedef. Let us use a #define
+# Report the --help message.
 #
-echo "
-#define u_char	unsigned char
-#include <scsi/scsi.h>
-#undef u_char
-int main(){ exit(0); }
-" > conftest.c
-eval $compile
-if test -s conftest; then
-        echo "#define HAVE_scsi_h" >> defines.h
-        echo "You have <scsi/scsi.h>"
+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 util-linux 2.13-pre1 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 \`..']
+
+_ACEOF
+
+  cat <<_ACEOF
+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]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --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]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+_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 util-linux 2.13-pre1:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-shared[=PKGS]
+                          build shared libraries [default=no]
+  --enable-static[=PKGS]
+                          build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-largefile     omit support for large files
+  --disable-nls           do not use Native Language Support
+  --disable-rpath         do not hardcode runtime library paths
+  --disable-agetty        do not build agetty
+  --enable-elvtune        build elvtune (only works with 2.2 and 2.4 kernels)
+  --enable-init           build simpleinit, shutdown, initctl
+  --enable-kill           build kill
+  --enable-last           build last
+  --enable-mesg           build mesg
+  --enable-partx          build addpart, delpart, partx
+  --enable-raw            build raw
+  --enable-rdev           build rdev on i386
+  --disable-rename        do not build rename
+  --enable-reset          build reset
+  --enable-login-utils    build chfn, chsh, login, newgrp, vipw
+  --disable-schedutils    do not build chrt, ionice, teskset
+  --disable-wall          do not build wall
+  --enable-write          build write
+  --disable-chsh-only-listed
+                          chsh: allow shells not in /etc/shells
+  --enable-login-chown-vcs
+                          let login chown /dev/vcsN
+  --enable-login-stat-mail
+                          let login stat() the mailbox
+  --disable-pg-bell       let pg not ring the bell on invalid keys
+  --disable-require-password
+                          do not require the user to enter the password in
+                          chfn and chsh
+  --disable-use-tty-group do not install wall and write setgid tty
+
+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-pic              try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-tags[=TAGS]
+                          include additional configurations [automatic]
+  --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
+  --with-slang            compile cfdisk with slang
+
+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>
+  CPPFLAGS    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
+  CXXCPP      C++ preprocessor
+  F77         Fortran 77 compiler command
+  FFLAGS      Fortran 77 compiler flags
+
+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 <bunk@stusta.de>.
+_ACEOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d $ac_dir || continue
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style 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
+    elif test -f $ac_srcdir/configure.ac ||
+	   test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd "$ac_popdir"
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\_ACEOF
+util-linux configure 2.13-pre1
+generated by GNU Autoconf 2.59
+
+Copyright (C) 2003 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 0
+fi
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by util-linux $as_me 2.13-pre1, which was
+generated by GNU Autoconf 2.59.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+{
+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`
+hostinfo               = `(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=.
+  echo "PATH: $as_dir"
+done
+
+} >&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_sep=
+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=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$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
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export 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: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+}
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=$`echo $ac_var`
+	echo "$ac_var='"'"'$ac_val'"'"'"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      sed "/^$/d" confdefs.h | sort
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >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
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  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.
+  if test -f "$cache_file"; then
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
+else
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; 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,)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+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
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+	ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`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.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+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_aux_dir=
+for ac_dir in config $srcdir/config; 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
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config $srcdir/config" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+
+am__api_version="1.9"
+# 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.
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$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
+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+done
+
+
+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.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL=$ac_install_sh
+  fi
+fi
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$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'
+
+echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# 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".
+      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}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 $.  echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm conftest.sed
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
+else
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
+  else
+    mkdir_p='$(install_sh) -d'
+  fi
+fi
+
+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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$AWK" && break
+done
+
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.make <<\_ACEOF
+all:
+	@echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  SET_MAKE=
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
+
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
+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='util-linux'
+ VERSION='2.13-pre1'
+
+
+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"}
+
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+# 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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  STRIP=$ac_ct_STRIP
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+
+# 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 -'
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
+  p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=no
+fi;
+
+
+# Check whether --enable-static or --disable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval="$enable_static"
+  p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi;
+
+# Check whether --enable-fast-install or --disable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+  enableval="$enable_fast_install"
+  p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi;
+
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+  ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+DEPDIR="${am__leading_dot}deps"
+
+          ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+
+echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking or --disable-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
+
+
+
+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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$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"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+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
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_CC" && break
+done
+
+  CC=$ac_ct_CC
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out 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.
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+	;;
+    conftest.$ac_ext )
+	# This is the source file.
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	# FIXME: I believe we export ac_cv_exeext for Libtool,
+	# but it would be cool to find out if it's true.  Does anybody
+	# maintain Libtool? --akim.
+	export ac_cv_exeext
+	break;;
+    * )
+	break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; 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 | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  export ac_cv_exeext
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cc_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$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
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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 -std1 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 -std1.  */
+int osf4_cc_array ['\x00' == 0 ? 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
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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="$CC"   am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+  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
+
+    case $depmode in
+    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
+      ;;
+    none) break ;;
+    esac
+    # 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.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} 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
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$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
-        echo "You don't have <scsi/scsi.h>"
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
 fi
-rm -f conftest conftest.c
+
+
+echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
+if test "${lt_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && break
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+SED=$lt_cv_path_SED
+
+fi
+
+echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6
+
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+
+
+# Check whether --with-gnu-ld or --without-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;
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&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.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname 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
+  echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_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 `"$lt_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="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+
+echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+if test "${lt_cv_path_NM+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      # Tru64's nm complains that /dev/null is an invalid object file
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
+	lt_cv_path_NM="$tmp_nm -B"
+	break
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
+	  break
+	  ;;
+	*)
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
+	  ;;
+	esac
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi
+fi
+echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6
+NM="$lt_cv_path_NM"
+
+echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
+fi
+
+echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix4* | aix5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi4*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | kfreebsd*-gnu)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case "$host_cpu" in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+  else
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sco3.2v5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval="$enable_libtool_lock"
+
+fi;
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line 3692 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  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
+
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  lt_cv_cc_needs_belf=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+lt_cv_cc_needs_belf=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+     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
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+
+esac
+
+need_locks="$enable_libtool_lock"
+
+
+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
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f 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
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+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
+
+
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
+fi
+rm -f 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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.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))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+for ac_header in dlfcn.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ac_ext=cc
+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 -n "$ac_tool_prefix"; then
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl 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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl 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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_CXX" && break
+done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+
+  CXX=$ac_ct_CXX
+fi
+
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cxx_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cxx_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$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
+for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+ac_ext=cc
+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
+
+depcc="$CXX"  am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+  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
+
+    case $depmode in
+    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
+      ;;
+    none) break ;;
+    esac
+    # 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.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} 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
+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$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
+
+
+ac_ext=cc
+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
+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6
+ac_preproc_ok=false
+for ac_cxx_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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=cc
+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
+
+
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+  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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$F77"; then
+  ac_cv_prog_F77="$F77" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+F77=$ac_cv_prog_F77
+if test -n "$F77"; then
+  echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$F77" && break
+  done
+fi
+if test -z "$F77"; then
+  ac_ct_F77=$F77
+  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_F77"; then
+  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_F77="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_F77=$ac_cv_prog_ac_ct_F77
+if test -n "$ac_ct_F77"; then
+  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_F77" && break
+done
+
+  F77=$ac_ct_F77
+fi
+
+
+# Provide some information about the compiler.
+echo "$as_me:5256:" \
+     "checking for Fortran 77 compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+rm -f a.out
+
+# If we don't use `.F' as extension, the preprocessor is not run on the
+# input file.  (Note that this only needs to work for GNU compilers.)
+ac_save_ext=$ac_ext
+ac_ext=F
+echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+      program main
+#ifndef __GNUC__
+       choke me
+#endif
+
+      end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+ac_ext=$ac_save_ext
+ac_test_FFLAGS=${FFLAGS+set}
+ac_save_FFLAGS=$FFLAGS
+FFLAGS=
+echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_f77_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  FFLAGS=-g
+cat >conftest.$ac_ext <<_ACEOF
+      program main
+
+      end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_f77_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_f77_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+if test "$ac_test_FFLAGS" = set; then
+  FFLAGS=$ac_save_FFLAGS
+elif test $ac_cv_prog_f77_g = yes; then
+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+    FFLAGS="-g -O2"
+  else
+    FFLAGS="-g"
+  fi
+else
+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+    FFLAGS="-O2"
+  else
+    FFLAGS=
+  fi
+fi
+
+G77=`test $ac_compiler_gnu = yes && echo yes`
+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
+
+
+
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+
+# find the maximum length of command line arguments
+echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+ *)
+    # If test is not a shell built-in, we'll probably end up computing a
+    # maximum length that is only half of the actual maximum length, but
+    # we can't tell.
+    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	    lt_cv_sys_max_cmd_len=$new_result &&
+	    test $i != 17 # 1/2 MB should be enough
+    do
+      i=`expr $i + 1`
+      teststring=$teststring$teststring
+    done
+    teststring=
+    # Add a significant safety factor because C++ compilers can tack on massive
+    # amounts of additional arguments before passing them to the linker.
+    # It appears as though 1/2 is a usable value.
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+else
+  echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
+fi
+
+
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris* | sysv5*)
+  symcode='[BDRT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+else
+  echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+fi
+
+echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+if test "${lt_cv_objdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6
+objdir=$lt_cv_objdir
+
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="ar"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  AR=$ac_ct_AR
+else
+  AR="$ac_cv_prog_AR"
+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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  RANLIB=$ac_ct_RANLIB
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  STRIP=$ac_ct_STRIP
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+enable_dlopen=no
+enable_win32_dll=no
+
+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval="$enable_libtool_lock"
+
+fi;
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+
+# Check whether --with-pic or --without-pic was given.
+if test "${with_pic+set}" = set; then
+  withval="$with_pic"
+  pic_mode="$withval"
+else
+  pic_mode=default
+fi;
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+lt_save_CC="$CC"
+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
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}\n'
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
 
 #
-# H2. For fdisk/fdisk.c: is <linux/blkpg.h> available?
+# Check for any special shared library compilation flags.
 #
-if ./testincl "linux/blkpg.h"; then
-        echo "#define HAVE_blkpg_h" >> defines.h
+lt_prog_cc_shlib=
+if test "$GCC" = no; then
+  case $host_os in
+  sco3.2v5*)
+    lt_prog_cc_shlib='-belf'
+    ;;
+  esac
 fi
+if test -n "$lt_prog_cc_shlib"; then
+  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
+echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
+  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
+  else
+    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+    lt_cv_prog_cc_can_build_shared=no
+  fi
+fi
+
 
 #
-# H3. Does <linux/kd.h> exist?
+# Check to make sure the static flag actually works.
 #
-if ./testincl "linux/kd.h"; then
-	echo "#define HAVE_kd_h" >> defines.h
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+     else
+       lt_prog_compiler_static_works=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
 fi
 
+
+
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+
+echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:6288: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:6292: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    linux*)
+      case $CC in
+      icc* | ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_prog_compiler_pic='-Kpic'
+      lt_prog_compiler_static='-dn'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic" >&6
+
 #
-# H4. For lib/nls.h: do we have <locale.h>?
+# Check to make sure the PIC flag actually works.
 #
-if ./testincl "locale.h"; then
-        echo "#define HAVE_locale_h" >> defines.h
+if test -n "$lt_prog_compiler_pic"; then
+
+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
+if test "${lt_prog_compiler_pic_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_pic_works=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:6521: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:6525: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_prog_compiler_pic_works=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
+
+if test x"$lt_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:6581: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:6585: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+  runpath_var=
+  allow_undefined_flag=
+  enable_shared_with_static_runtimes=no
+  archive_cmds=
+  archive_expsym_cmds=
+  old_archive_From_new_cmds=
+  old_archive_from_expsyms_cmds=
+  export_dynamic_flag_spec=
+  whole_archive_flag_spec=
+  thread_safe_flag_spec=
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
+  hardcode_libdir_separator=
+  hardcode_direct=no
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  link_all_deplibs=unknown
+  hardcode_automatic=no
+  module_cmds=
+  module_expsym_cmds=
+  always_export_symbols=no
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+  linux*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds="$tmp_archive_cmds"
+      supports_anon_versioning=no
+      case `$LD -v 2>/dev/null` in
+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=yes ;;
+      esac
+      if test $supports_anon_versioning = yes; then
+        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+$echo "local: *; };" >> $output_objdir/$libname.ver~
+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+      else
+        archive_expsym_cmds="$tmp_archive_cmds"
+      fi
+      link_all_deplibs=no
+    else
+      ld_shlibs=no
+    fi
+    ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = yes; then
+      runpath_var=LD_RUN_PATH
+      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+      export_dynamic_flag_spec='${wl}--export-dynamic'
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec=
+      fi
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$link_static_flag"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.012|aix4.012.*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  hardcode_direct=yes
+	  else
+  	  # We have old collect2
+  	  hardcode_direct=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L=yes
+  	  hardcode_libdir_flag_spec='-L$libdir'
+  	  hardcode_libdir_separator=
+	  fi
+	esac
+	shared_flag='-shared'
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+  	if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+  	fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  # -bexpall does not export symbols beginning with underscore (_)
+	  always_export_symbols=yes
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec=' '
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+
+    bsdi4*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    darwin* | rhapsody*)
+    if test "$GXX" = yes ; then
+      archive_cmds_need_lc=no
+      case "$host_os" in
+      rhapsody* | darwin1.[012])
+	allow_undefined_flag='-undefined suppress'
+	;;
+      *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            allow_undefined_flag='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+	;;
+      esac
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        else
+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        fi
+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      hardcode_direct=no
+      hardcode_automatic=yes
+      hardcode_shlibpath_var=unsupported
+      whole_archive_flag_spec='-all_load $convenience'
+      link_all_deplibs=yes
+    else
+      ld_shlibs=no
+    fi
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | kfreebsd*-gnu)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10* | hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	*)
+	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*)
+	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_flag_spec_ld='+b $libdir'
+	  hardcode_libdir_separator=:
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	ia64*)
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	*)
+	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator=:
+	  hardcode_direct=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      link_all_deplibs=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    openbsd*)
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec='${wl}-E'
+      else
+       case $host_os in
+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   hardcode_libdir_flag_spec='-R$libdir'
+	   ;;
+	 *)
+	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+
+    sco3.2v5*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z text'
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4.2uw2*)
+      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=no
+      hardcode_shlibpath_var=no
+      hardcode_runpath_var=yes
+      runpath_var=LD_RUN_PATH
+      ;;
+
+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      no_undefined_flag='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv5*)
+      no_undefined_flag=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      hardcode_libdir_flag_spec=
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6
+test "$ld_shlibs" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
 #
-# H5. For cal.c: do we have <langinfo.h>?
+# Do we need to explicitly link libc?
 #
-if ./testincl "langinfo.h"; then
-        echo "#define HAVE_langinfo_h" >> defines.h
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+echo "${ECHO_T}$archive_cmds_need_lc" >&6
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if test "$GCC" = yes; then
+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+kfreebsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.01* | freebsdelf3.01*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=yes
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+   test -n "$runpath_var " || \
+   test "X$hardcode_automatic"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
+
+if test "$hardcode_action" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+   ;;
+
+  *)
+    echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); 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 shl_load
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+/* 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_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+char (*f) () = shl_load;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != shl_load;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
+  lt_cv_dlopen="shl_load"
+else
+  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+else
+  echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); 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 dlopen
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+/* 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_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+char (*f) () = dlopen;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != dlopen;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
+  lt_cv_dlopen="dlopen"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
 
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 8769 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 8867 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+# Report which librarie types wil actually be built
+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6
+
+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+  darwin* | rhapsody*)
+  if test "$GCC" = yes; then
+    archive_cmds_need_lc=no
+    case "$host_os" in
+    rhapsody* | darwin1.[012])
+      allow_undefined_flag='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            allow_undefined_flag='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+      ;;
+    esac
+    output_verbose_link_cmd='echo'
+    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    hardcode_direct=no
+    hardcode_automatic=yes
+    hardcode_shlibpath_var=unsupported
+    whole_archive_flag_spec='-all_load $convenience'
+    link_all_deplibs=yes
+  else
+    ld_shlibs=no
+  fi
+    ;;
+esac
+echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6
+
+echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler \
+    CC \
+    LD \
+    lt_prog_compiler_wl \
+    lt_prog_compiler_pic \
+    lt_prog_compiler_static \
+    lt_prog_compiler_no_builtin_flag \
+    export_dynamic_flag_spec \
+    thread_safe_flag_spec \
+    whole_archive_flag_spec \
+    enable_shared_with_static_runtimes \
+    old_archive_cmds \
+    old_archive_from_new_cmds \
+    predep_objects \
+    postdep_objects \
+    predeps \
+    postdeps \
+    compiler_lib_search_path \
+    archive_cmds \
+    archive_expsym_cmds \
+    postinstall_cmds \
+    postuninstall_cmds \
+    old_archive_from_expsyms_cmds \
+    allow_undefined_flag \
+    no_undefined_flag \
+    export_symbols_cmds \
+    hardcode_libdir_flag_spec \
+    hardcode_libdir_flag_spec_ld \
+    hardcode_libdir_separator \
+    hardcode_automatic \
+    module_cmds \
+    module_expsym_cmds \
+    lt_cv_prog_compiler_c_o \
+    exclude_expsyms \
+    include_expsyms; do
+
+    case $var in
+    old_archive_cmds | \
+    old_archive_from_new_cmds | \
+    archive_cmds | \
+    archive_expsym_cmds | \
+    module_cmds | \
+    module_expsym_cmds | \
+    old_archive_from_expsyms_cmds | \
+    export_symbols_cmds | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  { echo "$as_me:$LINENO: creating $ofile" >&5
+echo "$as_me: creating $ofile" >&6;}
+
+  cat <<__EOF__ >> "$cfgfile"
+#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# H6. For mkswap.c: do we have <sys/user.h> or <asm/page.h>?
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 #
-if ./testincl "sys/user.h"; then
-        echo "#define HAVE_sys_user_h" >> defines.h
-else if ./testincl "asm/page.h"; then
-        echo "#define HAVE_asm_page_h" >> defines.h
-fi; fi
-
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# 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.
 #
-# H6a. For mkswap.c: do we have <uuid/uuid.h>?
+# 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.
 #
-if ./testincl "uuid/uuid.h"; then
-    echo "#define HAVE_uuid_uuid_h" >> defines.h
-    echo "HAVE_UUID=yes" >> make_include
+# 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.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# ### END LIBTOOL CONFIG
+
+__EOF__
+
+
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
 else
-    echo "HAVE_UUID=no" >> make_include
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
-#
-# H7. For nfsmount.c: do we have <rpcsvc/nfs_prot.h>?
-#
-if ./testincl "rpcsvc/nfs_prot.h"; then
-	echo "#define HAVE_rpcsvc_nfs_prot_h" >> defines.h
+
+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
+
+CC="$lt_save_CC"
+
+
+# Check whether --with-tags or --without-tags was given.
+if test "${with_tags+set}" = set; then
+  withval="$with_tags"
+  tagnames="$withval"
+fi;
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+    else
+      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+    fi
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
+    "") ;;
+    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+echo "$as_me: error: invalid tag name: $tagname" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	  ac_ext=cc
+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
+
+
+
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_automatic_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+# Source file extension for C++ test sources.
+ac_ext=cc
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  unset lt_cv_path_LD
 fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+compiler_CXX=$CC
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 
-#
-# H8. For nfsmount.h: do we have <asm/types.h>?
-#
-if ./testincl "asm/types.h"; then
-        echo "#define HAVE_asm_types_h" >> defines.h
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+else
+  lt_prog_compiler_no_builtin_flag_CXX=
 fi
 
-#
-# H9. For raw.c: do we have <linux/raw.h>?
-#
-if ./testincl "linux/raw.h"; then
-        echo "HAVE_RAW_H=yes" >> make_include
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+
+# Check whether --with-gnu-ld or --without-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;
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&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.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname 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
+  echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_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 `"$lt_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="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
 fi
 
-#
-# H10. For md5.c: do we have <stdint.h>?
-if ./testincl "stdint.h"; then
-        echo "#define HAVE_stdint_h" >> defines.h
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec_CXX=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+ld_shlibs_CXX=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    archive_cmds_CXX=''
+    hardcode_direct_CXX=yes
+    hardcode_libdir_separator_CXX=':'
+    link_all_deplibs_CXX=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.012|aix4.012.*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  hardcode_direct_CXX=yes
+	else
+	  # We have old collect2
+	  hardcode_direct_CXX=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L_CXX=yes
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  hardcode_libdir_separator_CXX=
+	fi
+      esac
+      shared_flag='-shared'
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    always_export_symbols_CXX=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      allow_undefined_flag_CXX='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	allow_undefined_flag_CXX="-z nodefs"
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-#
-# H11. For cmos.c: do we have <sys/io.h>?
-if ./testincl "sys/io.h"; then
-        echo "#define HAVE_sys_io_h" >> defines.h
 fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	no_undefined_flag_CXX=' ${wl}-bernotok'
+	allow_undefined_flag_CXX=' ${wl}-berok'
+	# -bexpall does not export symbols beginning with underscore (_)
+	always_export_symbols_CXX=yes
+	# Exported symbols can be pulled into shared objects from archives
+	whole_archive_flag_spec_CXX=' '
+	archive_cmds_need_lc_CXX=yes
+	# This is similar to how AIX traditionally builds it's shared libraries.
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+    # as there is no search path for DLLs.
+    hardcode_libdir_flag_spec_CXX='-L$libdir'
+    allow_undefined_flag_CXX=unsupported
+    always_export_symbols_CXX=no
+    enable_shared_with_static_runtimes_CXX=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+    else
+      ld_shlibs_CXX=no
+    fi
+  ;;
+
+  darwin* | rhapsody*)
+  if test "$GXX" = yes; then
+    archive_cmds_need_lc_CXX=no
+    case "$host_os" in
+    rhapsody* | darwin1.[012])
+      allow_undefined_flag_CXX='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            allow_undefined_flag_CXX='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+      ;;
+    esac
+    lt_int_apple_cc_single_mod=no
+    output_verbose_link_cmd='echo'
+    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+      lt_int_apple_cc_single_mod=yes
+    fi
+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    else
+      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    fi
+    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    hardcode_direct_CXX=no
+    hardcode_automatic_CXX=yes
+    hardcode_shlibpath_var_CXX=unsupported
+    whole_archive_flag_spec_CXX='-all_load $convenience'
+    link_all_deplibs_CXX=yes
+  else
+    ld_shlibs_CXX=no
+  fi
+    ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      ghcx)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  freebsd12*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    ld_shlibs_CXX=no
+    ;;
+  freebsd-elf*)
+    archive_cmds_need_lc_CXX=no
+    ;;
+  freebsd* | kfreebsd*-gnu)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    ld_shlibs_CXX=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+    hardcode_libdir_separator_CXX=:
+    export_dynamic_flag_spec_CXX='${wl}-E'
+    hardcode_direct_CXX=yes
+    hardcode_minus_L_CXX=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC)
+      # FIXME: insert proper C++ library support
+      ld_shlibs_CXX=no
+      ;;
+    aCC)
+      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      case "$host_cpu" in
+      hppa*64*)
+	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+	hardcode_libdir_separator_CXX=:
+        ;;
+      ia64*)
+	hardcode_libdir_flag_spec_CXX='-L$libdir'
+        ;;
+      *)
+	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_CXX=:
+	export_dynamic_flag_spec_CXX='${wl}-E'
+        ;;
+      esac
+    fi
+    case "$host_cpu" in
+    hppa*64*)
+      hardcode_direct_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      ;;
+    ia64*)
+      hardcode_direct_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      hardcode_minus_L_CXX=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    *)
+      hardcode_direct_CXX=yes
+      hardcode_minus_L_CXX=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      aCC)
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case "$host_cpu" in
+	    ia64*|hppa*64*)
+	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	      ;;
+	    *)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	fi
+	;;
+    esac
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC)
+	# SGI C++
+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  else
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	link_all_deplibs_CXX=yes
+	;;
+    esac
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator_CXX=:
+    ;;
+  linux*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc)
+	# Intel C++
+	with_gnu_ld=yes
+	archive_cmds_need_lc_CXX=no
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      cxx)
+	# Compaq C++
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	runpath_var=LD_RUN_PATH
+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      hardcode_libdir_flag_spec_CXX='-R$libdir'
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      cxx)
+	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
+	;;
+      RCC)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      cxx)
+	allow_undefined_flag_CXX=' -expect_unresolved \*'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  sco*)
+    archive_cmds_need_lc_CXX=no
+    case $cc_basename in
+      CC)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      lcc)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC)
+	# Sun C++ 4.2, 5.x and Centerline C++
+	no_undefined_flag_CXX=' -zdefs'
+	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	hardcode_libdir_flag_spec_CXX='-R$libdir'
+	hardcode_shlibpath_var_CXX=no
+	case $host_os in
+	  solaris2.0-5 | solaris2.0-5.*) ;;
+	  *)
+	    # The C++ compiler is used as linker so we must use $wl
+	    # flag to pass the commands to the underlying system
+	    # linker.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	esac
+	link_all_deplibs_CXX=yes
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx)
+	# Green Hills C++ Compiler
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	fi
+	;;
+    esac
+    ;;
+  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+    archive_cmds_need_lc_CXX=no
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+esac
+echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+GCC_CXX="$GXX"
+LD_CXX="$LD"
+
+
+cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$rm -f confest.$objext
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+
+lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix4* | aix5*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | kfreebsd*-gnu)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    case "$host_cpu" in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux*)
+	case $cc_basename in
+	  KCC)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  icpc)
+	    # Intel C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  cxx)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      sco*)
+	case $cc_basename in
+	  CC)
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      unixware*)
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
 
 #
-# Find out about the existence of functions
+# Check to make sure the PIC flag actually works.
 #
+if test -n "$lt_prog_compiler_pic_CXX"; then
+
+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_pic_works_CXX=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:11044: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:11048: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
+
+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:11104: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:11108: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix4* | aix5*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux*)
+    link_all_deplibs_CXX=no
+  ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+
+echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 
 #
-# F1. For mount/nfsmount.c: is inet_aton() available?
+# Do we need to explicitly link libc?
 #
-echo "
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-int main(int a, char **v){
-  if (a == -1)	/* false */
-	inet_aton((const char *) 0, (struct in_addr *) 0);
-  exit(0);
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_CXX
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+        allow_undefined_flag_CXX=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_CXX=no
+        else
+	  archive_cmds_need_lc_CXX=yes
+        fi
+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if test "$GCC" = yes; then
+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+kfreebsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.01* | freebsdelf3.01*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=yes
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" || \
+   test -n "$runpath_var CXX" || \
+   test "X$hardcode_automatic_CXX"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6
+
+if test "$hardcode_action_CXX" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
 }
-" > conftest.c
-eval $compile
-if test -s conftest; then
-	echo "#define HAVE_inet_aton" >> defines.h
-	echo "You have inet_aton()"
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
 else
-	echo "You don't have inet_aton()"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-rm -f conftest conftest.c
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
 
-#
-# F2. For mkswap.c: is fsync() available?
-#
-echo "
-#include <unistd.h>
-int main(int a, char **v){
-  if (a == -1)  /* false */
-    fsync(0);
-  exit(0);
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+   ;;
+
+  *)
+    echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); 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 shl_load
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+/* 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_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+char (*f) () = shl_load;
+#endif
+#ifdef __cplusplus
 }
-" > conftest.c
-eval $compile
-if test -s conftest; then
-	echo "#define HAVE_fsync" >> defines.h
-	echo "You have fsync()"
+#endif
+
+int
+main ()
+{
+return f != shl_load;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
 else
-	echo "You don't have fsync()"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shl_load=no
 fi
-rm -f conftest conftest.c
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
+  lt_cv_dlopen="shl_load"
+else
+  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-#
-# F3. For agetty.c: is getdomainname() available?
-#
-echo "
-#include <unistd.h>
-int main(int a, char **v){
-  char buf[1];
-  if (a == -1)  /* false */
-    getdomainname(buf, sizeof buf);
-  exit(0);
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
 }
-" > conftest.c
-eval $compile
-if test -s conftest; then
-        echo "#define HAVE_getdomainname" >> defines.h
-        echo "You have getdomainname()"
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
 else
-        echo "You don't have getdomainname()"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-rm -f conftest conftest.c
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+else
+  echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
 
-#
-# F4. For hwclock/kd.c: do we have nanosleep?
-#
-echo "
-#include <time.h>
-int main () {
-  struct timespec sleep = { 0, 1 };
-  nanosleep( &sleep, NULL );
-  exit(0);
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); 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 dlopen
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+/* 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_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+char (*f) () = dlopen;
+#endif
+#ifdef __cplusplus
 }
-" > conftest.c
-eval $compile
-if test -s conftest; then
-	echo "#define HAVE_nanosleep" >> defines.h
-	echo "You have nanosleep()"
+#endif
+
+int
+main ()
+{
+return f != dlopen;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
 else
-	echo "You don't have nanosleep()"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_dlopen=no
 fi
-rm -f conftest conftest.c
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
+  lt_cv_dlopen="dlopen"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-#
-# F5. For mkswap.c: do we have personality()?
-#
-echo "
-int main () {
-  extern int personality(unsigned long);
-  personality(0);
-  exit(0);
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
 }
-" > conftest.c
-eval $compile
-if test -s conftest; then
-	echo "#define HAVE_personality" >> defines.h
-	echo "You have personality()"
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
 else
-	echo "You don't have personality()"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-rm -f conftest conftest.c
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-#
-# F6. For agetty.c: is updwtmp() available?
-#
-echo '
-#include <string.h>
-#include <utmp.h>
-int main(int a, char **v){
-  struct  utmp ut;
-  memset (&ut, 0, sizeof(ut));
-  if (a == -1)  /* false */
-    updwtmp("/nowhere/wtmp", &ut);
-  exit(0);
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
 }
-' > conftest.c
-eval $compile
-if test -s conftest; then
-        echo "#define HAVE_updwtmp" >> defines.h
-        echo "You have updwtmp()"
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
 else
-        echo "You don't have updwtmp()"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-rm -f conftest conftest.c
+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-#
-# F7. For pg.c: are fseeko() and ftello() available?
-#
-echo '
-#include <stdio.h>
-int main(int a, char **v){
-  fseeko(stdout, 0, 0);
-  ftello(stdout);
-  exit(0);
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
 }
-' > conftest.c
-eval $compile
-if test -s conftest; then
-        echo "#define HAVE_fseeko" >> defines.h
-        echo "You have fseeko()"
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
 else
-        echo "You don't have fseeko()"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
-rm -f conftest conftest.c
 
-#
-# F8. For fsck.cramfs.c: is lchown() available?
-#
-echo '
-#include <sys/types.h>
-#include <unistd.h>
-int main(int a, char **v){
-  lchown("nowhere",0,0);
-  exit(0);
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 12473 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
 }
-' > conftest.c
-gccout=`eval $compile_with_warnings | grep "lchown is not implemented"`
-if test -s conftest -a -z "$gccout"; then
-        echo "#define HAVE_lchown" >> defines.h
-        echo "You have lchown()"
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-        echo "You don't have lchown()"
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 12571 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
 fi
-rm -f conftest conftest.c
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_CXX \
+    CC_CXX \
+    LD_CXX \
+    lt_prog_compiler_wl_CXX \
+    lt_prog_compiler_pic_CXX \
+    lt_prog_compiler_static_CXX \
+    lt_prog_compiler_no_builtin_flag_CXX \
+    export_dynamic_flag_spec_CXX \
+    thread_safe_flag_spec_CXX \
+    whole_archive_flag_spec_CXX \
+    enable_shared_with_static_runtimes_CXX \
+    old_archive_cmds_CXX \
+    old_archive_from_new_cmds_CXX \
+    predep_objects_CXX \
+    postdep_objects_CXX \
+    predeps_CXX \
+    postdeps_CXX \
+    compiler_lib_search_path_CXX \
+    archive_cmds_CXX \
+    archive_expsym_cmds_CXX \
+    postinstall_cmds_CXX \
+    postuninstall_cmds_CXX \
+    old_archive_from_expsyms_cmds_CXX \
+    allow_undefined_flag_CXX \
+    no_undefined_flag_CXX \
+    export_symbols_cmds_CXX \
+    hardcode_libdir_flag_spec_CXX \
+    hardcode_libdir_flag_spec_ld_CXX \
+    hardcode_libdir_separator_CXX \
+    hardcode_automatic_CXX \
+    module_cmds_CXX \
+    module_expsym_cmds_CXX \
+    lt_cv_prog_compiler_c_o_CXX \
+    exclude_expsyms_CXX \
+    include_expsyms_CXX; do
+
+    case $var in
+    old_archive_cmds_CXX | \
+    old_archive_from_new_cmds_CXX | \
+    archive_cmds_CXX | \
+    archive_expsym_cmds_CXX | \
+    module_cmds_CXX | \
+    module_expsym_cmds_CXX | \
+    old_archive_from_expsyms_cmds_CXX | \
+    export_symbols_cmds_CXX | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_CXX
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_CXX
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_CXX
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_CXX
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_CXX
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_CXX"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  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
+
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+
+
+archive_cmds_need_lc_F77=no
+allow_undefined_flag_F77=
+always_export_symbols_F77=no
+archive_expsym_cmds_F77=
+export_dynamic_flag_spec_F77=
+hardcode_direct_F77=no
+hardcode_libdir_flag_spec_F77=
+hardcode_libdir_flag_spec_ld_F77=
+hardcode_libdir_separator_F77=
+hardcode_minus_L_F77=no
+hardcode_automatic_F77=no
+module_cmds_F77=
+module_expsym_cmds_F77=
+link_all_deplibs_F77=unknown
+old_archive_cmds_F77=$old_archive_cmds
+no_undefined_flag_F77=
+whole_archive_flag_spec_F77=
+enable_shared_with_static_runtimes_F77=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+objext_F77=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="      program t\n      end\n"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+compiler_F77=$CC
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+
+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6
+
+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix4* | aix5*)
+  test "$enable_shared" = yes && enable_static=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6
+
+echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6
+
+test "$ld_shlibs_F77" = no && can_build_shared=no
+
+GCC_F77="$G77"
+LD_F77="$LD"
+
+lt_prog_compiler_wl_F77=
+lt_prog_compiler_pic_F77=
+lt_prog_compiler_static_F77=
+
+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl_F77='-Wl,'
+    lt_prog_compiler_static_F77='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_F77='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_F77='-fno-common'
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_F77=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_F77=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_F77='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      lt_prog_compiler_pic_F77='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_F77='-Bstatic'
+      else
+	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_F77='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    linux*)
+      case $CC in
+      icc* | ecc*)
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-KPIC'
+	lt_prog_compiler_static_F77='-static'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl_F77='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static_F77='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_prog_compiler_pic_F77='-Kpic'
+      lt_prog_compiler_static_F77='-dn'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl_F77='-Qoption ld '
+      lt_prog_compiler_pic_F77='-PIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic_F77='-Kconform_pic'
+	lt_prog_compiler_static_F77='-Bstatic'
+      fi
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic_F77='-pic'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared_F77=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
 
 #
-# F9. For cfdisk.c: is rpmatch() available?
+# Check to make sure the PIC flag actually works.
 #
-echo '
-#define _SVID_SOURCE
-#include <stdlib.h>
-int main(int a, char **v){
-  rpmatch("y");
-  exit(0);
-}
-' > conftest.c
-eval $compile
-if test -s conftest; then
-        echo "#define HAVE_rpmatch" >> defines.h
-        echo "You have rpmatch()"
-else
-        echo "You don't have rpmatch()"
-fi
-rm -f conftest conftest.c
-
-#
-# 2. How is [n]curses installed?
-#
-test_curses_h=0
-have_ncurses=1
-if ! ./testincl "term.h"; then
-	have_ncurses=0
-elif ./testincl -q "ncurses/curses.h"; then
-	echo "HAVE_NCURSES=yes" >> make_include
-	echo "CURSESFLAGS=-I/usr/include/ncurses -DNCH=0" >> make_include
-	echo "You have ncurses. Using <ncurses/curses.h>."
-elif ./testincl -q "ncurses.h"; then
-	echo "HAVE_NCURSES=yes" >> make_include
-	echo "CURSESFLAGS=-DNCH=1" >> make_include
-	echo "You have ncurses. Using <ncurses.h>."
-elif [ -f /usr/local/include/ncurses.h ]; then
-	echo "HAVE_NCURSES=yes" >> make_include
-	echo "CURSESFLAGS=-I/usr/local/include -DNCH=1" >> make_include
-	echo "You have ncurses. Using /usr/local/include/ncurses.h."
-elif ./testincl -q "curses.h"; then
-	test_curses_h=1
-else
-	have_ncurses=0
-fi
-#
-# If we found a curses.h, test whether it is ncurses
-# (It should define __NCURSES_H and NCURSES_VERSION and NCURSES_CONST ...)
-#
-if [ $test_curses_h = 1 ]; then
-  echo "
-  #include <curses.h>
-  int main(){ char *c = NCURSES_VERSION; exit(0); }
-  " > conftest.c
-  eval $compile
-  if test -s conftest; then
-	echo "HAVE_NCURSES=yes" >> make_include
-	echo "CURSESFLAGS=-DNCH=0" >> make_include
-	echo "You have ncurses. Using <curses.h>."
-  else
-	have_ncurses=0
-  fi
-  rm -f conftest conftest.c
-fi
-
-if [ $have_ncurses = 0 ]; then
-	echo "HAVE_NCURSES=no" >> make_include
-	echo "You don't have ncurses - I will not make ul and setterm."
-else
-	echo "LIBCURSES=-lncurses" >> make_include
-	echo "#define HAVE_ncurses" >> defines.h
-fi
-
-#
-# 3. Some systems have /usr/lib/termcap.so -> /usr/lib/termcap.so.2
-# where however the latter file does not exist. When termcap does
-# not exist, we can try to compile more with curses instead.
-#
-echo '
-#include <termcap.h>
-int main(){ exit(0); tgetnum("li"); }
-' > conftest.c
-LIBS=-ltermcap
-eval $compile
-LIBS=
-if test -s conftest; then
-	echo "#define HAVE_termcap" >> defines.h
-	echo "HAVE_TERMCAP=yes" >> make_include
-	echo "LIBTERMCAP=-ltermcap" >> make_include
-	echo "You have termcap"
-else
-	echo "HAVE_TERMCAP=no" >> make_include
-	if [ $have_ncurses = 0 ]; then
-		echo "You don't have termcap - I will not make more."
+if test -n "$lt_prog_compiler_pic_F77"; then
+
+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_pic_works_F77=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_F77"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13398: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:13402: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_prog_compiler_pic_works_F77=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
+
+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+    case $lt_prog_compiler_pic_F77 in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+     esac
+else
+    lt_prog_compiler_pic_F77=
+     lt_prog_compiler_can_build_shared_F77=no
+fi
+
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_F77=
+    ;;
+  *)
+    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+    ;;
+esac
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_c_o_F77=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13458: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:13462: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       lt_cv_prog_compiler_c_o_F77=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+  runpath_var=
+  allow_undefined_flag_F77=
+  enable_shared_with_static_runtimes_F77=no
+  archive_cmds_F77=
+  archive_expsym_cmds_F77=
+  old_archive_From_new_cmds_F77=
+  old_archive_from_expsyms_cmds_F77=
+  export_dynamic_flag_spec_F77=
+  whole_archive_flag_spec_F77=
+  thread_safe_flag_spec_F77=
+  hardcode_libdir_flag_spec_F77=
+  hardcode_libdir_flag_spec_ld_F77=
+  hardcode_libdir_separator_F77=
+  hardcode_direct_F77=no
+  hardcode_minus_L_F77=no
+  hardcode_shlibpath_var_F77=unsupported
+  link_all_deplibs_F77=unknown
+  hardcode_automatic_F77=no
+  module_cmds_F77=
+  module_expsym_cmds_F77=
+  always_export_symbols_F77=no
+  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms_F77=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs_F77=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs_F77=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs_F77=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag_F77=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      allow_undefined_flag_F77=unsupported
+      always_export_symbols_F77=no
+      enable_shared_with_static_runtimes_F77=yes
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
 	else
-		echo "You don't have termcap"
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs_F77=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
+
+    sunos4*)
+      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+  linux*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_F77="$tmp_archive_cmds"
+      supports_anon_versioning=no
+      case `$LD -v 2>/dev/null` in
+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=yes ;;
+      esac
+      if test $supports_anon_versioning = yes; then
+        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+$echo "local: *; };" >> $output_objdir/$libname.ver~
+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+      else
+        archive_expsym_cmds_F77="$tmp_archive_cmds"
+      fi
+      link_all_deplibs_F77=no
+    else
+      ld_shlibs_F77=no
+    fi
+    ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs_F77" = yes; then
+      runpath_var=LD_RUN_PATH
+      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_F77=
+      fi
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag_F77=unsupported
+      always_export_symbols_F77=yes
+      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L_F77=yes
+      if test "$GCC" = yes && test -z "$link_static_flag"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct_F77=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds_F77=''
+      hardcode_direct_F77=yes
+      hardcode_libdir_separator_F77=':'
+      link_all_deplibs_F77=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.012|aix4.012.*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  hardcode_direct_F77=yes
+	  else
+  	  # We have old collect2
+  	  hardcode_direct_F77=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L_F77=yes
+  	  hardcode_libdir_flag_spec_F77='-L$libdir'
+  	  hardcode_libdir_separator_F77=
+	  fi
+	esac
+	shared_flag='-shared'
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+  	if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+  	fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_F77=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag_F77='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+      program main
+
+      end
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f conftest conftest.c
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-#
-# 4. Do we need -lcrypt?
-#
-echo '
-#define _XOPEN_SOURCE
-#include <unistd.h>
-int main(){ char *c = crypt("abc","pw"); exit(0); }
-' > conftest.c
-eval $compile
-if test -s conftest; then
-	echo "NEED_LIBCRYPT=no" >> make_include
-	echo "You don't need -lcrypt"
+       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag_F77="-z nodefs"
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+      program main
+
+      end
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
 else
-	echo "NEED_LIBCRYPT=yes" >> make_include
-	echo "You need -lcrypt"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag_F77=' ${wl}-bernotok'
+	  allow_undefined_flag_F77=' ${wl}-berok'
+	  # -bexpall does not export symbols beginning with underscore (_)
+	  always_export_symbols_F77=yes
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec_F77=' '
+	  archive_cmds_need_lc_F77=yes
+	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs_F77=no
+      ;;
+
+    bsdi4*)
+      export_dynamic_flag_spec_F77=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec_F77=' '
+      allow_undefined_flag_F77=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds_F77='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes_F77=yes
+      ;;
+
+    darwin* | rhapsody*)
+    if test "$GXX" = yes ; then
+      archive_cmds_need_lc_F77=no
+      case "$host_os" in
+      rhapsody* | darwin1.[012])
+	allow_undefined_flag_F77='-undefined suppress'
+	;;
+      *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            allow_undefined_flag_F77='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+	;;
+      esac
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        else
+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        fi
+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      hardcode_direct_F77=no
+      hardcode_automatic_F77=yes
+      hardcode_shlibpath_var_F77=unsupported
+      whole_archive_flag_spec_F77='-all_load $convenience'
+      link_all_deplibs_F77=yes
+    else
+      ld_shlibs_F77=no
+    fi
+      ;;
+
+    dgux*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs_F77=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_F77=yes
+      hardcode_minus_L_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | kfreebsd*-gnu)
+      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      hardcode_direct_F77=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L_F77=yes
+      export_dynamic_flag_spec_F77='${wl}-E'
+      ;;
+
+    hpux10* | hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	*)
+	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*)
+	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+	  hardcode_libdir_separator_F77=:
+	  hardcode_direct_F77=no
+	  hardcode_shlibpath_var_F77=no
+	  ;;
+	ia64*)
+	  hardcode_libdir_flag_spec_F77='-L$libdir'
+	  hardcode_direct_F77=no
+	  hardcode_shlibpath_var_F77=no
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_F77=yes
+	  ;;
+	*)
+	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_F77=:
+	  hardcode_direct_F77=yes
+	  export_dynamic_flag_spec_F77='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_F77=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      link_all_deplibs_F77=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    newsos6)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_F77=yes
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    openbsd*)
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_F77='${wl}-E'
+      else
+       case $host_os in
+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   hardcode_libdir_flag_spec_F77='-R$libdir'
+	   ;;
+	 *)
+	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+      allow_undefined_flag_F77=unsupported
+      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag_F77=' -expect_unresolved \*'
+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag_F77=' -expect_unresolved \*'
+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+      fi
+      hardcode_libdir_separator_F77=:
+      ;;
+
+    sco3.2v5*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_F77=no
+      export_dynamic_flag_spec_F77='${wl}-Bexport'
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ;;
+
+    solaris*)
+      no_undefined_flag_F77=' -z text'
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_shlibpath_var_F77=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+      esac
+      link_all_deplibs_F77=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_direct_F77=yes
+      hardcode_minus_L_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_F77=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds_F77='$CC -r -o $output$reload_objs'
+	  hardcode_direct_F77=no
+        ;;
+	motorola)
+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_F77=no
+      export_dynamic_flag_spec_F77='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var_F77=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs_F77=yes
+      fi
+      ;;
+
+    sysv4.2uw2*)
+      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_F77=yes
+      hardcode_minus_L_F77=no
+      hardcode_shlibpath_var_F77=no
+      hardcode_runpath_var=yes
+      runpath_var=LD_RUN_PATH
+      ;;
+
+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      no_undefined_flag_F77='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    sysv5*)
+      no_undefined_flag_F77=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      hardcode_libdir_flag_spec_F77=
+      hardcode_shlibpath_var_F77=no
+      runpath_var='LD_RUN_PATH'
+      ;;
+
+    uts4*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_shlibpath_var_F77=no
+      ;;
+
+    *)
+      ld_shlibs_F77=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+echo "${ECHO_T}$ld_shlibs_F77" >&6
+test "$ld_shlibs_F77" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
-rm -f conftest conftest.c
 
 #
-# 5. Does static compilation work?
+# Do we need to explicitly link libc?
 #
-echo "
-int main(){ return 0; }
-" > conftest.c
-eval $static_compile
-if test -s conftest; then
-	: OK, nothing special
+case "x$archive_cmds_need_lc_F77" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_F77=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_F77 in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_F77
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
+        allow_undefined_flag_F77=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_F77=no
+        else
+	  archive_cmds_need_lc_F77=yes
+        fi
+        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if test "$GCC" = yes; then
+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+kfreebsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.01* | freebsdelf3.01*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=yes
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_F77=
+if test -n "$hardcode_libdir_flag_spec_F77" || \
+   test -n "$runpath_var F77" || \
+   test "X$hardcode_automatic_F77"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_F77" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+     test "$hardcode_minus_L_F77" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_F77=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_F77=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_F77=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6
+
+if test "$hardcode_action_F77" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
+
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_F77 \
+    CC_F77 \
+    LD_F77 \
+    lt_prog_compiler_wl_F77 \
+    lt_prog_compiler_pic_F77 \
+    lt_prog_compiler_static_F77 \
+    lt_prog_compiler_no_builtin_flag_F77 \
+    export_dynamic_flag_spec_F77 \
+    thread_safe_flag_spec_F77 \
+    whole_archive_flag_spec_F77 \
+    enable_shared_with_static_runtimes_F77 \
+    old_archive_cmds_F77 \
+    old_archive_from_new_cmds_F77 \
+    predep_objects_F77 \
+    postdep_objects_F77 \
+    predeps_F77 \
+    postdeps_F77 \
+    compiler_lib_search_path_F77 \
+    archive_cmds_F77 \
+    archive_expsym_cmds_F77 \
+    postinstall_cmds_F77 \
+    postuninstall_cmds_F77 \
+    old_archive_from_expsyms_cmds_F77 \
+    allow_undefined_flag_F77 \
+    no_undefined_flag_F77 \
+    export_symbols_cmds_F77 \
+    hardcode_libdir_flag_spec_F77 \
+    hardcode_libdir_flag_spec_ld_F77 \
+    hardcode_libdir_separator_F77 \
+    hardcode_automatic_F77 \
+    module_cmds_F77 \
+    module_expsym_cmds_F77 \
+    lt_cv_prog_compiler_c_o_F77 \
+    exclude_expsyms_F77 \
+    include_expsyms_F77; do
+
+    case $var in
+    old_archive_cmds_F77 | \
+    old_archive_from_new_cmds_F77 | \
+    archive_cmds_F77 | \
+    archive_expsym_cmds_F77 | \
+    module_cmds_F77 | \
+    module_expsym_cmds_F77 | \
+    old_archive_from_expsyms_cmds_F77 | \
+    export_symbols_cmds_F77 | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_F77
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler_F77
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_F77
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_F77
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_F77
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_F77
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_F77
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_F77
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_F77
+archive_expsym_cmds=$lt_archive_expsym_cmds_F77
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_F77
+module_expsym_cmds=$lt_module_expsym_cmds_F77
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_F77
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_F77
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_F77
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_F77
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_F77
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_F77
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_F77
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_F77
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_F77
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_F77
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_F77
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_F77"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_F77
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_F77
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_F77
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_F77
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
 else
-	echo "CAN_DO_STATIC=no" >> make_include
-	echo "Strange... Static compilation fails here."
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
-rm -f conftest.c conftest
+
+
+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
+
+CC="$lt_save_CC"
+
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+
+
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+objext_GCJ=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}\n"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+compiler_GCJ=$CC
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+archive_cmds_need_lc_GCJ=no
+
+
+lt_prog_compiler_no_builtin_flag_GCJ=
+
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+
+
+echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15503: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:15507: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+lt_prog_compiler_wl_GCJ=
+lt_prog_compiler_pic_GCJ=
+lt_prog_compiler_static_GCJ=
+
+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl_GCJ='-Wl,'
+    lt_prog_compiler_static_GCJ='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_GCJ='-fno-common'
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_GCJ=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_GCJ=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_GCJ='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      lt_prog_compiler_pic_GCJ='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      else
+	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case "$host_cpu" in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_GCJ='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    linux*)
+      case $CC in
+      icc* | ecc*)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	lt_prog_compiler_pic_GCJ='-KPIC'
+	lt_prog_compiler_static_GCJ='-static'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl_GCJ='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static_GCJ='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_prog_compiler_pic_GCJ='-Kpic'
+      lt_prog_compiler_static_GCJ='-dn'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl_GCJ='-Qoption ld '
+      lt_prog_compiler_pic_GCJ='-PIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic_GCJ='-Kconform_pic'
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      fi
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic_GCJ='-pic'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared_GCJ=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
 
 #
-# 6. For lib/nls.h: do we have <libintl.h> and gettext() ?
+# Check to make sure the PIC flag actually works.
 #
-echo '
-#include <libintl.h>
-int main(int a, char **v){
-  if (a == -1)  /* false */
-        gettext("There is no gettext man page\n");
-  exit(0);
+if test -n "$lt_prog_compiler_pic_GCJ"; then
+
+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_pic_works_GCJ=no
+  ac_outfile=conftest.$ac_objext
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15736: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:15740: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
+       lt_prog_compiler_pic_works_GCJ=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
+
+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+    case $lt_prog_compiler_pic_GCJ in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+     esac
+else
+    lt_prog_compiler_pic_GCJ=
+     lt_prog_compiler_can_build_shared_GCJ=no
+fi
+
+fi
+case "$host_os" in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_GCJ=
+    ;;
+  *)
+    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
+    ;;
+esac
+
+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_prog_compiler_c_o_GCJ=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15796: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:15800: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test ! -s out/conftest.err; then
+       lt_cv_prog_compiler_c_o_GCJ=yes
+     fi
+   fi
+   chmod u+w .
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+  runpath_var=
+  allow_undefined_flag_GCJ=
+  enable_shared_with_static_runtimes_GCJ=no
+  archive_cmds_GCJ=
+  archive_expsym_cmds_GCJ=
+  old_archive_From_new_cmds_GCJ=
+  old_archive_from_expsyms_cmds_GCJ=
+  export_dynamic_flag_spec_GCJ=
+  whole_archive_flag_spec_GCJ=
+  thread_safe_flag_spec_GCJ=
+  hardcode_libdir_flag_spec_GCJ=
+  hardcode_libdir_flag_spec_ld_GCJ=
+  hardcode_libdir_separator_GCJ=
+  hardcode_direct_GCJ=no
+  hardcode_minus_L_GCJ=no
+  hardcode_shlibpath_var_GCJ=unsupported
+  link_all_deplibs_GCJ=unknown
+  hardcode_automatic_GCJ=no
+  module_cmds_GCJ=
+  module_expsym_cmds_GCJ=
+  always_export_symbols_GCJ=no
+  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms_GCJ=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs_GCJ=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs_GCJ=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs_GCJ=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag_GCJ=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      allow_undefined_flag_GCJ=unsupported
+      always_export_symbols_GCJ=no
+      enable_shared_with_static_runtimes_GCJ=yes
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs_GCJ=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    sunos4*)
+      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+  linux*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_GCJ="$tmp_archive_cmds"
+      supports_anon_versioning=no
+      case `$LD -v 2>/dev/null` in
+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=yes ;;
+      esac
+      if test $supports_anon_versioning = yes; then
+        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+$echo "local: *; };" >> $output_objdir/$libname.ver~
+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+      else
+        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
+      fi
+      link_all_deplibs_GCJ=no
+    else
+      ld_shlibs_GCJ=no
+    fi
+    ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs_GCJ" = yes; then
+      runpath_var=LD_RUN_PATH
+      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_GCJ=
+      fi
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag_GCJ=unsupported
+      always_export_symbols_GCJ=yes
+      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L_GCJ=yes
+      if test "$GCC" = yes && test -z "$link_static_flag"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct_GCJ=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds_GCJ=''
+      hardcode_direct_GCJ=yes
+      hardcode_libdir_separator_GCJ=':'
+      link_all_deplibs_GCJ=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.012|aix4.012.*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  hardcode_direct_GCJ=yes
+	  else
+  	  # We have old collect2
+  	  hardcode_direct_GCJ=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L_GCJ=yes
+  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+  	  hardcode_libdir_separator_GCJ=
+	  fi
+	esac
+	shared_flag='-shared'
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+  	if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+  	fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_GCJ=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag_GCJ='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
 }
-' > conftest.c
-eval $compile
-if test -s conftest; then
-        echo '#define HAVE_libintl_h' >> defines.h
-        echo "You have <libintl.h> and gettext()"
-        echo '#define MAY_ENABLE_NLS' >> defines.h
-        MAY_ENABLE_NLS=yes
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
 else
-        echo "You don't have native language support"
-        MAY_ENABLE_NLS=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f conftest conftest.c
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
+       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag_GCJ="-z nodefs"
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag_GCJ=' ${wl}-bernotok'
+	  allow_undefined_flag_GCJ=' ${wl}-berok'
+	  # -bexpall does not export symbols beginning with underscore (_)
+	  always_export_symbols_GCJ=yes
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec_GCJ=' '
+	  archive_cmds_need_lc_GCJ=yes
+	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs_GCJ=no
+      ;;
+
+    bsdi4*)
+      export_dynamic_flag_spec_GCJ=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec_GCJ=' '
+      allow_undefined_flag_GCJ=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds_GCJ='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes_GCJ=yes
+      ;;
+
+    darwin* | rhapsody*)
+    if test "$GXX" = yes ; then
+      archive_cmds_need_lc_GCJ=no
+      case "$host_os" in
+      rhapsody* | darwin1.[012])
+	allow_undefined_flag_GCJ='-undefined suppress'
+	;;
+      *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+	;;
+      esac
+    	lt_int_apple_cc_single_mod=no
+    	output_verbose_link_cmd='echo'
+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+    	  lt_int_apple_cc_single_mod=yes
+    	fi
+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+    	else
+        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      fi
+      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        else
+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        fi
+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      hardcode_direct_GCJ=no
+      hardcode_automatic_GCJ=yes
+      hardcode_shlibpath_var_GCJ=unsupported
+      whole_archive_flag_spec_GCJ='-all_load $convenience'
+      link_all_deplibs_GCJ=yes
+    else
+      ld_shlibs_GCJ=no
+    fi
+      ;;
+
+    dgux*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs_GCJ=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_GCJ=yes
+      hardcode_minus_L_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | kfreebsd*-gnu)
+      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      hardcode_direct_GCJ=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L_GCJ=yes
+      export_dynamic_flag_spec_GCJ='${wl}-E'
+      ;;
+
+    hpux10* | hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case "$host_cpu" in
+	hppa*64*|ia64*)
+	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	*)
+	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	case "$host_cpu" in
+	hppa*64*)
+	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+	  hardcode_libdir_separator_GCJ=:
+	  hardcode_direct_GCJ=no
+	  hardcode_shlibpath_var_GCJ=no
+	  ;;
+	ia64*)
+	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+	  hardcode_direct_GCJ=no
+	  hardcode_shlibpath_var_GCJ=no
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_GCJ=yes
+	  ;;
+	*)
+	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_GCJ=:
+	  hardcode_direct_GCJ=yes
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_GCJ=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      link_all_deplibs_GCJ=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    newsos6)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_GCJ=yes
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    openbsd*)
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_GCJ='${wl}-E'
+      else
+       case $host_os in
+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	   ;;
+	 *)
+	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+      allow_undefined_flag_GCJ=unsupported
+      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+      fi
+      hardcode_libdir_separator_GCJ=:
+      ;;
+
+    sco3.2v5*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_GCJ=no
+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ;;
+
+    solaris*)
+      no_undefined_flag_GCJ=' -z text'
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+      esac
+      link_all_deplibs_GCJ=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_minus_L_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_GCJ=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
+	  hardcode_direct_GCJ=no
+        ;;
+	motorola)
+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_GCJ=no
+      export_dynamic_flag_spec_GCJ='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var_GCJ=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs_GCJ=yes
+      fi
+      ;;
+
+    sysv4.2uw2*)
+      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_GCJ=yes
+      hardcode_minus_L_GCJ=no
+      hardcode_shlibpath_var_GCJ=no
+      hardcode_runpath_var=yes
+      runpath_var=LD_RUN_PATH
+      ;;
+
+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      no_undefined_flag_GCJ='${wl}-z ${wl}text'
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    sysv5*)
+      no_undefined_flag_GCJ=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      hardcode_libdir_flag_spec_GCJ=
+      hardcode_shlibpath_var_GCJ=no
+      runpath_var='LD_RUN_PATH'
+      ;;
+
+    uts4*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    *)
+      ld_shlibs_GCJ=no
+      ;;
+    esac
+  fi
+
+echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+test "$ld_shlibs_GCJ" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 
 #
-# 7. Does xgettext exist and take the option --foreign-user?
-#
-# We use the bash builtin "type" here.
-# I don't see an easy way to avoid it.
-# Many Linux systems do not have "which". Maybe "env" can be used.
-# Writing /usr/bin/xgettext is no good: one may have xgettext elsewhere.
+# Do we need to explicitly link libc?
 #
-if (test $MAY_ENABLE_NLS = yes && type xgettext > /dev/null 2>&1); then
-	msg=`xgettext --foreign-user 2>&1 | grep unrecognized`
-	if test -n "$msg"; then
-		echo "FOREIGN = " >> make_include
+case "x$archive_cmds_need_lc_GCJ" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_GCJ=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_GCJ in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_GCJ
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
+        allow_undefined_flag_GCJ=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_GCJ=no
+        else
+	  archive_cmds_need_lc_GCJ=yes
+        fi
+        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+  if test "$GCC" = yes; then
+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+kfreebsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.01* | freebsdelf3.01*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  *) # from 3.2 on
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case "$host_cpu" in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=yes
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+   test -n "$runpath_var GCJ" || \
+   test "X$hardcode_automatic_GCJ"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_GCJ" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+     test "$hardcode_minus_L_GCJ" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_GCJ=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_GCJ=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_GCJ=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6
+
+if test "$hardcode_action_GCJ" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+   ;;
+
+  *)
+    echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); 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 shl_load
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+/* 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_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+char (*f) () = shl_load;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != shl_load;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
+  lt_cv_dlopen="shl_load"
+else
+  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+else
+  echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); 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 dlopen
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+/* 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_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+char (*f) () = dlopen;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != dlopen;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
+  lt_cv_dlopen="dlopen"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main ()
+{
+dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_dld_link=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+if test $ac_cv_lib_dld_dld_link = yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 17984 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 18082 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_GCJ \
+    CC_GCJ \
+    LD_GCJ \
+    lt_prog_compiler_wl_GCJ \
+    lt_prog_compiler_pic_GCJ \
+    lt_prog_compiler_static_GCJ \
+    lt_prog_compiler_no_builtin_flag_GCJ \
+    export_dynamic_flag_spec_GCJ \
+    thread_safe_flag_spec_GCJ \
+    whole_archive_flag_spec_GCJ \
+    enable_shared_with_static_runtimes_GCJ \
+    old_archive_cmds_GCJ \
+    old_archive_from_new_cmds_GCJ \
+    predep_objects_GCJ \
+    postdep_objects_GCJ \
+    predeps_GCJ \
+    postdeps_GCJ \
+    compiler_lib_search_path_GCJ \
+    archive_cmds_GCJ \
+    archive_expsym_cmds_GCJ \
+    postinstall_cmds_GCJ \
+    postuninstall_cmds_GCJ \
+    old_archive_from_expsyms_cmds_GCJ \
+    allow_undefined_flag_GCJ \
+    no_undefined_flag_GCJ \
+    export_symbols_cmds_GCJ \
+    hardcode_libdir_flag_spec_GCJ \
+    hardcode_libdir_flag_spec_ld_GCJ \
+    hardcode_libdir_separator_GCJ \
+    hardcode_automatic_GCJ \
+    module_cmds_GCJ \
+    module_expsym_cmds_GCJ \
+    lt_cv_prog_compiler_c_o_GCJ \
+    exclude_expsyms_GCJ \
+    include_expsyms_GCJ; do
+
+    case $var in
+    old_archive_cmds_GCJ | \
+    old_archive_from_new_cmds_GCJ | \
+    archive_cmds_GCJ | \
+    archive_expsym_cmds_GCJ | \
+    module_cmds_GCJ | \
+    module_expsym_cmds_GCJ | \
+    old_archive_from_expsyms_cmds_GCJ | \
+    export_symbols_cmds_GCJ | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_GCJ
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler_GCJ
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_GCJ
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_GCJ
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_GCJ
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_GCJ
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_GCJ
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_GCJ
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_GCJ
+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_GCJ
+module_expsym_cmds=$lt_module_expsym_cmds_GCJ
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_GCJ
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_GCJ
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_GCJ
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_GCJ
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_GCJ
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_GCJ
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_GCJ
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_GCJ
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_GCJ
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_GCJ
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_GCJ
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_GCJ"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_GCJ
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_GCJ
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_GCJ
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_GCJ
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  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
+
+CC="$lt_save_CC"
+
 	else
-		echo "FOREIGN = --foreign-user" >> make_include
+	  tagname=""
 	fi
-	echo "HAVE_XGETTEXT=yes" >> make_include
+	;;
+
+      RC)
+
+
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+objext_RC=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+compiler_RC=$CC
+lt_cv_prog_compiler_c_o_RC=yes
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_RC \
+    CC_RC \
+    LD_RC \
+    lt_prog_compiler_wl_RC \
+    lt_prog_compiler_pic_RC \
+    lt_prog_compiler_static_RC \
+    lt_prog_compiler_no_builtin_flag_RC \
+    export_dynamic_flag_spec_RC \
+    thread_safe_flag_spec_RC \
+    whole_archive_flag_spec_RC \
+    enable_shared_with_static_runtimes_RC \
+    old_archive_cmds_RC \
+    old_archive_from_new_cmds_RC \
+    predep_objects_RC \
+    postdep_objects_RC \
+    predeps_RC \
+    postdeps_RC \
+    compiler_lib_search_path_RC \
+    archive_cmds_RC \
+    archive_expsym_cmds_RC \
+    postinstall_cmds_RC \
+    postuninstall_cmds_RC \
+    old_archive_from_expsyms_cmds_RC \
+    allow_undefined_flag_RC \
+    no_undefined_flag_RC \
+    export_symbols_cmds_RC \
+    hardcode_libdir_flag_spec_RC \
+    hardcode_libdir_flag_spec_ld_RC \
+    hardcode_libdir_separator_RC \
+    hardcode_automatic_RC \
+    module_cmds_RC \
+    module_expsym_cmds_RC \
+    lt_cv_prog_compiler_c_o_RC \
+    exclude_expsyms_RC \
+    include_expsyms_RC; do
+
+    case $var in
+    old_archive_cmds_RC | \
+    old_archive_from_new_cmds_RC | \
+    archive_cmds_RC | \
+    archive_expsym_cmds_RC | \
+    module_cmds_RC | \
+    module_expsym_cmds_RC | \
+    old_archive_from_expsyms_cmds_RC | \
+    export_symbols_cmds_RC | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_RC
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# A language-specific compiler.
+CC=$lt_compiler_RC
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_RC
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_RC
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_RC
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_RC
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_RC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_RC
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_RC
+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_RC
+module_expsym_cmds=$lt_module_expsym_cmds_RC
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_RC
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_RC
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_RC
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_RC
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_RC
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_RC
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_RC
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_RC
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_RC
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_RC
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_RC
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_RC"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_RC
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_RC
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_RC
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_RC
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
 else
-	echo "HAVE_XGETTEXT=no" >> make_include
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
-#
-# 8. For err.c: do we have __progname?
-# [make sure gcc -O does not optimize the access away]
-#
-echo "
+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
+
+CC="$lt_save_CC"
+
+	;;
+
+      *)
+	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+# Prevent multiple expansion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PERL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+
+if test -n "$PERL"; then
+  echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+# Check whether --enable-largefile or --disable-largefile was given.
+if test "${enable_largefile+set}" = set; then
+  enableval="$enable_largefile"
+
+fi;
+if test "$enable_largefile" != no; then
+
+  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_largefile_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+     	 CC="$CC -n32"
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_largefile_CC=' -n32'; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_file_offset_bits=no
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_file_offset_bits=64; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+if test "$ac_cv_sys_file_offset_bits" != no; then
+
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+
+fi
+rm -f conftest*
+  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_large_files+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_large_files=no
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_large_files=1; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+if test "$ac_cv_sys_large_files" != no; then
+
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+
+fi
+rm -f conftest*
+fi
+
+
+
+for ac_header in scsi/scsi.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in linux/compiler.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in linux/blkpg.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#ifdef HAVE_LINUX_COMPILER_H
+#include <linux/compiler.h>
+#endif
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in langinfo.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in sys/user.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in asm/page.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in rpcsvc/nfs_prot.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in sys/io.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in pty.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+for ac_header in linux/raw.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+if test x$ac_cv_header_linux_raw_h = xyes; then
+  HAVE_RAW_TRUE=
+  HAVE_RAW_FALSE='#'
+else
+  HAVE_RAW_TRUE='#'
+  HAVE_RAW_FALSE=
+fi
+
+
+
+for ac_header in security/pam_misc.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+if test x$ac_cv_header_security_pam_misc_h = xyes; then
+  HAVE_PAM_TRUE=
+  HAVE_PAM_FALSE='#'
+else
+  HAVE_PAM_TRUE='#'
+  HAVE_PAM_FALSE=
+fi
+
+
+
+
+
+for ac_func in inet_aton
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* 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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+for ac_func in fsync
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* 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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+for ac_func in getdomainname
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* 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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+for ac_func in nanosleep
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* 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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+for ac_func in personality
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* 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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+for ac_func in updwtmp
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* 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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_largefile_source+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_largefile_source=no
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <stdio.h>
-extern char *__progname;
-int main(){ printf(__progname); exit(0); }
-" > conftest.c
-eval $compile
-if test -s conftest; then
-        echo "#define HAVE_progname" >> defines.h
-        echo "You have __progname"
+int
+main ()
+{
+return !fseeko;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
 else
-        echo "You don't have __progname"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f conftest conftest.c
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _LARGEFILE_SOURCE 1
+#include <stdio.h>
+int
+main ()
+{
+return !fseeko;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_largefile_source=1; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-#
-# 9. For script.c: do we have <pty.h> and openpty()?
-#
-echo "
-#include <pty.h>
-int main(){ exit(0); openpty(0, 0, 0, 0, 0); }
-" > conftest.c
-LIBS=-lutil
-eval $compile
-LIBS=
-if test -s conftest; then
-	echo "HAVE_OPENPTY=yes" >> make_include
-	echo "#define HAVE_openpty" >> defines.h
-	echo "You have <pty.h> and openpty()"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+if test "$ac_cv_sys_largefile_source" != no; then
+
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+
+fi
+rm -f conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+echo "$as_me:$LINENO: checking for fseeko" >&5
+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+if test "${ac_cv_func_fseeko+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-	echo "You don't have <pty.h> and openpty()"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+return fseeko && fseeko (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_fseeko=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_fseeko=no
 fi
-rm -f conftest conftest.c
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+if test $ac_cv_func_fseeko = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FSEEKO 1
+_ACEOF
+
+fi
+
+
+for ac_func in lchown
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* 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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+for ac_func in rpmatch
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* 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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+echo "$as_me:$LINENO: checking for uuid_is_null in -luuid" >&5
+echo $ECHO_N "checking for uuid_is_null in -luuid... $ECHO_C" >&6
+if test "${ac_cv_lib_uuid_uuid_is_null+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-luuid  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char uuid_is_null ();
+int
+main ()
+{
+uuid_is_null ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_uuid_uuid_is_null=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_uuid_uuid_is_null=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_is_null" >&5
+echo "${ECHO_T}$ac_cv_lib_uuid_uuid_is_null" >&6
+if test $ac_cv_lib_uuid_uuid_is_null = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUUID 1
+_ACEOF
+
+  LIBS="-luuid $LIBS"
+
+fi
+
+
+
+if test x$ac_cv_lib_uuid_uuid_is_null = xyes; then
+  HAVE_UUID_TRUE=
+  HAVE_UUID_FALSE='#'
+else
+  HAVE_UUID_TRUE='#'
+  HAVE_UUID_FALSE=
+fi
+
+
+
+echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
+echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+if test "${ac_cv_lib_util_openpty+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lutil  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char openpty ();
+int
+main ()
+{
+openpty ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_util_openpty=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_util_openpty=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_util_openpty" >&5
+echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+if test $ac_cv_lib_util_openpty = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUTIL 1
+_ACEOF
+
+  LIBS="-lutil $LIBS"
+
+fi
+
+
+
+if test x$ac_cv_lib_util_openpty = xyes; then
+  HAVE_LIBUTIL_TRUE=
+  HAVE_LIBUTIL_FALSE='#'
+else
+  HAVE_LIBUTIL_TRUE='#'
+  HAVE_LIBUTIL_FALSE=
+fi
+
+
+
+echo "$as_me:$LINENO: checking for tgetnum in -ltermcap" >&5
+echo $ECHO_N "checking for tgetnum in -ltermcap... $ECHO_C" >&6
+if test "${ac_cv_lib_termcap_tgetnum+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltermcap  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char tgetnum ();
+int
+main ()
+{
+tgetnum ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_termcap_tgetnum=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_termcap_tgetnum=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetnum" >&5
+echo "${ECHO_T}$ac_cv_lib_termcap_tgetnum" >&6
+if test $ac_cv_lib_termcap_tgetnum = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTERMCAP 1
+_ACEOF
+
+  LIBS="-ltermcap $LIBS"
+
+fi
+
+
+
+if test x$ac_cv_lib_termcap_tgetnum = xyes; then
+  HAVE_TERMCAP_TRUE=
+  HAVE_TERMCAP_FALSE='#'
+else
+  HAVE_TERMCAP_TRUE='#'
+  HAVE_TERMCAP_FALSE=
+fi
+
+
+
+echo "$as_me:$LINENO: checking for crc32 in -lz" >&5
+echo $ECHO_N "checking for crc32 in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_crc32+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char crc32 ();
+int
+main ()
+{
+crc32 ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_z_crc32=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_crc32=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_crc32" >&5
+echo "${ECHO_T}$ac_cv_lib_z_crc32" >&6
+if test $ac_cv_lib_z_crc32 = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+  LIBS="-lz $LIBS"
+
+fi
+
+
+
+if test x$ac_cv_lib_z_crc32 = xyes; then
+  HAVE_ZLIB_TRUE=
+  HAVE_ZLIB_FALSE='#'
+else
+  HAVE_ZLIB_TRUE='#'
+  HAVE_ZLIB_FALSE=
+fi
+
+
+
+echo "$as_me:$LINENO: checking for blkid_known_fstype in -lblkid" >&5
+echo $ECHO_N "checking for blkid_known_fstype in -lblkid... $ECHO_C" >&6
+if test "${ac_cv_lib_blkid_blkid_known_fstype+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lblkid  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char blkid_known_fstype ();
+int
+main ()
+{
+blkid_known_fstype ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_blkid_blkid_known_fstype=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_blkid_blkid_known_fstype=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_known_fstype" >&5
+echo "${ECHO_T}$ac_cv_lib_blkid_blkid_known_fstype" >&6
+if test $ac_cv_lib_blkid_blkid_known_fstype = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBBLKID 1
+_ACEOF
+
+  LIBS="-lblkid $LIBS"
+
+fi
+
+
+
+if test x$ac_cv_lib_blkid_blkid_known_fstype = xyes; then
+  HAVE_BLKID_TRUE=
+  HAVE_BLKID_FALSE='#'
+else
+  HAVE_BLKID_TRUE='#'
+  HAVE_BLKID_FALSE=
+fi
+
+
+
+echo "$as_me:$LINENO: checking for getprevcon in -lselinux" >&5
+echo $ECHO_N "checking for getprevcon in -lselinux... $ECHO_C" >&6
+if test "${ac_cv_lib_selinux_getprevcon+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lselinux  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char getprevcon ();
+int
+main ()
+{
+getprevcon ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_selinux_getprevcon=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_selinux_getprevcon=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getprevcon" >&5
+echo "${ECHO_T}$ac_cv_lib_selinux_getprevcon" >&6
+if test $ac_cv_lib_selinux_getprevcon = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSELINUX 1
+_ACEOF
+
+  LIBS="-lselinux $LIBS"
+
+fi
+
+
+
+if test x$ac_cv_lib_selinux_getprevcon = xyes; then
+  HAVE_SELINUX_TRUE=
+  HAVE_SELINUX_FALSE='#'
+else
+  HAVE_SELINUX_TRUE='#'
+  HAVE_SELINUX_FALSE=
+fi
+
+
+LIBS=""
+
+
+
+
+        MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+
+
+
+  echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
+    # Check whether --enable-nls or --disable-nls was given.
+if test "${enable_nls+set}" = set; then
+  enableval="$enable_nls"
+  USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi;
+  echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6
+
+
+
+
+
+
+# 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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+  echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+
+if test -n "$GMSGFMT"; then
+  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+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
+
+# 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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    rm -f messages.po
+
+
+# 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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+  echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+      if test "$GMSGFMT" != ":"; then
+            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+      echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
+      GMSGFMT=":"
+    fi
+  fi
+
+      if test "$XGETTEXT" != ":"; then
+            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+       (if $XGETTEXT --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
+      : ;
+    else
+      echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+      XGETTEXT=":"
+    fi
+        rm -f messages.po
+  fi
+
+            ac_config_commands="$ac_config_commands default-1"
+
+
+
+      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"
+
+
+# Check whether --with-gnu-ld or --without-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.
+  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&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
+  echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+  echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+                                                echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
+  wl="$acl_cv_wl"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+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-libiconv-prefix or --without-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/lib"
+      fi
+    fi
+
+fi;
+      LIBICONV=
+  LTLIBICONV=
+  INCICONV=
+  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=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+              found_dir="$additional_libdir"
+              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              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 "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                    found_dir="$dir"
+                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    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/lib"; 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 "$hardcode_direct" = yes; then
+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$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 "$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
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+                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/lib"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/lib"; 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 "$hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$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=\"$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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  gt_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     LIBS="$gt_save_LIBS"
+fi
+echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
+_ACEOF
+
+  fi
+    echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  gt_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gt_cv_func_CFLocaleCopyCurrent=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     LIBS="$gt_save_LIBS"
+fi
+echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CFLOCALECOPYCURRENT 1
+_ACEOF
+
+  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
+
+
+
+
+  echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
+    # Check whether --enable-nls or --disable-nls was given.
+if test "${enable_nls+set}" = set; then
+  enableval="$enable_nls"
+  USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi;
+  echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6
+
+
+
+
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+    if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+
+
+
+
+
+
+        echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
+if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gt_cv_func_gnugettext1_libc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_func_gnugettext1_libc=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
+echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
+
+        if test "$gt_cv_func_gnugettext1_libc" != "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
+
+
+  echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+if test "${am_cv_func_iconv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  am_cv_func_iconv=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f 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 >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+      LIBS="$am_save_LIBS"
+    fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6
+  if test "$am_cv_func_iconv" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ICONV 1
+_ACEOF
+
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+    echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$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 or --without-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/lib"
+      fi
+    fi
+
+fi;
+      LIBINTL=
+  LTLIBINTL=
+  INCINTL=
+  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=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+              found_dir="$additional_libdir"
+              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              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 "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                    found_dir="$dir"
+                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    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/lib"; 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 "$hardcode_direct" = yes; then
+                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$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 "$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
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+                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/lib"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/lib"; 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 "$hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$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=\"$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
+
+          echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
+if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+                        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gt_cv_func_gnugettext1_libintl=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_func_gnugettext1_libintl=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+                        if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                gt_cv_func_gnugettext1_libintl=yes
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"
+fi
+echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
+echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
+        fi
+
+                                        if test "$gt_cv_func_gnugettext1_libc" = "yes" \
+           || { test "$gt_cv_func_gnugettext1_libintl" = "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
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_NLS 1
+_ACEOF
+
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  echo "$as_me:$LINENO: checking whether to use NLS" >&5
+echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
+  echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6
+  if test "$USE_NLS" = "yes"; then
+    echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    echo "$as_me:$LINENO: result: $gt_source" >&5
+echo "${ECHO_T}$gt_source" >&6
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+        echo "$as_me:$LINENO: checking how to link with libintl" >&5
+echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
+        echo "$as_me:$LINENO: result: $LIBINTL" >&5
+echo "${ECHO_T}$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
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETTEXT 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DCGETTEXT 1
+_ACEOF
+
+    fi
+
+        POSUB=po
+  fi
+
+
+
+    INTLLIBS="$LIBINTL"
+
+
+
+
+
+
+
+
+
+for ac_header in ncurses.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in ncurses/ncurses.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+if test x$ac_cv_header_ncurses_h = xyes -o x$ac_cv_header_ncurses_ncurses_h = xyes; then
+  have_ncurses=yes
+  { echo "$as_me:$LINENO: you have ncurses" >&5
+echo "$as_me: you have ncurses" >&6;}
+else
+  { echo "$as_me:$LINENO: you do not have ncurses" >&5
+echo "$as_me: you do not have ncurses" >&6;}
+fi
+
+
+
+if test x$have_ncurses = xyes; then
+  HAVE_NCURSES_TRUE=
+  HAVE_NCURSES_FALSE='#'
+else
+  HAVE_NCURSES_TRUE='#'
+  HAVE_NCURSES_FALSE=
+fi
+
+
+
+
+# Check whether --with-slang or --without-slang was given.
+if test "${with_slang+set}" = set; then
+  withval="$with_slang"
+  with_slang=$withval
+else
+  with_slang=no
+
+fi;
+
+if test x$with_slang = xyes; then
+
+for ac_header in slcurses.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in slang/slcurses.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to bunk@stusta.de ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+  if test x$ac_cv_header_slcurses_h = xyes -o x$ac_cv_header_slang_slcurses_h = xyes; then
+    use_slang=yes
+  else
+    { { echo "$as_me:$LINENO: error: slang selected but slcurses.h not found" >&5
+echo "$as_me: error: slang selected but slcurses.h not found" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+
+
+if test x$use_slang = xyes; then
+  USE_SLANG_TRUE=
+  USE_SLANG_FALSE='#'
+else
+  USE_SLANG_TRUE='#'
+  USE_SLANG_FALSE=
+fi
+
+
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#define _XOPEN_SOURCE
+#include <unistd.h>
+
+int
+main ()
+{
+
+char *c = crypt("abc","pw");
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+  my_LIBS="$LIBS"
+  LIBS="$LIBS -lcrypt"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+  #define _XOPEN_SOURCE
+  #include <unistd.h>
+
+int
+main ()
+{
+
+  char *c = crypt("abc","pw");
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define NEED_LIBCRYPT 1
+_ACEOF
+
+  need_libcrypt=yes
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+  { { echo "$as_me:$LINENO: error: crypt() is not available" >&5
+echo "$as_me: error: crypt() is not available" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  LIBS="$my_LIBS"
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+
+
+
+if test x$need_libcrypt = xyes; then
+  NEED_LIBCRYPT_TRUE=
+  NEED_LIBCRYPT_FALSE='#'
+else
+  NEED_LIBCRYPT_TRUE='#'
+  NEED_LIBCRYPT_FALSE=
+fi
+
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <stdio.h>
+
+int
+main ()
+{
+
+printf(__progname);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___PROGNAME 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-#
-# 10. For lib/widechar.h: do we have wide character support?
-# [Do we have the headers <wchar.h>, <wctype.h>, the types wchar_t, wint_t
-# and the fgetwc, fputwc, WEOF functions/macros?]
-#
-echo "
 #include <wchar.h>
 #include <wctype.h>
 #include <stdio.h>
-int main () {
+
+int
+main ()
+{
+
   wchar_t wc;
   wint_t w;
   w = fgetwc(stdin);
   if (w == WEOF) exit(1);
   wc = w;
   fputwc(wc,stdout);
-  exit(0);
+
+  ;
+  return 0;
 }
-" > conftest.c
-eval $compile
-if test -s conftest; then
-        echo "#define ENABLE_WIDECHAR" >> defines.h
-        echo "You have wide character support"
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WIDECHAR 1
+_ACEOF
+
 else
-        echo "You don't have wide character support"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f conftest conftest.c
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-#
-# 11. For pivot_root.c: does <sys/syscall.h> define SYS_pivot_root?
-#
-echo "
 #include <sys/syscall.h>
 #include <unistd.h>
-int main(void)
+
+int
+main ()
 {
-    return SYS_pivot_root;
+
+int test = SYS_pivot_root;
+
+  ;
+  return 0;
 }
-" >conftest.c
-eval $compile
-if test -s conftest; then
-	echo "HAVE_PIVOT_ROOT=yes" >> make_include
-	echo "You have SYS_pivot_root"
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  have_pivot_root=true
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+if test x$have_pivot_root = xtrue; then
+  HAVE_PIVOT_ROOT_TRUE=
+  HAVE_PIVOT_ROOT_FALSE='#'
 else
-	echo "You don't have SYS_pivot_root"
+  HAVE_PIVOT_ROOT_TRUE='#'
+  HAVE_PIVOT_ROOT_FALSE=
 fi
-rm -f conftest conftest.c
 
-#
-# 12. For hwclock.c: does struct tm have a field tm_gmtoff?
-#
-echo "
+
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
 #include <time.h>
 #include <unistd.h>
-int main(int a, char **v)
+
+int
+main ()
 {
+
+    int a = 0;
     struct tm *tm = localtime(0);
     if (a == -1)  /* false */
         sleep(tm->tm_gmtoff);
-    exit(0);
+
+  ;
+  return 0;
 }
-" >conftest.c
-eval $compile
-if test -s conftest; then
-        echo "#define HAVE_tm_gmtoff" >> defines.h
-        echo "You have a tm_gmtoff field in struct tm"
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TM_GMTOFF 1
+_ACEOF
+
 else
-        echo "You don't have a tm_gmtoff field in struct tm"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f conftest conftest.c
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
+
+case "$host" in
+  i?86-*) intel=true ;;
+  sparc*)  sparc=true ;;
+esac
+
+
+
+if test x$intel = xtrue; then
+  INTEL_TRUE=
+  INTEL_FALSE='#'
+else
+  INTEL_TRUE='#'
+  INTEL_FALSE=
+fi
+
+
+
+if test x$sparc = xtrue; then
+  SPARC_TRUE=
+  SPARC_FALSE='#'
+else
+  SPARC_TRUE='#'
+  SPARC_FALSE=
+fi
+
+
+
+# Check whether --enable-agetty or --disable-agetty was given.
+if test "${enable_agetty+set}" = set; then
+  enableval="$enable_agetty"
+  with_agetty=$withval
+else
+  with_agetty=yes
+
+fi;
+
+
+if test x$with_agetty = xyes; then
+  BUILD_AGETTY_TRUE=
+  BUILD_AGETTY_FALSE='#'
+else
+  BUILD_AGETTY_TRUE='#'
+  BUILD_AGETTY_FALSE=
+fi
+
+
+
+# Check whether --enable-elvtune or --disable-elvtune was given.
+if test "${enable_elvtune+set}" = set; then
+  enableval="$enable_elvtune"
+  with_elvtune=$withval
+else
+  with_elvtune=no
+
+fi;
+
+
+if test x$with_elvtune = xyes; then
+  BUILD_ELVTUNE_TRUE=
+  BUILD_ELVTUNE_FALSE='#'
+else
+  BUILD_ELVTUNE_TRUE='#'
+  BUILD_ELVTUNE_FALSE=
+fi
+
+
+
+# Check whether --enable-init or --disable-init was given.
+if test "${enable_init+set}" = set; then
+  enableval="$enable_init"
+  with_init=$withval
+else
+  with_init=no
+
+fi;
+
+
+if test x$with_init = xyes; then
+  BUILD_INIT_TRUE=
+  BUILD_INIT_FALSE='#'
+else
+  BUILD_INIT_TRUE='#'
+  BUILD_INIT_FALSE=
+fi
+
+
+
+# Check whether --enable-kill or --disable-kill was given.
+if test "${enable_kill+set}" = set; then
+  enableval="$enable_kill"
+  with_kill=$withval
+else
+  with_kill=no
+
+fi;
+
+
+if test x$with_kill = xyes; then
+  BUILD_KILL_TRUE=
+  BUILD_KILL_FALSE='#'
+else
+  BUILD_KILL_TRUE='#'
+  BUILD_KILL_FALSE=
+fi
+
+
+
+# Check whether --enable-last or --disable-last was given.
+if test "${enable_last+set}" = set; then
+  enableval="$enable_last"
+  with_last=$withval
+else
+  with_last=no
+
+fi;
+
+
+if test x$with_last = xyes; then
+  BUILD_LAST_TRUE=
+  BUILD_LAST_FALSE='#'
+else
+  BUILD_LAST_TRUE='#'
+  BUILD_LAST_FALSE=
+fi
+
+
+
+# Check whether --enable-mesg or --disable-mesg was given.
+if test "${enable_mesg+set}" = set; then
+  enableval="$enable_mesg"
+  with_mesg=$withval
+else
+  with_mesg=no
+
+fi;
+
+
+if test x$with_mesg = xyes; then
+  BUILD_MESG_TRUE=
+  BUILD_MESG_FALSE='#'
+else
+  BUILD_MESG_TRUE='#'
+  BUILD_MESG_FALSE=
+fi
+
+
+
+# Check whether --enable-partx or --disable-partx was given.
+if test "${enable_partx+set}" = set; then
+  enableval="$enable_partx"
+  with_partx=$withval
+else
+  with_partx=no
+
+fi;
+
+
+if test x$with_partx = xyes; then
+  BUILD_PARTX_TRUE=
+  BUILD_PARTX_FALSE='#'
+else
+  BUILD_PARTX_TRUE='#'
+  BUILD_PARTX_FALSE=
+fi
+
+
+
+# Check whether --enable-raw or --disable-raw was given.
+if test "${enable_raw+set}" = set; then
+  enableval="$enable_raw"
+  with_raw=$withval
+else
+  with_raw=no
+
+fi;
+
+
+if test x$with_raw = xyes; then
+  BUILD_RAW_TRUE=
+  BUILD_RAW_FALSE='#'
+else
+  BUILD_RAW_TRUE='#'
+  BUILD_RAW_FALSE=
+fi
+
+
+
+# Check whether --enable-rdev or --disable-rdev was given.
+if test "${enable_rdev+set}" = set; then
+  enableval="$enable_rdev"
+  with_rdev=$withval
+else
+  with_rdev=no
+
+fi;
+
+
+if test x$with_rdev = xyes; then
+  BUILD_RDEV_TRUE=
+  BUILD_RDEV_FALSE='#'
+else
+  BUILD_RDEV_TRUE='#'
+  BUILD_RDEV_FALSE=
+fi
+
+
+
+# Check whether --enable-rename or --disable-rename was given.
+if test "${enable_rename+set}" = set; then
+  enableval="$enable_rename"
+  with_agetty=$withval
+else
+  with_rename=yes
+
+fi;
+
+
+if test x$with_rename = xyes; then
+  BUILD_RENAME_TRUE=
+  BUILD_RENAME_FALSE='#'
+else
+  BUILD_RENAME_TRUE='#'
+  BUILD_RENAME_FALSE=
+fi
+
+
+
+# Check whether --enable-reset or --disable-reset was given.
+if test "${enable_reset+set}" = set; then
+  enableval="$enable_reset"
+  with_reset=$withval
+else
+  with_reset=no
+
+fi;
+
+
+if test x$with_reset = xyes; then
+  BUILD_RESET_TRUE=
+  BUILD_RESET_FALSE='#'
+else
+  BUILD_RESET_TRUE='#'
+  BUILD_RESET_FALSE=
+fi
+
+
+
+# Check whether --enable-login-utils or --disable-login-utils was given.
+if test "${enable_login_utils+set}" = set; then
+  enableval="$enable_login_utils"
+  with_login_utils=$withval
+else
+  with_login_utils=no
+
+fi;
+
+
+if test x$with_login_utils = xyes; then
+  BUILD_LOGIN_UTILS_TRUE=
+  BUILD_LOGIN_UTILS_FALSE='#'
+else
+  BUILD_LOGIN_UTILS_TRUE='#'
+  BUILD_LOGIN_UTILS_FALSE=
+fi
+
+
+
+# Check whether --enable-schedutils or --disable-schedutils was given.
+if test "${enable_schedutils+set}" = set; then
+  enableval="$enable_schedutils"
+  with_schedutils=$withval
+else
+  with_schedutils=yes
+
+fi;
+
+
+if test x$with_schedutils = xyes; then
+  BUILD_SCHEDUTILS_TRUE=
+  BUILD_SCHEDUTILS_FALSE='#'
+else
+  BUILD_SCHEDUTILS_TRUE='#'
+  BUILD_SCHEDUTILS_FALSE=
+fi
+
+
+
+# Check whether --enable-wall or --disable-wall was given.
+if test "${enable_wall+set}" = set; then
+  enableval="$enable_wall"
+  with_wall=$withval
+else
+  with_wall=yes
+
+fi;
+
+
+if test x$with_wall = xyes; then
+  BUILD_WALL_TRUE=
+  BUILD_WALL_FALSE='#'
+else
+  BUILD_WALL_TRUE='#'
+  BUILD_WALL_FALSE=
+fi
+
+
+
+# Check whether --enable-write or --disable-write was given.
+if test "${enable_write+set}" = set; then
+  enableval="$enable_write"
+  with_write=$withval
+else
+  with_write=no
+
+fi;
+
+
+if test x$with_write = xyes; then
+  BUILD_WRITE_TRUE=
+  BUILD_WRITE_FALSE='#'
+else
+  BUILD_WRITE_TRUE='#'
+  BUILD_WRITE_FALSE=
+fi
+
+
+
+# Check whether --enable-chsh-only-listed or --disable-chsh-only-listed was given.
+if test "${enable_chsh_only_listed+set}" = set; then
+  enableval="$enable_chsh_only_listed"
+  with_login_chsh_only_listed=$withval
+else
+  with_chsh_only_listed=yes
+
+fi;
+
+if test x$with_chsh_only_listed = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ONLY_LISTED_SHELLS 1
+_ACEOF
+
+fi
+
+
+# Check whether --enable-login-chown-vcs or --disable-login-chown-vcs was given.
+if test "${enable_login_chown_vcs+set}" = set; then
+  enableval="$enable_login_chown_vcs"
+  with_login_chown_vcs=$withval
+else
+  with_login_chown_vcs=no
+
+fi;
+
+if test x$with_login_chown_vcs = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define LOGIN_CHOWN_VCS 1
+_ACEOF
+
+fi
+
+
+# Check whether --enable-login-stat-mail or --disable-login-stat-mail was given.
+if test "${enable_login_stat_mail+set}" = set; then
+  enableval="$enable_login_stat_mail"
+  with_login_stat_mail=$withval
+else
+  with_login_stat_mail=no
+
+fi;
+
+if test x$with_login_stat_mail = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define LOGIN_STAT_MAIL 1
+_ACEOF
+
+fi
+
+
+# Check whether --enable-pg-bell or --disable-pg-bell was given.
+if test "${enable_pg_bell+set}" = set; then
+  enableval="$enable_pg_bell"
+  with_pg_bell=$withval
+else
+  with_pg_bell=yes
+
+fi;
+
+if test x$with_pg_bell = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define PG_BELL 1
+_ACEOF
+
+fi
+
+
+# Check whether --enable-require-password or --disable-require-password was given.
+if test "${enable_require_password+set}" = set; then
+  enableval="$enable_require_password"
+  with_require_password=$withval
+else
+  with_require_password=yes
+
+fi;
+
+if test x$with_require_password = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define REQUIRE_PASSWORD 1
+_ACEOF
+
+fi
+
+
+# Check whether --enable-use-tty-group or --disable-use-tty-group was given.
+if test "${enable_use_tty_group+set}" = set; then
+  enableval="$enable_use_tty_group"
+  with_use_tty_group=$withval
+else
+  with_use_tty_group=yes
+
+fi;
+
+
+if test x$with_use_tty_group = xyes; then
+  USE_TTY_GROUP_TRUE=
+  USE_TTY_GROUP_FALSE='#'
+else
+  USE_TTY_GROUP_TRUE='#'
+  USE_TTY_GROUP_FALSE=
+fi
+
+
+if test x$with_use_tty_group = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_TTY_GROUP 1
+_ACEOF
+
+fi
+
+
+
+CPPFLAGS="-fsigned-char -Wall -Wmissing-prototypes -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration $CPPFLAGS"
+
+
+          ac_config_headers="$ac_config_headers config.h"
+
+
+                                                                                                                                            ac_config_files="$ac_config_files Makefile disk-utils/Makefile fdisk/Makefile getopt/Makefile hwclock/Makefile lib/Makefile login-utils/Makefile misc-utils/Makefile mount/Makefile partx/Makefile po/Makefile.in schedutils/Makefile sys-utils/Makefile text-utils/Makefile"
+
+
+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.
 #
-# 13. For nfsmount: does the output of rpcgen compile?
-#
-# On some systems the output of rpcgen compiles with warnings
-# Here we conclude "Your rpcgen output does not compile"
-# and use pregenerated files. If one wishes to use rpcgen anyway,
-# just add the line "HAVE_GOOD_RPC=yes" to make_include.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
 #
-rm -f conftest conftestx.c conftestl.c conftest.h conftest.x
-rm -f conftestx.o conftestl.o
-echo "
-#ifdef RPC_CLNT
-%#include <string.h>            /* for memset() */
-#endif
-%#include <asm/types.h>
-typedef opaque fhandle[1];
-union fhstatus switch (unsigned fhs_status) {
-case 0:
-        fhandle fhs_fhandle;
-default:
-        void;
-};
-typedef string dirpath<1024>;
-struct ppathcnf {
-    short   pc_mask[2];
-};
+# `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.
 
-program MOUNTPROG {
-    version MOUNTVERS {
-	fhstatus
-	MOUNTPROC_MNT(dirpath) = 1;
-    } = 2;
-} = 100005;
-" > conftest.x
-if rpcgen -h -o conftest.h conftest.x 2> conferrs > /dev/null && \
-   rpcgen -c -o conftestx.c conftest.x 2>> conferrs > /dev/null && \
-   rpcgen -l -o conftestl.c conftest.x 2>> conferrs > /dev/null && \
-   $CC $CFLAGS -c conftestx.c 2>> conferrs > /dev/null && \
-   $CC $CFLAGS -c conftestl.c 2>> conferrs > /dev/null && \
-   test ! -s conferrs
-then
-        echo "HAVE_GOOD_RPC=yes" >> make_include
-        echo "Your rpcgen seems to work"
+_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, don't put newlines in cache variables' values.
+# 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.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *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 \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  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}'
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ 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[	 ]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[	 ]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[	 ]*$//;
+}'
+fi
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_i=`echo "$ac_i" |
+	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_RAW_TRUE}" && test -z "${HAVE_RAW_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_RAW\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_RAW\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_PAM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_PAM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_UUID_TRUE}" && test -z "${HAVE_UUID_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_UUID\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_UUID\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_LIBUTIL_TRUE}" && test -z "${HAVE_LIBUTIL_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUTIL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_LIBUTIL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_TERMCAP_TRUE}" && test -z "${HAVE_TERMCAP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_TERMCAP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_TERMCAP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_BLKID_TRUE}" && test -z "${HAVE_BLKID_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_BLKID\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_BLKID\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_SELINUX_TRUE}" && test -z "${HAVE_SELINUX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_SELINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_SELINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_NCURSES_TRUE}" && test -z "${HAVE_NCURSES_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_NCURSES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_NCURSES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_SLANG_TRUE}" && test -z "${USE_SLANG_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_SLANG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_SLANG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${NEED_LIBCRYPT_TRUE}" && test -z "${NEED_LIBCRYPT_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"NEED_LIBCRYPT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NEED_LIBCRYPT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_PIVOT_ROOT_TRUE}" && test -z "${HAVE_PIVOT_ROOT_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_PIVOT_ROOT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_PIVOT_ROOT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${INTEL_TRUE}" && test -z "${INTEL_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"INTEL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"INTEL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${SPARC_TRUE}" && test -z "${SPARC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"SPARC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"SPARC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_AGETTY_TRUE}" && test -z "${BUILD_AGETTY_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_AGETTY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_AGETTY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_ELVTUNE_TRUE}" && test -z "${BUILD_ELVTUNE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_ELVTUNE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_ELVTUNE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_INIT_TRUE}" && test -z "${BUILD_INIT_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_INIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_INIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_KILL_TRUE}" && test -z "${BUILD_KILL_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_KILL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_KILL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_LAST_TRUE}" && test -z "${BUILD_LAST_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_LAST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_LAST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_MESG_TRUE}" && test -z "${BUILD_MESG_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_MESG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_MESG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_PARTX_TRUE}" && test -z "${BUILD_PARTX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_PARTX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_PARTX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_RAW_TRUE}" && test -z "${BUILD_RAW_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_RAW\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_RAW\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_RDEV_TRUE}" && test -z "${BUILD_RDEV_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_RDEV\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_RDEV\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_RENAME_TRUE}" && test -z "${BUILD_RENAME_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_RENAME\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_RENAME\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_RESET_TRUE}" && test -z "${BUILD_RESET_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_RESET\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_RESET\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_LOGIN_UTILS_TRUE}" && test -z "${BUILD_LOGIN_UTILS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_LOGIN_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_LOGIN_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_SCHEDUTILS_TRUE}" && test -z "${BUILD_SCHEDUTILS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_SCHEDUTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_SCHEDUTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_WALL_TRUE}" && test -z "${BUILD_WALL_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_WALL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_WALL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_WRITE_TRUE}" && test -z "${BUILD_WRITE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_WRITE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_WRITE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_TTY_GROUP_TRUE}" && test -z "${USE_TTY_GROUP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_TTY_GROUP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_TTY_GROUP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $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}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; 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
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# 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
+
+# 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
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  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
+
+       ;;
+  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
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); 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 sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
 else
-        echo "Your rpcgen output does not compile - using pregenerated code"
+  as_expr=false
 fi
-rm -f conftest conftestx.c conftestl.c conftest.h conftest.x conferrs
-rm -f conftestx.o conftestl.o
 
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# 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'"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+exec 6>&1
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by util-linux $as_me 2.13-pre1, which was
+generated by GNU Autoconf 2.59.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -q, --quiet      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 <bug-autoconf@gnu.org>."
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
+util-linux config.status 2.13-pre1
+configured by $0, generated by GNU Autoconf 2.59,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2003 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+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=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_option=$1
+     ac_need_defaults=false;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    ac_need_defaults=false;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
+  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
+if \$ac_cs_recheck; then
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
 #
-# 14. For fsck.cramfs, mkfs.cramfs: do we have libz?
+# INIT-COMMANDS section.
 #
-echo '
-#include <zlib.h>
-int main(){ exit(0); crc32(0, 0, 0); }
-' > conftest.c
-LIBS=-lz
-eval $compile
-LIBS=
-if test -s conftest; then
-        echo "HAVE_ZLIB=yes" >> make_include
-        echo "You have zlib"
+
+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.
+    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
+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "disk-utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES disk-utils/Makefile" ;;
+  "fdisk/Makefile" ) CONFIG_FILES="$CONFIG_FILES fdisk/Makefile" ;;
+  "getopt/Makefile" ) CONFIG_FILES="$CONFIG_FILES getopt/Makefile" ;;
+  "hwclock/Makefile" ) CONFIG_FILES="$CONFIG_FILES hwclock/Makefile" ;;
+  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+  "login-utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES login-utils/Makefile" ;;
+  "misc-utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES misc-utils/Makefile" ;;
+  "mount/Makefile" ) CONFIG_FILES="$CONFIG_FILES mount/Makefile" ;;
+  "partx/Makefile" ) CONFIG_FILES="$CONFIG_FILES partx/Makefile" ;;
+  "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+  "schedutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES schedutils/Makefile" ;;
+  "sys-utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES sys-utils/Makefile" ;;
+  "text-utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES text-utils/Makefile" ;;
+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  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 to put it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./confstat$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@CYGPATH_W@,$CYGPATH_W,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@install_sh@,$install_sh,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@mkdir_p@,$mkdir_p,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@am__leading_dot@,$am__leading_dot,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@am__tar@,$am__tar,;t t
+s,@am__untar@,$am__untar,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@EGREP@,$EGREP,;t t
+s,@LN_S@,$LN_S,;t t
+s,@ECHO@,$ECHO,;t t
+s,@AR@,$AR,;t t
+s,@ac_ct_AR@,$ac_ct_AR,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@CPP@,$CPP,;t t
+s,@CXX@,$CXX,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+s,@CXXCPP@,$CXXCPP,;t t
+s,@F77@,$F77,;t t
+s,@FFLAGS@,$FFLAGS,;t t
+s,@ac_ct_F77@,$ac_ct_F77,;t t
+s,@LIBTOOL@,$LIBTOOL,;t t
+s,@PERL@,$PERL,;t t
+s,@HAVE_RAW_TRUE@,$HAVE_RAW_TRUE,;t t
+s,@HAVE_RAW_FALSE@,$HAVE_RAW_FALSE,;t t
+s,@HAVE_PAM_TRUE@,$HAVE_PAM_TRUE,;t t
+s,@HAVE_PAM_FALSE@,$HAVE_PAM_FALSE,;t t
+s,@HAVE_UUID_TRUE@,$HAVE_UUID_TRUE,;t t
+s,@HAVE_UUID_FALSE@,$HAVE_UUID_FALSE,;t t
+s,@HAVE_LIBUTIL_TRUE@,$HAVE_LIBUTIL_TRUE,;t t
+s,@HAVE_LIBUTIL_FALSE@,$HAVE_LIBUTIL_FALSE,;t t
+s,@HAVE_TERMCAP_TRUE@,$HAVE_TERMCAP_TRUE,;t t
+s,@HAVE_TERMCAP_FALSE@,$HAVE_TERMCAP_FALSE,;t t
+s,@HAVE_ZLIB_TRUE@,$HAVE_ZLIB_TRUE,;t t
+s,@HAVE_ZLIB_FALSE@,$HAVE_ZLIB_FALSE,;t t
+s,@HAVE_BLKID_TRUE@,$HAVE_BLKID_TRUE,;t t
+s,@HAVE_BLKID_FALSE@,$HAVE_BLKID_FALSE,;t t
+s,@HAVE_SELINUX_TRUE@,$HAVE_SELINUX_TRUE,;t t
+s,@HAVE_SELINUX_FALSE@,$HAVE_SELINUX_FALSE,;t t
+s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
+s,@USE_NLS@,$USE_NLS,;t t
+s,@MSGFMT@,$MSGFMT,;t t
+s,@GMSGFMT@,$GMSGFMT,;t t
+s,@XGETTEXT@,$XGETTEXT,;t t
+s,@MSGMERGE@,$MSGMERGE,;t t
+s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
+s,@LIBICONV@,$LIBICONV,;t t
+s,@LTLIBICONV@,$LTLIBICONV,;t t
+s,@INTLLIBS@,$INTLLIBS,;t t
+s,@LIBINTL@,$LIBINTL,;t t
+s,@LTLIBINTL@,$LTLIBINTL,;t t
+s,@POSUB@,$POSUB,;t t
+s,@HAVE_NCURSES_TRUE@,$HAVE_NCURSES_TRUE,;t t
+s,@HAVE_NCURSES_FALSE@,$HAVE_NCURSES_FALSE,;t t
+s,@USE_SLANG_TRUE@,$USE_SLANG_TRUE,;t t
+s,@USE_SLANG_FALSE@,$USE_SLANG_FALSE,;t t
+s,@NEED_LIBCRYPT_TRUE@,$NEED_LIBCRYPT_TRUE,;t t
+s,@NEED_LIBCRYPT_FALSE@,$NEED_LIBCRYPT_FALSE,;t t
+s,@HAVE_PIVOT_ROOT_TRUE@,$HAVE_PIVOT_ROOT_TRUE,;t t
+s,@HAVE_PIVOT_ROOT_FALSE@,$HAVE_PIVOT_ROOT_FALSE,;t t
+s,@INTEL_TRUE@,$INTEL_TRUE,;t t
+s,@INTEL_FALSE@,$INTEL_FALSE,;t t
+s,@SPARC_TRUE@,$SPARC_TRUE,;t t
+s,@SPARC_FALSE@,$SPARC_FALSE,;t t
+s,@BUILD_AGETTY_TRUE@,$BUILD_AGETTY_TRUE,;t t
+s,@BUILD_AGETTY_FALSE@,$BUILD_AGETTY_FALSE,;t t
+s,@BUILD_ELVTUNE_TRUE@,$BUILD_ELVTUNE_TRUE,;t t
+s,@BUILD_ELVTUNE_FALSE@,$BUILD_ELVTUNE_FALSE,;t t
+s,@BUILD_INIT_TRUE@,$BUILD_INIT_TRUE,;t t
+s,@BUILD_INIT_FALSE@,$BUILD_INIT_FALSE,;t t
+s,@BUILD_KILL_TRUE@,$BUILD_KILL_TRUE,;t t
+s,@BUILD_KILL_FALSE@,$BUILD_KILL_FALSE,;t t
+s,@BUILD_LAST_TRUE@,$BUILD_LAST_TRUE,;t t
+s,@BUILD_LAST_FALSE@,$BUILD_LAST_FALSE,;t t
+s,@BUILD_MESG_TRUE@,$BUILD_MESG_TRUE,;t t
+s,@BUILD_MESG_FALSE@,$BUILD_MESG_FALSE,;t t
+s,@BUILD_PARTX_TRUE@,$BUILD_PARTX_TRUE,;t t
+s,@BUILD_PARTX_FALSE@,$BUILD_PARTX_FALSE,;t t
+s,@BUILD_RAW_TRUE@,$BUILD_RAW_TRUE,;t t
+s,@BUILD_RAW_FALSE@,$BUILD_RAW_FALSE,;t t
+s,@BUILD_RDEV_TRUE@,$BUILD_RDEV_TRUE,;t t
+s,@BUILD_RDEV_FALSE@,$BUILD_RDEV_FALSE,;t t
+s,@BUILD_RENAME_TRUE@,$BUILD_RENAME_TRUE,;t t
+s,@BUILD_RENAME_FALSE@,$BUILD_RENAME_FALSE,;t t
+s,@BUILD_RESET_TRUE@,$BUILD_RESET_TRUE,;t t
+s,@BUILD_RESET_FALSE@,$BUILD_RESET_FALSE,;t t
+s,@BUILD_LOGIN_UTILS_TRUE@,$BUILD_LOGIN_UTILS_TRUE,;t t
+s,@BUILD_LOGIN_UTILS_FALSE@,$BUILD_LOGIN_UTILS_FALSE,;t t
+s,@BUILD_SCHEDUTILS_TRUE@,$BUILD_SCHEDUTILS_TRUE,;t t
+s,@BUILD_SCHEDUTILS_FALSE@,$BUILD_SCHEDUTILS_FALSE,;t t
+s,@BUILD_WALL_TRUE@,$BUILD_WALL_TRUE,;t t
+s,@BUILD_WALL_FALSE@,$BUILD_WALL_FALSE,;t t
+s,@BUILD_WRITE_TRUE@,$BUILD_WRITE_TRUE,;t t
+s,@BUILD_WRITE_FALSE@,$BUILD_WRITE_FALSE,;t t
+s,@USE_TTY_GROUP_TRUE@,$USE_TTY_GROUP_TRUE,;t t
+s,@USE_TTY_GROUP_FALSE@,$USE_TTY_GROUP_FALSE,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+	cat >$tmp/stdin
+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
 else
-        echo "HAVE_ZLIB=no" >> make_include
-        echo "You don't have zlib"
+  ac_dir_suffix= ac_top_builddir=
 fi
-rm -f conftest conftest.c
 
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  esac
+
+  # 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.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+				     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+	 # Absolute (can't be DOS-style, as IFS=:)
+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 echo "$f";;
+      *) # Relative
+	 if test -f "$f"; then
+	   # Build tree
+	   echo "$f"
+	 elif test -f "$srcdir/$f"; then
+	   # Source tree
+	   echo "$srcdir/$f"
+	 else
+	   # /dev/null tree
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;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,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
+
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_HEADER section.
+#
+
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+ac_dB='[	 ].*$,\1#\2'
+ac_dC=' '
+ac_dD=',;t'
+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+ac_uB='$,\1#\2define\3'
+ac_uC=' '
+ac_uD=',;t'
+
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+	cat >$tmp/stdin
+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+	 # Absolute (can't be DOS-style, as IFS=:)
+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 # Do quote $f, to prevent DOS paths from being IFS'd.
+	 echo "$f";;
+      *) # Relative
+	 if test -f "$f"; then
+	   # Build tree
+	   echo "$f"
+	 elif test -f "$srcdir/$f"; then
+	   # Source tree
+	   echo "$srcdir/$f"
+	 else
+	   # /dev/null tree
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+  # Remove the trailing spaces.
+  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+
+_ACEOF
+
+# Transform confdefs.h into two sed scripts, `conftest.defines' and
+# `conftest.undefs', that substitutes the proper values into
+# config.h.in to produce config.h.  The first handles `#define'
+# templates, and the second `#undef' templates.
+# And first: Protect against being on the right side of a sed subst in
+# config.status.  Protect against being in an unquoted here document
+# in config.status.
+rm -f conftest.defines conftest.undefs
+# Using a here document instead of a string reduces the quoting nightmare.
+# Putting comments in sed scripts is not portable.
+#
+# `end' is used to avoid that the second main sed command (meant for
+# 0-ary CPP macros) applies to n-ary macro definitions.
+# See the Autoconf documentation for `clear'.
+cat >confdef2sed.sed <<\_ACEOF
+s/[\\&,]/\\&/g
+s,[\\$`],\\&,g
+t clear
+: clear
+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+t end
+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+: end
+_ACEOF
+# If some macros were called several times there might be several times
+# the same #defines, which is useless.  Nevertheless, we may not want to
+# sort them, since we want the *last* AC-DEFINE to be honored.
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+rm -f confdef2sed.sed
+
+# This sed command replaces #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.
+cat >>conftest.undefs <<\_ACEOF
+s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+_ACEOF
+
+# Break up conftest.defines because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+echo '  :' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.defines >/dev/null
+do
+  # Write a limited-size here document to $tmp/defines.sed.
+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#define' lines.
+  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines
+echo '  fi # grep' >>$CONFIG_STATUS
+echo >>$CONFIG_STATUS
+
+# Break up conftest.undefs because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.undefs >/dev/null
+do
+  # Write a limited-size here document to $tmp/undefs.sed.
+  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#undef'
+  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+  rm -f conftest.undefs
+  mv conftest.tail conftest.undefs
+done
+rm -f conftest.undefs
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+  # 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.  */
+  if test x"$ac_file" = x-; then
+    echo "/* Generated by configure.  */" >$tmp/config.h
+  else
+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+  fi
+  cat $tmp/in >>$tmp/config.h
+  rm -f $tmp/in
+  if test x"$ac_file" != x-; then
+    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+      { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+      rm -f $ac_file
+      mv $tmp/config.h $ac_file
+    fi
+  else
+    cat $tmp/config.h
+    rm -f $tmp/config.h
+  fi
+# Compute $ac_file's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $ac_file | $ac_file:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X$ac_file : 'X\(//\)[^/]' \| \
+	 X$ac_file : 'X\(//\)$' \| \
+	 X$ac_file : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X$ac_file |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_COMMANDS section.
 #
-# 15. For mount, do we have blkid?
-# 
-echo '
-#include <blkid/blkid.h>
-int main(){ exit(0); blkid_known_fstype("ext2"); }
-' > conftest.c
-LIBS="-lblkid -luuid"
-eval $compile
-LIBS=
-if test -s conftest; then
-        echo "HAVE_BLKID=yes" >> make_include
-        echo "You have blkid"
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+	 X"$ac_dest" : 'X\(//\)$' \| \
+	 X"$ac_dest" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
 else
-        echo "HAVE_BLKID=no" >> make_include
-        echo "You don't have blkid"
+  ac_dir_suffix= ac_top_builddir=
 fi
-rm -f conftest conftest.c
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+
+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+  case $ac_dest in
+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`(dirname "$mf") 2>/dev/null ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+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=`(dirname "$file") 2>/dev/null ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    { if $as_mkdir_p; then
+    mkdir -p $dirpart/$fdir
+  else
+    as_dir=$dirpart/$fdir
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
+    default-1 )
+    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.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            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
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+
+# 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 || { (exit 1); exit 1; }
+fi
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 000000000..a6b3d5139
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,359 @@
+AC_INIT(util-linux, 2.13-pre1, bunk@stusta.de)
+
+AC_CONFIG_AUX_DIR(config)
+
+AM_INIT_AUTOMAKE([check-news std-options -Wall foreign])
+
+AC_CONFIG_SRCDIR(mount/mount.c)
+
+AC_PREFIX_DEFAULT(/)
+
+AC_PROG_CC_STDC
+
+AC_DISABLE_SHARED
+AC_PROG_LIBTOOL
+
+AC_PATH_PROG(PERL, perl)
+
+AC_SYS_LARGEFILE
+
+AC_CHECK_HEADERS(scsi/scsi.h)
+AC_CHECK_HEADERS(linux/compiler.h)
+AC_CHECK_HEADERS(linux/blkpg.h,,,[
+#ifdef HAVE_LINUX_COMPILER_H
+#include <linux/compiler.h>
+#endif
+])
+AC_CHECK_HEADERS(langinfo.h)
+AC_CHECK_HEADERS(sys/user.h)
+AC_CHECK_HEADERS(asm/page.h)
+AC_CHECK_HEADERS(rpcsvc/nfs_prot.h)
+AC_CHECK_HEADERS(sys/io.h)
+AC_CHECK_HEADERS(pty.h)
+
+AC_CHECK_HEADERS(linux/raw.h)
+AM_CONDITIONAL(HAVE_RAW, test x$ac_cv_header_linux_raw_h = xyes)
+
+AC_CHECK_HEADERS(security/pam_misc.h)
+AM_CONDITIONAL(HAVE_PAM, test x$ac_cv_header_security_pam_misc_h = xyes)
+
+
+
+AC_CHECK_FUNCS(inet_aton)
+AC_CHECK_FUNCS(fsync)
+AC_CHECK_FUNCS(getdomainname)
+AC_CHECK_FUNCS(nanosleep)
+AC_CHECK_FUNCS(personality)
+AC_CHECK_FUNCS(updwtmp)
+AC_FUNC_FSEEKO
+AC_CHECK_FUNCS(lchown)
+AC_CHECK_FUNCS(rpmatch)
+
+
+AC_CHECK_LIB(uuid, uuid_is_null)
+AM_CONDITIONAL(HAVE_UUID, test x$ac_cv_lib_uuid_uuid_is_null = xyes)
+
+AC_CHECK_LIB(util, openpty)
+AM_CONDITIONAL(HAVE_LIBUTIL, test x$ac_cv_lib_util_openpty = xyes)
+
+AC_CHECK_LIB(termcap, tgetnum)
+AM_CONDITIONAL(HAVE_TERMCAP, test x$ac_cv_lib_termcap_tgetnum = xyes)
+
+AC_CHECK_LIB(z, crc32)
+AM_CONDITIONAL(HAVE_ZLIB, test x$ac_cv_lib_z_crc32 = xyes)
+
+AC_CHECK_LIB(blkid, blkid_known_fstype)
+AM_CONDITIONAL(HAVE_BLKID, test x$ac_cv_lib_blkid_blkid_known_fstype = xyes)
+
+AC_CHECK_LIB(selinux, getprevcon)
+AM_CONDITIONAL(HAVE_SELINUX, test x$ac_cv_lib_selinux_getprevcon = xyes)
+
+LIBS=""
+
+
+AM_GNU_GETTEXT([external])
+
+
+AC_CHECK_HEADERS(ncurses.h)
+AC_CHECK_HEADERS(ncurses/ncurses.h)
+
+
+if test x$ac_cv_header_ncurses_h = xyes -o x$ac_cv_header_ncurses_ncurses_h = xyes; then
+  have_ncurses=yes
+  AC_MSG_NOTICE([you have ncurses])
+else
+  AC_MSG_NOTICE([you do not have ncurses])
+fi
+
+AM_CONDITIONAL(HAVE_NCURSES, test x$have_ncurses = xyes)
+
+
+AC_ARG_WITH([slang],
+  AC_HELP_STRING([--with-slang], [compile cfdisk with slang]),
+  with_slang=$withval, with_slang=no
+)
+
+if test x$with_slang = xyes; then
+  AC_CHECK_HEADERS(slcurses.h)
+  AC_CHECK_HEADERS(slang/slcurses.h)
+  if test x$ac_cv_header_slcurses_h = xyes -o x$ac_cv_header_slang_slcurses_h = xyes; then
+    use_slang=yes
+  else
+    AC_MSG_ERROR([slang selected but slcurses.h not found])
+  fi
+fi
+
+AM_CONDITIONAL(USE_SLANG, test x$use_slang = xyes)
+
+
+AC_TRY_LINK([
+#define _XOPEN_SOURCE
+#include <unistd.h>
+],[
+char *c = crypt("abc","pw");
+],,[
+  my_LIBS="$LIBS"
+  LIBS="$LIBS -lcrypt"
+  AC_TRY_COMPILE([
+  #define _XOPEN_SOURCE
+  #include <unistd.h>
+  ],[
+  char *c = crypt("abc","pw");
+  ],[
+  AC_DEFINE(NEED_LIBCRYPT, 1, [Do we need -lcrypt?])
+  need_libcrypt=yes
+  ],[
+  AC_MSG_ERROR([crypt() is not available])
+  ])
+  LIBS="$my_LIBS"
+])
+
+AM_CONDITIONAL(NEED_LIBCRYPT, test x$need_libcrypt = xyes)
+
+AC_TRY_COMPILE([
+#include <stdio.h>
+],[
+printf(__progname);
+],AC_DEFINE(HAVE___PROGNAME, 1, [Do we have __progname?])
+)
+
+
+AC_TRY_COMPILE([
+#include <wchar.h>
+#include <wctype.h>
+#include <stdio.h>
+],[
+  wchar_t wc;
+  wint_t w;
+  w = fgetwc(stdin);
+  if (w == WEOF) exit(1);
+  wc = w;
+  fputwc(wc,stdout);
+],AC_DEFINE(HAVE_WIDECHAR,1,[Do we have wide character support?]))
+
+
+AC_TRY_COMPILE([
+#include <sys/syscall.h>
+#include <unistd.h>
+],[
+int test = SYS_pivot_root;
+],have_pivot_root=true)
+
+AM_CONDITIONAL(HAVE_PIVOT_ROOT, test x$have_pivot_root = xtrue)
+
+
+AC_TRY_COMPILE([
+#include <time.h>
+#include <unistd.h>
+],[
+    int a = 0;
+    struct tm *tm = localtime(0);
+    if (a == -1)  /* false */
+        sleep(tm->tm_gmtoff);
+],[AC_DEFINE(HAVE_TM_GMTOFF,1,[Does struct tm have a field tm_gmtoff?])])
+
+
+case "$host" in
+  i?86-*) intel=true ;;
+  sparc*)  sparc=true ;;
+esac
+
+AM_CONDITIONAL(INTEL, test x$intel = xtrue)
+AM_CONDITIONAL(SPARC, test x$sparc = xtrue)
+
+
+AC_ARG_ENABLE([agetty],
+  AC_HELP_STRING([--disable-agetty], [do not build agetty]),
+  with_agetty=$withval, with_agetty=yes
+)
+AM_CONDITIONAL(BUILD_AGETTY, test x$with_agetty = xyes)
+
+
+AC_ARG_ENABLE([elvtune],
+  AC_HELP_STRING([--enable-elvtune], [build elvtune (only works with 2.2 and 2.4 kernels)]),
+  with_elvtune=$withval, with_elvtune=no
+)
+AM_CONDITIONAL(BUILD_ELVTUNE, test x$with_elvtune = xyes)
+
+
+AC_ARG_ENABLE([init],
+  AC_HELP_STRING([--enable-init], [build simpleinit, shutdown, initctl]),
+  with_init=$withval, with_init=no
+)
+AM_CONDITIONAL(BUILD_INIT, test x$with_init = xyes)
+
+
+AC_ARG_ENABLE([kill],
+  AC_HELP_STRING([--enable-kill], [build kill]),
+  with_kill=$withval, with_kill=no
+)
+AM_CONDITIONAL(BUILD_KILL, test x$with_kill = xyes)
+
+
+AC_ARG_ENABLE([last],
+  AC_HELP_STRING([--enable-last], [build last]),
+  with_last=$withval, with_last=no
+)
+AM_CONDITIONAL(BUILD_LAST, test x$with_last = xyes)
+
+
+AC_ARG_ENABLE([mesg],
+  AC_HELP_STRING([--enable-mesg], [build mesg]),
+  with_mesg=$withval, with_mesg=no
+)
+AM_CONDITIONAL(BUILD_MESG, test x$with_mesg = xyes)
+
+
+AC_ARG_ENABLE([partx],
+  AC_HELP_STRING([--enable-partx], [build addpart, delpart, partx]),
+  with_partx=$withval, with_partx=no
+)
+AM_CONDITIONAL(BUILD_PARTX, test x$with_partx = xyes)
+
+
+AC_ARG_ENABLE([raw],
+  AC_HELP_STRING([--enable-raw], [build raw]),
+  with_raw=$withval, with_raw=no
+)
+AM_CONDITIONAL(BUILD_RAW, test x$with_raw = xyes)
+
+
+AC_ARG_ENABLE([rdev],
+  AC_HELP_STRING([--enable-rdev], [build rdev on i386]),
+  with_rdev=$withval, with_rdev=no
+)
+AM_CONDITIONAL(BUILD_RDEV, test x$with_rdev = xyes)
+
+
+AC_ARG_ENABLE([rename],
+  AC_HELP_STRING([--disable-rename], [do not build rename]),
+  with_agetty=$withval, with_rename=yes
+)
+AM_CONDITIONAL(BUILD_RENAME, test x$with_rename = xyes)
+
+
+AC_ARG_ENABLE([reset],
+  AC_HELP_STRING([--enable-reset], [build reset]),
+  with_reset=$withval, with_reset=no
+)
+AM_CONDITIONAL(BUILD_RESET, test x$with_reset = xyes)
+
+
+AC_ARG_ENABLE([login-utils],
+  AC_HELP_STRING([--enable-login-utils], [build chfn, chsh, login, newgrp, vipw]),
+  with_login_utils=$withval, with_login_utils=no
+)
+AM_CONDITIONAL(BUILD_LOGIN_UTILS, test x$with_login_utils = xyes)
+
+
+AC_ARG_ENABLE([schedutils],
+  AC_HELP_STRING([--disable-schedutils], [do not build chrt, ionice, teskset]),
+  with_schedutils=$withval, with_schedutils=yes
+)
+AM_CONDITIONAL(BUILD_SCHEDUTILS, test x$with_schedutils = xyes)
+
+
+AC_ARG_ENABLE([wall],
+  AC_HELP_STRING([--disable-wall], [do not build wall]),
+  with_wall=$withval, with_wall=yes
+)
+AM_CONDITIONAL(BUILD_WALL, test x$with_wall = xyes)
+
+
+AC_ARG_ENABLE([write],
+  AC_HELP_STRING([--enable-write], [build write]),
+  with_write=$withval, with_write=no
+)
+AM_CONDITIONAL(BUILD_WRITE, test x$with_write = xyes)
+
+
+AC_ARG_ENABLE([chsh-only-listed],
+  AC_HELP_STRING([--disable-chsh-only-listed], [chsh: allow shells not in /etc/shells]),
+  with_login_chsh_only_listed=$withval, with_chsh_only_listed=yes
+)
+
+if test x$with_chsh_only_listed = xyes; then
+  AC_DEFINE(ONLY_LISTED_SHELLS, 1, [Should chsh allow only shells in /etc/shells?])
+fi
+
+
+AC_ARG_ENABLE([login-chown-vcs],
+  AC_HELP_STRING([--enable-login-chown-vcs], [let login chown /dev/vcsN]),
+  with_login_chown_vcs=$withval, with_login_chown_vcs=no
+)
+
+if test x$with_login_chown_vcs = xyes; then
+  AC_DEFINE(LOGIN_CHOWN_VCS, 1, [Should login chown /dev/vcsN?])
+fi
+
+
+AC_ARG_ENABLE([login-stat-mail],
+  AC_HELP_STRING([--enable-login-stat-mail], [let login stat() the mailbox]),
+  with_login_stat_mail=$withval, with_login_stat_mail=no
+)
+
+if test x$with_login_stat_mail = xyes; then
+  AC_DEFINE(LOGIN_STAT_MAIL, 1, [Should login stat() the mailbox?])
+fi
+
+
+AC_ARG_ENABLE([pg-bell],
+  AC_HELP_STRING([--disable-pg-bell], [let pg not ring the bell on invalid keys]),
+  with_pg_bell=$withval, with_pg_bell=yes
+)
+
+if test x$with_pg_bell = xyes; then
+  AC_DEFINE(PG_BELL, 1, [Should pg ring the bell on invalid keys?])
+fi
+
+
+AC_ARG_ENABLE([require-password],
+  AC_HELP_STRING([--disable-require-password], [do not require the user to enter the password in chfn and chsh]),
+  with_require_password=$withval, with_require_password=yes
+)
+
+if test x$with_require_password = xyes; then
+  AC_DEFINE(REQUIRE_PASSWORD, 1, [Should chfn and chsh require the user to enter the password?])
+fi
+
+
+AC_ARG_ENABLE([use-tty-group],
+  AC_HELP_STRING([--disable-use-tty-group], [do not install wall and write setgid tty]),
+  with_use_tty_group=$withval, with_use_tty_group=yes
+)
+AM_CONDITIONAL(USE_TTY_GROUP, test x$with_use_tty_group = xyes)
+
+if test x$with_use_tty_group = xyes; then
+  AC_DEFINE(USE_TTY_GROUP, 1, [Should wall and write be installed setgid tty?])
+fi
+
+
+
+CPPFLAGS="-fsigned-char -Wall -Wmissing-prototypes -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration $CPPFLAGS"
+
+
+AC_CONFIG_HEADERS(config.h)
+
+AC_CONFIG_FILES([Makefile disk-utils/Makefile fdisk/Makefile getopt/Makefile hwclock/Makefile lib/Makefile login-utils/Makefile misc-utils/Makefile mount/Makefile partx/Makefile po/Makefile.in schedutils/Makefile sys-utils/Makefile text-utils/Makefile])
+
+AC_OUTPUT
diff --git a/disk-utils/Makefile b/disk-utils/Makefile
deleted file mode 100644
index 5a3332346..000000000
--- a/disk-utils/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-# Created: Sat Dec 26 20:09:40 1992
-# Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu)
-
-
-include ../make_include
-include ../MCONFIG
-
-# Where to put man pages?
-
-MAN8= 	blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 elvtune.8 \
-	fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
-
-# Where to put binaries?
-# See the "install" rule for the links. . .
-
-SBIN= 	mkfs mkswap blockdev elvtune fsck.minix mkfs.minix mkfs.bfs
-
-USRBIN=	fdformat isosize
-
-ETC=	fdprm
-
-MAYBE=  setfdprm raw fsck.cramfs mkfs.cramfs
-
-ifneq "$(HAVE_FDUTILS)" "yes"
-USRBIN:=$(USRBIN) setfdprm
-MAN8:=$(MAN8) setfdprm.8
-endif
-
-ifeq "$(HAVE_RAW_H)" "yes"
-USRBIN:=$(USRBIN) raw
-MAN8:=$(MAN8) raw.8
-endif
-
-ifeq "$(HAVE_ZLIB)" "yes"
-SBIN:=$(SBIN) fsck.cramfs mkfs.cramfs
-endif
-
-ifeq "$(HAVE_UUID)" "yes"
-MKSWAP_LIBS=-luuid
-endif
-
-all: $(SBIN) $(USRBIN)
-
-fsck.cramfs: fsck.cramfs.o
-	$(CC) $(LDFLAGS) -o fsck.cramfs fsck.cramfs.o -lz
-
-mkfs.cramfs: mkfs.cramfs.o $(LIB)/md5.o
-	$(CC) $(LDFLAGS) -o mkfs.cramfs mkfs.cramfs.o $(LIB)/md5.o -lz
-
-mkfs.cramfs.o: $(LIB)/md5.h
-
-fsck.cramfs.o mkfs.cramfs.o: cramfs.h
-
-fsck.minix.o mkfs.minix.o: bitops.h minix.h
-
-mkswap: mkswap.o $(LIB)/xstrncpy.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(MKSWAP_LIBS)
-
-install: all
-	$(INSTALLDIR) $(SBINDIR) $(USRBINDIR) $(ETCDIR)
-	$(INSTALLBIN) $(SBIN) $(SBINDIR)
-	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
-ifneq "$(HAVE_FDUTILS)" "yes"
-	$(INSTALLDAT) $(ETC) $(ETCDIR)
-endif
-	$(INSTALLDIR) $(MAN8DIR)
-	$(INSTALLMAN) $(MAN8) $(MAN8DIR)
-
-.PHONY:	clean
-clean:
-	-rm -f *.o *~ core $(SBIN) $(USRBIN) $(MAYBE)
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
new file mode 100644
index 000000000..acca3deed
--- /dev/null
+++ b/disk-utils/Makefile.am
@@ -0,0 +1,37 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+man_MANS = blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 \
+           fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
+
+sbin_PROGRAMS = mkfs mkswap blockdev fsck.minix mkfs.minix mkfs.bfs
+fsck_minix_SOURCES = fsck.minix.c
+mkfs_minix_SOURCES = mkfs.minix.c
+mkfs_bfs_SOURCES = mkfs.bfs.c
+
+usrbin_PROGRAMS = fdformat isosize
+
+dist_sysconf_DATA = fdprm
+
+if BUILD_ELVTUNE
+sbin_PROGRAMS += elvtune
+man_MANS += elvtune.8
+endif
+
+if HAVE_RAW
+if BUILD_RAW
+usrbin_PROGRAMS += raw
+man_MANS += raw.8
+endif
+endif
+
+if HAVE_ZLIB
+sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
+fsck_cramfs_SOURCES = fsck.cramfs.c
+mkfs_cramfs_SOURCES = mkfs.cramfs.c
+fsck_cramfs_LDADD = -lz
+mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.la
+endif
+
+if HAVE_UUID
+mkswap_LDADD = -luuid
+endif
diff --git a/disk-utils/Makefile.in b/disk-utils/Makefile.in
new file mode 100644
index 000000000..4095736ed
--- /dev/null
+++ b/disk-utils/Makefile.in
@@ -0,0 +1,779 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(dist_sysconf_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/config/include-Makefile.am
+sbin_PROGRAMS = mkfs$(EXEEXT) mkswap$(EXEEXT) blockdev$(EXEEXT) \
+	fsck.minix$(EXEEXT) mkfs.minix$(EXEEXT) mkfs.bfs$(EXEEXT) \
+	$(am__EXEEXT_1) $(am__EXEEXT_2)
+usrbin_PROGRAMS = fdformat$(EXEEXT) isosize$(EXEEXT) $(am__EXEEXT_3)
+@BUILD_ELVTUNE_TRUE@am__append_1 = elvtune
+@BUILD_ELVTUNE_TRUE@am__append_2 = elvtune.8
+@BUILD_RAW_TRUE@@HAVE_RAW_TRUE@am__append_3 = raw
+@BUILD_RAW_TRUE@@HAVE_RAW_TRUE@am__append_4 = raw.8
+@HAVE_ZLIB_TRUE@am__append_5 = fsck.cramfs mkfs.cramfs
+subdir = disk-utils
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+@BUILD_ELVTUNE_TRUE@am__EXEEXT_1 = elvtune$(EXEEXT)
+@HAVE_ZLIB_TRUE@am__EXEEXT_2 = fsck.cramfs$(EXEEXT) \
+@HAVE_ZLIB_TRUE@	mkfs.cramfs$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbindir)" \
+	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@BUILD_RAW_TRUE@@HAVE_RAW_TRUE@am__EXEEXT_3 = raw$(EXEEXT)
+usrbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(sbin_PROGRAMS) $(usrbin_PROGRAMS)
+blockdev_SOURCES = blockdev.c
+blockdev_OBJECTS = blockdev.$(OBJEXT)
+blockdev_LDADD = $(LDADD)
+elvtune_SOURCES = elvtune.c
+elvtune_OBJECTS = elvtune.$(OBJEXT)
+elvtune_LDADD = $(LDADD)
+fdformat_SOURCES = fdformat.c
+fdformat_OBJECTS = fdformat.$(OBJEXT)
+fdformat_LDADD = $(LDADD)
+am__fsck_cramfs_SOURCES_DIST = fsck.cramfs.c
+@HAVE_ZLIB_TRUE@am_fsck_cramfs_OBJECTS = fsck.cramfs.$(OBJEXT)
+fsck_cramfs_OBJECTS = $(am_fsck_cramfs_OBJECTS)
+fsck_cramfs_DEPENDENCIES =
+am_fsck_minix_OBJECTS = fsck.minix.$(OBJEXT)
+fsck_minix_OBJECTS = $(am_fsck_minix_OBJECTS)
+fsck_minix_LDADD = $(LDADD)
+isosize_SOURCES = isosize.c
+isosize_OBJECTS = isosize.$(OBJEXT)
+isosize_LDADD = $(LDADD)
+mkfs_SOURCES = mkfs.c
+mkfs_OBJECTS = mkfs.$(OBJEXT)
+mkfs_LDADD = $(LDADD)
+am_mkfs_bfs_OBJECTS = mkfs.bfs.$(OBJEXT)
+mkfs_bfs_OBJECTS = $(am_mkfs_bfs_OBJECTS)
+mkfs_bfs_LDADD = $(LDADD)
+am__mkfs_cramfs_SOURCES_DIST = mkfs.cramfs.c
+@HAVE_ZLIB_TRUE@am_mkfs_cramfs_OBJECTS = mkfs.cramfs.$(OBJEXT)
+mkfs_cramfs_OBJECTS = $(am_mkfs_cramfs_OBJECTS)
+@HAVE_ZLIB_TRUE@mkfs_cramfs_DEPENDENCIES =  \
+@HAVE_ZLIB_TRUE@	$(top_srcdir)/lib/libmd5.la
+am_mkfs_minix_OBJECTS = mkfs.minix.$(OBJEXT)
+mkfs_minix_OBJECTS = $(am_mkfs_minix_OBJECTS)
+mkfs_minix_LDADD = $(LDADD)
+mkswap_SOURCES = mkswap.c
+mkswap_OBJECTS = mkswap.$(OBJEXT)
+mkswap_DEPENDENCIES =
+raw_SOURCES = raw.c
+raw_OBJECTS = raw.$(OBJEXT)
+raw_LDADD = $(LDADD)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = blockdev.c elvtune.c fdformat.c $(fsck_cramfs_SOURCES) \
+	$(fsck_minix_SOURCES) isosize.c mkfs.c $(mkfs_bfs_SOURCES) \
+	$(mkfs_cramfs_SOURCES) $(mkfs_minix_SOURCES) mkswap.c raw.c
+DIST_SOURCES = blockdev.c elvtune.c fdformat.c \
+	$(am__fsck_cramfs_SOURCES_DIST) $(fsck_minix_SOURCES) \
+	isosize.c mkfs.c $(mkfs_bfs_SOURCES) \
+	$(am__mkfs_cramfs_SOURCES_DIST) $(mkfs_minix_SOURCES) mkswap.c \
+	raw.c
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+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 = `echo $$p | sed -e 's|^.*/||'`;
+dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_sysconf_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+man_MANS = blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 \
+	fsck.minix.8 mkfs.minix.8 mkfs.bfs.8 $(am__append_2) \
+	$(am__append_4)
+fsck_minix_SOURCES = fsck.minix.c
+mkfs_minix_SOURCES = mkfs.minix.c
+mkfs_bfs_SOURCES = mkfs.bfs.c
+dist_sysconf_DATA = fdprm
+@HAVE_ZLIB_TRUE@fsck_cramfs_SOURCES = fsck.cramfs.c
+@HAVE_ZLIB_TRUE@mkfs_cramfs_SOURCES = mkfs.cramfs.c
+@HAVE_ZLIB_TRUE@fsck_cramfs_LDADD = -lz
+@HAVE_ZLIB_TRUE@mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.la
+@HAVE_UUID_TRUE@mkswap_LDADD = -luuid
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  disk-utils/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  disk-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
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	done
+
+clean-usrbinPROGRAMS:
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+blockdev$(EXEEXT): $(blockdev_OBJECTS) $(blockdev_DEPENDENCIES) 
+	@rm -f blockdev$(EXEEXT)
+	$(LINK) $(blockdev_LDFLAGS) $(blockdev_OBJECTS) $(blockdev_LDADD) $(LIBS)
+elvtune$(EXEEXT): $(elvtune_OBJECTS) $(elvtune_DEPENDENCIES) 
+	@rm -f elvtune$(EXEEXT)
+	$(LINK) $(elvtune_LDFLAGS) $(elvtune_OBJECTS) $(elvtune_LDADD) $(LIBS)
+fdformat$(EXEEXT): $(fdformat_OBJECTS) $(fdformat_DEPENDENCIES) 
+	@rm -f fdformat$(EXEEXT)
+	$(LINK) $(fdformat_LDFLAGS) $(fdformat_OBJECTS) $(fdformat_LDADD) $(LIBS)
+fsck.cramfs$(EXEEXT): $(fsck_cramfs_OBJECTS) $(fsck_cramfs_DEPENDENCIES) 
+	@rm -f fsck.cramfs$(EXEEXT)
+	$(LINK) $(fsck_cramfs_LDFLAGS) $(fsck_cramfs_OBJECTS) $(fsck_cramfs_LDADD) $(LIBS)
+fsck.minix$(EXEEXT): $(fsck_minix_OBJECTS) $(fsck_minix_DEPENDENCIES) 
+	@rm -f fsck.minix$(EXEEXT)
+	$(LINK) $(fsck_minix_LDFLAGS) $(fsck_minix_OBJECTS) $(fsck_minix_LDADD) $(LIBS)
+isosize$(EXEEXT): $(isosize_OBJECTS) $(isosize_DEPENDENCIES) 
+	@rm -f isosize$(EXEEXT)
+	$(LINK) $(isosize_LDFLAGS) $(isosize_OBJECTS) $(isosize_LDADD) $(LIBS)
+mkfs$(EXEEXT): $(mkfs_OBJECTS) $(mkfs_DEPENDENCIES) 
+	@rm -f mkfs$(EXEEXT)
+	$(LINK) $(mkfs_LDFLAGS) $(mkfs_OBJECTS) $(mkfs_LDADD) $(LIBS)
+mkfs.bfs$(EXEEXT): $(mkfs_bfs_OBJECTS) $(mkfs_bfs_DEPENDENCIES) 
+	@rm -f mkfs.bfs$(EXEEXT)
+	$(LINK) $(mkfs_bfs_LDFLAGS) $(mkfs_bfs_OBJECTS) $(mkfs_bfs_LDADD) $(LIBS)
+mkfs.cramfs$(EXEEXT): $(mkfs_cramfs_OBJECTS) $(mkfs_cramfs_DEPENDENCIES) 
+	@rm -f mkfs.cramfs$(EXEEXT)
+	$(LINK) $(mkfs_cramfs_LDFLAGS) $(mkfs_cramfs_OBJECTS) $(mkfs_cramfs_LDADD) $(LIBS)
+mkfs.minix$(EXEEXT): $(mkfs_minix_OBJECTS) $(mkfs_minix_DEPENDENCIES) 
+	@rm -f mkfs.minix$(EXEEXT)
+	$(LINK) $(mkfs_minix_LDFLAGS) $(mkfs_minix_OBJECTS) $(mkfs_minix_LDADD) $(LIBS)
+mkswap$(EXEEXT): $(mkswap_OBJECTS) $(mkswap_DEPENDENCIES) 
+	@rm -f mkswap$(EXEEXT)
+	$(LINK) $(mkswap_LDFLAGS) $(mkswap_OBJECTS) $(mkswap_LDADD) $(LIBS)
+raw$(EXEEXT): $(raw_OBJECTS) $(raw_DEPENDENCIES) 
+	@rm -f raw$(EXEEXT)
+	$(LINK) $(raw_LDFLAGS) $(raw_OBJECTS) $(raw_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blockdev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elvtune.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdformat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsck.cramfs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsck.minix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isosize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfs.bfs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfs.cramfs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfs.minix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkswap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+	done
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+	done
+install-dist_sysconfDATA: $(dist_sysconf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
+	done
+
+uninstall-dist_sysconfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(MANS) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"; 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)
+
+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-libtool clean-sbinPROGRAMS \
+	clean-usrbinPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man install-usrbinPROGRAMS
+
+install-exec-am: install-dist_sysconfDATA install-sbinPROGRAMS
+
+install-info: install-info-am
+
+install-man: install-man8
+
+installcheck-am: installcheck-sbinPROGRAMS installcheck-usrbinPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_sysconfDATA uninstall-info-am \
+	uninstall-man uninstall-sbinPROGRAMS uninstall-usrbinPROGRAMS
+
+uninstall-man: uninstall-man8
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-sbinPROGRAMS clean-usrbinPROGRAMS ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dist_sysconfDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-man8 install-sbinPROGRAMS install-strip \
+	install-usrbinPROGRAMS installcheck installcheck-am \
+	installcheck-sbinPROGRAMS installcheck-usrbinPROGRAMS \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-dist_sysconfDATA uninstall-info-am \
+	uninstall-man uninstall-man8 uninstall-sbinPROGRAMS \
+	uninstall-usrbinPROGRAMS
+
+# 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 --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index bb11981db..51033db90 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -171,7 +171,7 @@ main(int argc, char **argv) {
 
 	/* -V not together with commands */
 	if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-		printf("%s from %s\n", progname, util_linux_version);
+		printf("%s from %s%s\n", progname, "util-linux-", VERSION);
 		exit(0);
 	}
 
diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c
index a3c05ffb7..ec3083b3f 100644
--- a/disk-utils/elvtune.c
+++ b/disk-utils/elvtune.c
@@ -46,7 +46,7 @@ typedef struct blkelv_ioctl_arg_s {
 
 static void
 usage(void) {
-	fprintf(stderr, "elvtune (%s)\n", util_linux_version);
+	fprintf(stderr, "elvtune (%s%s)\n", "util-linux-", VERSION);
 	fprintf(stderr, _("usage:\n"));
 	fprintf(stderr, "\telvtune [-r r_lat] [-w w_lat] [-b b_lat]"
 		        " /dev/blkdev1 [/dev/blkdev2...]\n");
@@ -58,7 +58,7 @@ usage(void) {
 
 static void
 version(void) {
-	fprintf(stderr, "elvtune (%s)\n", util_linux_version);
+	fprintf(stderr, "elvtune (%s%s)\n", "util-linux-", VERSION);
 }
 
 #define MAKE_VERSION(p,q,r)	(65536*(p) + 256*(q) + (r))
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index e1b381173..98f221525 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -113,7 +113,7 @@ int main(int argc,char **argv)
 
     if (argc == 2 &&
 	(!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-	    printf(_("%s from %s\n"), progname, util_linux_version);
+	    printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
 	    exit(0);
     }
 
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 83bf00ac8..d46a56954 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -51,7 +51,6 @@
 #include <sys/sysmacros.h>	/* for major, minor */
 
 #include "cramfs.h"
-#include "../defines.h"		/* for HAVE_lchown */
 #include "nls.h"
 
 #define BLKGETSIZE _IO(0x12,96) /* return device size */
@@ -205,10 +204,8 @@ static int uncompress_block(void *src, int len)
 	return stream.total_out;
 }
 
-#ifdef HAVE_lchown
-#define my_lchown lchown
-#else
-#define my_lchown chown
+#if !HAVE_LCHOWN
+#define lchown chown
 #endif
 
 static void change_file_status(char *path, struct cramfs_inode *i)
@@ -216,7 +213,7 @@ static void change_file_status(char *path, struct cramfs_inode *i)
 	struct utimbuf epoch = { 0, 0 };
 
 	if (euid == 0) {
-		if (my_lchown(path, i->uid, i->gid) < 0) {
+		if (lchown(path, i->uid, i->gid) < 0) {
 			perror(path);
 			exit(8);
 		}
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 808ae22cf..a38859552 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -1246,7 +1246,7 @@ main(int argc, char ** argv) {
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s from %s\n"), program_name, util_linux_version);
+		printf(_("%s from %s%s\n"), program_name, "util-linux-", VERSION);
 		exit(0);
 	}
 
diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index 005077a83..2f98efb23 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -176,7 +176,7 @@ main(int argc, char * argv[]) {
 
 	if (argc >= 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s from %s\n"), progname, util_linux_version);
+		printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
 		exit(0);
 	}
 
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index 760a5e087..47c489c2b 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -56,7 +56,7 @@ contains
 and
 .IR /sbin/fs ),
 and finally in the directories
-listed in the PATH enviroment variable.
+listed in the PATH environment variable.
 Please see the file system-specific builder manual pages for
 further details.
 .SH OPTIONS
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index 47863bb1c..224d54a34 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -116,7 +116,7 @@ main(int argc, char *argv[]) {
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s from %s\n"), progname, util_linux_version);
+		printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
 		exit(0);
 	}
 
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index 38bacc034..4989f383e 100644
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -21,9 +21,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <getopt.h>
-#include "nls.h"
-
-#define VERSION		UTIL_LINUX_VERSION
+#include <nls.h>
 
 #ifndef DEFAULT_FSTYPE
 # define DEFAULT_FSTYPE		"ext2"
@@ -51,7 +49,7 @@ int main(int argc, char *argv[])
 
   if (argc == 2 &&
       (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-	  printf(_("%s from %s\n"), program_name, util_linux_version);
+	  printf(_("%s from %s%s\n"), program_name, "util-linux-", VERSION);
 	  exit(0);
   }
 
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 440b043de..1b3e891ad 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -775,8 +775,8 @@ int main(int argc, char **argv)
 			/* old option, ignored */
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-			       progname, util_linux_version);
+			printf(_("%s from %s%s\n"),
+			       progname, "util-linux-", VERSION);
 			exit(0);
 		case 'v':
 			verbose = 1;
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 14cf6fa65..c86ed1656 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -158,7 +158,7 @@ die(char *str) {
 
 static void
 usage(void) {
-	fprintf(stderr, "%s (%s)\n", program_name, util_linux_version);
+	fprintf(stderr, "%s (%s%s)\n", program_name, "util-linux-", VERSION);
 	fprintf(stderr,
 		_("Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"),
 		  program_name);
@@ -623,7 +623,7 @@ main(int argc, char ** argv) {
 
   if (argc == 2 &&
       (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-	  printf(_("%s from %s\n"), program_name, util_linux_version);
+	  printf(_("%s from %s%s\n"), program_name, "util-linux-", VERSION);
 	  exit(0);
   }
 
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 67586fd19..3be985902 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -39,21 +39,20 @@
 #include <sys/ioctl.h>		/* for _IO */
 #include <sys/utsname.h>
 #include <sys/stat.h>
-#include "../defines.h"
 #include "swapheader.h"
 #include "xstrncpy.h"
 #include "nls.h"
 
-#ifdef HAVE_uuid_uuid_h
+#ifdef HAVE_UUID_UUID_H
 #include <uuid/uuid.h>
 #endif
 
 /* Try to get PAGE_SIZE from libc or kernel includes */
-#ifdef HAVE_sys_user_h
+#ifdef HAVE_SYS_USER_H
 				/* Note: <sys/user.h> says: for gdb only */
 #include <sys/user.h>		/* for PAGE_SIZE and PAGE_SHIFT */
 #else
-#ifdef HAVE_asm_page_h
+#ifdef HAVE_ASM_PAGE_H
 #include <asm/page.h>		/* for PAGE_SIZE and PAGE_SHIFT */
 				/* we also get PAGE_SIZE via getpagesize() */
 #endif
@@ -112,7 +111,7 @@ is_sparc64(void) {
 	if (strcmp(un.machine, "sparc"))
 		return 0; /* Should not happen */
 
-#ifdef HAVE_personality
+#ifdef HAVE_PERSONALITY
 	{
 		extern int personality(unsigned long);
 		int oldpers;
@@ -248,7 +247,7 @@ write_uuid_and_label(char *uuid, char *volume_name) {
 			printf("LABEL=%s, ", h->volume_name);
 		else
 			printf(_("no label, "));
-#ifdef HAVE_uuid_uuid_h
+#ifdef HAVE_UUID_UUID_H
 		if (uuid) {
 			char uuid_string[37];
 			uuid_unparse(uuid, uuid_string);
@@ -506,7 +505,7 @@ main(int argc, char ** argv) {
 	char *pp;
 	char *opt_label = NULL;
 	char *uuid = NULL;
-#ifdef HAVE_uuid_uuid_h
+#ifdef HAVE_UUID_UUID_H
 	uuid_t uuid_dat;
 #endif
 
@@ -520,7 +519,7 @@ main(int argc, char ** argv) {
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s from %s\n"), program_name, util_linux_version);
+		printf(_("%s from %s%s\n"), program_name, "util-linux-", VERSION);
 		exit(0);
 	}
 
@@ -562,7 +561,7 @@ main(int argc, char ** argv) {
 			usage();
 	}
 
-#ifdef HAVE_uuid_uuid_h
+#ifdef HAVE_UUID_UUID_H
 	uuid_generate(uuid_dat);
 	uuid = uuid_dat;
 #endif
@@ -715,7 +714,7 @@ the -f option to force it.\n"),
 	 * A subsequent swapon() will fail if the signature
 	 * is not actually on disk. (This is a kernel bug.)
 	 */
-#ifdef HAVE_fsync
+#ifdef HAVE_FSYNC
 	if (fsync(DEV))
 		 die(_("fsync failed"));
 #endif
diff --git a/disk-utils/setfdprm.8 b/disk-utils/setfdprm.8
deleted file mode 100644
index 63143256d..000000000
--- a/disk-utils/setfdprm.8
+++ /dev/null
@@ -1,66 +0,0 @@
-.\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu)
-.\" May be distributed under the GNU General Public License
-.TH SETFDPRM 8 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual"
-.SH NAME
-setfdprm \- sets user-provided floppy disk parameters
-.SH SYNOPSIS
-.B "setfdprm [ \-p ]"
-device name
-.br
-.B "setfdprm [ \-p ]"
-device size sectors heads tracks stretch gap rate spec1 fmt_gap
-.br
-.B "setfdprm [ \-c ]"
-device
-.br
-.B "setfdprm [ \-y ]"
-device
-.br
-.B "setfdprm [ \-n ]"
-device
-.SH DESCRIPTION
-.B setfdprm
-is a utility that can be used to load disk parameters into the
-auto-detecting floppy devices, to clear old parameter sets and to disable
-or enable diagnostic messages.
-
-Without any options,
-.B setfdprm
-loads the
-.I device
-(usually
-.I /dev/fd0
-or
-.IR /dev/fd1 )
-with a new parameter set with the
-.I name
-entry found in
-.I /etc/fdprm
-(usually named 360/360, etc.).  These parameters stay in effect until the
-media is changed.
-.OPTIONS
-.TP
-.BI \-p " device name"
-Permanently loads a new parameter set for the specified auto-configuring
-floppy device for the configuration with
-.I name
-in
-.IR /etc/fdprm .
-Alternatively, the parameters can be given directly from the command line.
-.TP
-.BI \-c " device"
-Clears the parameter set of the specified auto-configuring floppy device.
-.TP
-.BI -y " device"
-Enables format detection messages for the specified auto-configuring floppy
-device.
-.TP
-.BI -n " device"
-Disables format detection messages for the specified auto-configuring
-floppy device.
-.SH BUGS
-This documentation is grossly incomplete.
-.SH FILES
-.I /etc/fdprm
-.SH AUTHOR
-Werner Almesberger (almesber@nessie.cs.id.ethz.ch)
diff --git a/disk-utils/setfdprm.c b/disk-utils/setfdprm.c
deleted file mode 100644
index a5dba3e00..000000000
--- a/disk-utils/setfdprm.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* setfdprm.c  -  Sets user-provided floppy disk parameters, re-activates
-		  autodetection and switches diagnostic messages. */
-
-/* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
- * - added Native Language Support
- */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <linux/fd.h>
-#include "nls.h"
-
-#define FDPRMFILE "/etc/fdprm"
-#define MAXLINE   200
-
-
-static int
-convert(char *arg) {
-    long result;
-    char *end;
-
-    result = strtol(arg,&end,0);
-    if (!*end)
-	    return (int) result;
-    fprintf(stderr,_("Invalid number: %s\n"),arg);
-    exit(1);
-}
-
-static void
-cmd_without_param(int cmd,int fd) {
-    if (ioctl(fd,cmd,NULL) >= 0)
-	    exit(0);
-    perror("ioctl");
-    exit(1);
-}
-
-/* set given fd parameters */
-static void
-set_params(int cmd,int fd,char **params) {
-    struct floppy_struct ft;
-
-    ft.size = convert(params[0]);
-    ft.sect = convert(params[1]);
-    ft.head = convert(params[2]);
-    ft.track = convert(params[3]);
-    ft.stretch = convert(params[4]);
-    ft.gap = convert(params[5]);
-    ft.rate = convert(params[6]);
-    ft.spec1 = convert(params[7]);
-    ft.fmt_gap = convert(params[8]);
-    ft.name = NULL;
-    if (ioctl(fd,cmd,&ft) >= 0) exit(0);
-    perror("ioctl");
-    exit(1);
-}
-
-/* find parameter set in file, and use it */
-static void
-find_params(int cmd,int fd,char *name) {
-    FILE *file;
-    char line[MAXLINE+2],this[MAXLINE+2],param[9][MAXLINE+2];
-    char *params[9],*start;
-    int count;
-
-    if ((file = fopen(FDPRMFILE,"r")) == NULL) {
-	perror(FDPRMFILE);
-	exit(1);
-    }
-    while (fgets(line,MAXLINE,file)) {
-	for (start = line; *start == ' ' || *start == '\t'; start++);
-	if (*start && *start != '\n' && *start != '#') {
-	    if (sscanf(start,"%s %s %s %s %s %s %s %s %s %s",this,param[0],
-	      param[1],param[2],param[3],param[4],param[5],param[6],param[7],
-	      param[8]) != 10) {
-		fprintf(stderr,_("Syntax error: '%s'\n"),line);
-		exit(1);
-	    }
-	    if (!strcmp(this,name)) {
-		for (count = 0; count < 9; count++)
-		    params[count] = param[count];
-		set_params(cmd,fd,params);
-	    }
-	}
-    }
-    fprintf(stderr,_("No such parameter set: '%s'\n"),name);
-    exit(1);
-}
-
-static void
-usage(char *name) {
-    char *this;
-
-    if ((this = strrchr(name,'/')) != NULL) name = this+1;
-    fprintf(stderr,_("usage:\n"));
-    fprintf(stderr,_("   %s [ -p ] dev name\n"),name);
-    fprintf(stderr,_("   %s [ -p ] dev size sect heads tracks stretch "
-		     "gap rate spec1 fmt_gap\n"),name);
-#ifdef FDMEDCNG
-    fprintf(stderr,_("   %s [ -c | -y | -n | -d ] dev\n"),name);
-#else
-    fprintf(stderr,_("   %s [ -c | -y | -n ] dev\n"),name);
-#endif
-    exit(1);
-}
-
-int
-main(int argc, char **argv) {
-    int fd;
-    unsigned int cmd;
-    char *progname, *p;
-
-    progname = argv[0];
-    if ((p = strrchr(progname, '/')) != NULL)
-	    progname = p+1;
-
-    setlocale(LC_ALL, "");
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    textdomain(PACKAGE);
-
-    if (argc == 2 &&
-	(!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-	    printf(_("%s from %s\n"), progname, util_linux_version);
-	    exit(0);
-    }
-
-    if (argc < 2)
-	    usage(progname);
-    cmd = FDSETPRM;
-    if (*argv[1] == '-') {
-	switch (argv[1][1]) {
-	    case 'c':
-		cmd = FDCLRPRM;
-		break;
-	    case 'p':
-		cmd = FDDEFPRM;
-		break;
-	    case 'y':
-		cmd = FDMSGON;
-		break;
-	    case 'n':
-		cmd = FDMSGOFF;
-		break;
-#ifdef FDMEDCNG
-	    case 'd':
-		cmd = FDMEDCNG;
-		break;
-#endif
-	    default:
-		usage(progname);
-	}
-	argc--;
-	argv++;
-    }
-    if ((fd = open(argv[1],3)) < 0) { /* O_WRONLY needed in a few kernels */
-	perror(argv[1]);
-	exit(1);
-    }
-    if (cmd != FDSETPRM && cmd != FDDEFPRM) {
-	if (argc != 2) usage(progname);
-	cmd_without_param(cmd,fd);
-    }
-    if (argc != 11 && argc != 3)
-	usage(progname);
-    else if (argc == 11)
-	set_params(cmd,fd,&argv[2]);
-    else
-	find_params(cmd,fd,argv[2]);
-    /* not reached */
-    return 0;
-}
diff --git a/fdisk/Makefile b/fdisk/Makefile
deleted file mode 100644
index e0d3f36c7..000000000
--- a/fdisk/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-# Created: Sat Dec 26 20:09:40 1992
-# Revised: Fri Oct  6 21:02:21 1995 by r.faith@ieee.org
-# Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu)
-#
-include ../make_include
-include ../MCONFIG
-
-MAN8=
-SBIN=
-CFDISK=cfdisk
-NOTMADE=
-
-ifneq "$(HAVE_SLANG)" "yes"
-ifneq "$(HAVE_NCURSES)" "yes"
-CFDISK=
-NOTMADE=cfdisk
-endif
-endif
-
-SBIN:=$(SBIN) fdisk
-MAN8:=$(MAN8) fdisk.8
-
-ifneq "$(ARCH)" "sparc"
-SBIN:=$(SBIN) $(CFDISK) sfdisk
-MAN8:=$(MAN8) cfdisk.8 sfdisk.8
-endif
-
-all: $(SBIN) $(NOTMADE)
-
-cfdisk.o: cfdisk.c ../MCONFIG
-ifeq "$(HAVE_SLANG)" "yes"
-	$(CC) -c $(CFLAGS) -DSLCURSES=1 $< -o $@
-else
-ifeq "$(HAVE_NCURSES)" "yes"
-	$(CC) -c $(CFLAGS) $< -o $@
-else
-	:
-endif
-endif
-
-cfdisk: cfdisk.o llseek.o disksize.o i386_sys_types.o $(LIB)/xstrncpy.o
-ifeq "$(HAVE_SLANG)" "yes"
-	$(CC) $(LDFLAGS) $^ -o $@ $(LIBSLANG)
-else
-ifeq "$(HAVE_NCURSES)" "yes"
-	$(CC) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
-else
-	@echo $@ not made since it requires ncurses or slang
-endif
-endif
-
-# not installed by default
-activate: sfdisk
-	rm -f activate
-	ln -s sfdisk activate
-
-fdisk: fdisk.o llseek.o disksize.o fdiskbsdlabel.o fdisksgilabel.o \
-	fdisksunlabel.o fdiskaixlabel.o i386_sys_types.o partname.o
-fdisk.o: fdisk.c fdisk.h
-fdiskbsdlabel.o: fdiskbsdlabel.c fdisk.h fdiskbsdlabel.h
-fdisksunlabel.o: fdisksunlabel.c fdisksunlabel.h fdisk.h
-fdiskaixlabel.o: fdiskaixlabel.c fdiskaixlabel.h fdisk.h
-fdisk.o cfdisk.o sfdisk.o fdiskbsdlabel.o fdisksunlabel.o \
-	fdisksgilabel.o fdiskaixlabel.o i386_sys_types.o partname.o: common.h
-sfdisk: sfdisk.o disksize.o i386_sys_types.o partname.o
-
-install: all
-	$(INSTALLDIR) $(SBINDIR)
-	$(INSTALLBIN) $(SBIN) $(SBINDIR)
-	$(INSTALLDIR) $(MAN8DIR)
-	$(INSTALLMAN) $(MAN8) $(MAN8DIR)
-
-.PHONY:	clean
-clean:
-	-rm -f *.o *~ core $(SBIN) partitiontype
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
new file mode 100644
index 000000000..dd191fc9b
--- /dev/null
+++ b/fdisk/Makefile.am
@@ -0,0 +1,28 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+sbin_PROGRAMS = fdisk
+man_MANS = fdisk.8
+fdisk_SOURCES = fdisk.c llseek.c disksize.c fdiskbsdlabel.c fdisksgilabel.c \
+	fdisksunlabel.c fdiskaixlabel.c i386_sys_types.c partname.c
+
+if !SPARC
+
+sbin_PROGRAMS += sfdisk
+man_MANS += sfdisk.8
+sfdisk_SOURCES = sfdisk.c disksize.c i386_sys_types.c partname.c
+
+if USE_SLANG
+sbin_PROGRAMS += cfdisk
+man_MANS += cfdisk.8
+cfdisk_SOURCES = cfdisk.c llseek.c disksize.c i386_sys_types.c
+cfdisk_LDADD = -lslang
+else
+if HAVE_NCURSES
+sbin_PROGRAMS += cfdisk
+man_MANS += cfdisk.8
+cfdisk_SOURCES = cfdisk.c llseek.c disksize.c i386_sys_types.c
+cfdisk_LDADD = -lncurses
+endif
+endif
+
+endif
\ No newline at end of file
diff --git a/fdisk/Makefile.in b/fdisk/Makefile.in
new file mode 100644
index 000000000..da12ea943
--- /dev/null
+++ b/fdisk/Makefile.in
@@ -0,0 +1,650 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+sbin_PROGRAMS = fdisk$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
+	$(am__EXEEXT_3)
+@SPARC_FALSE@am__append_1 = sfdisk
+@SPARC_FALSE@am__append_2 = sfdisk.8
+@SPARC_FALSE@@USE_SLANG_TRUE@am__append_3 = cfdisk
+@SPARC_FALSE@@USE_SLANG_TRUE@am__append_4 = cfdisk.8
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@am__append_5 = cfdisk
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@am__append_6 = cfdisk.8
+subdir = fdisk
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+@SPARC_FALSE@am__EXEEXT_1 = sfdisk$(EXEEXT)
+@SPARC_FALSE@@USE_SLANG_TRUE@am__EXEEXT_2 = cfdisk$(EXEEXT)
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@am__EXEEXT_3 = cfdisk$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(sbin_PROGRAMS)
+am__cfdisk_SOURCES_DIST = cfdisk.c llseek.c disksize.c \
+	i386_sys_types.c
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@am_cfdisk_OBJECTS = cfdisk.$(OBJEXT) \
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@	llseek.$(OBJEXT) \
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@	disksize.$(OBJEXT) \
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@	i386_sys_types.$(OBJEXT)
+@SPARC_FALSE@@USE_SLANG_TRUE@am_cfdisk_OBJECTS = cfdisk.$(OBJEXT) \
+@SPARC_FALSE@@USE_SLANG_TRUE@	llseek.$(OBJEXT) \
+@SPARC_FALSE@@USE_SLANG_TRUE@	disksize.$(OBJEXT) \
+@SPARC_FALSE@@USE_SLANG_TRUE@	i386_sys_types.$(OBJEXT)
+cfdisk_OBJECTS = $(am_cfdisk_OBJECTS)
+cfdisk_DEPENDENCIES =
+am_fdisk_OBJECTS = fdisk.$(OBJEXT) llseek.$(OBJEXT) disksize.$(OBJEXT) \
+	fdiskbsdlabel.$(OBJEXT) fdisksgilabel.$(OBJEXT) \
+	fdisksunlabel.$(OBJEXT) fdiskaixlabel.$(OBJEXT) \
+	i386_sys_types.$(OBJEXT) partname.$(OBJEXT)
+fdisk_OBJECTS = $(am_fdisk_OBJECTS)
+fdisk_LDADD = $(LDADD)
+am__sfdisk_SOURCES_DIST = sfdisk.c disksize.c i386_sys_types.c \
+	partname.c
+@SPARC_FALSE@am_sfdisk_OBJECTS = sfdisk.$(OBJEXT) disksize.$(OBJEXT) \
+@SPARC_FALSE@	i386_sys_types.$(OBJEXT) partname.$(OBJEXT)
+sfdisk_OBJECTS = $(am_sfdisk_OBJECTS)
+sfdisk_LDADD = $(LDADD)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(cfdisk_SOURCES) $(fdisk_SOURCES) $(sfdisk_SOURCES)
+DIST_SOURCES = $(am__cfdisk_SOURCES_DIST) $(fdisk_SOURCES) \
+	$(am__sfdisk_SOURCES_DIST)
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+man_MANS = fdisk.8 $(am__append_2) $(am__append_4) $(am__append_6)
+fdisk_SOURCES = fdisk.c llseek.c disksize.c fdiskbsdlabel.c fdisksgilabel.c \
+	fdisksunlabel.c fdiskaixlabel.c i386_sys_types.c partname.c
+
+@SPARC_FALSE@sfdisk_SOURCES = sfdisk.c disksize.c i386_sys_types.c partname.c
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@cfdisk_SOURCES = cfdisk.c llseek.c disksize.c i386_sys_types.c
+@SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c llseek.c disksize.c i386_sys_types.c
+@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@cfdisk_LDADD = -lncurses
+@SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_LDADD = -lslang
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  fdisk/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  fdisk/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
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+cfdisk$(EXEEXT): $(cfdisk_OBJECTS) $(cfdisk_DEPENDENCIES) 
+	@rm -f cfdisk$(EXEEXT)
+	$(LINK) $(cfdisk_LDFLAGS) $(cfdisk_OBJECTS) $(cfdisk_LDADD) $(LIBS)
+fdisk$(EXEEXT): $(fdisk_OBJECTS) $(fdisk_DEPENDENCIES) 
+	@rm -f fdisk$(EXEEXT)
+	$(LINK) $(fdisk_LDFLAGS) $(fdisk_OBJECTS) $(fdisk_LDADD) $(LIBS)
+sfdisk$(EXEEXT): $(sfdisk_OBJECTS) $(sfdisk_DEPENDENCIES) 
+	@rm -f sfdisk$(EXEEXT)
+	$(LINK) $(sfdisk_LDFLAGS) $(sfdisk_OBJECTS) $(sfdisk_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfdisk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disksize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdisk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdiskaixlabel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdiskbsdlabel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdisksgilabel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdisksunlabel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386_sys_types.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/llseek.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/partname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfdisk.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+	done
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(sbindir)" "$(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)
+
+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-libtool clean-sbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-exec-am: install-sbinPROGRAMS
+
+install-info: install-info-am
+
+install-man: install-man8
+
+installcheck-am: installcheck-sbinPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS
+
+uninstall-man: uninstall-man8
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-man8 install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installcheck-sbinPROGRAMS installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am uninstall-man uninstall-man8 \
+	uninstall-sbinPROGRAMS
+
+# 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 --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 30a888de8..b2ffc5ba5 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -64,14 +64,14 @@
 #include <errno.h>
 #include <getopt.h>
 #include <fcntl.h>
-#ifdef SLCURSES
-  #include <slcurses.h>
-#else
-#if NCH
-  #include <ncurses.h>
-#else
-  #include <curses.h>
-#endif
+#ifdef HAVE_SLCURSES_H
+#include <slcurses.h>
+#elif defined(HAVE_SLANG_SLCURSES_H)
+#include <slang/slcurses.h>
+#elif defined(HAVE_NCURSES_H)
+#include <ncurses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
 #endif
 #include <signal.h>
 #include <math.h>
@@ -87,8 +87,6 @@
 extern long long ext2_llseek(unsigned int fd, long long offset,
 			     unsigned int origin);
 
-#define VERSION UTIL_LINUX_VERSION
-
 #define DEFAULT_DEVICE "/dev/hda"
 #define ALTERNATE_DEVICE "/dev/sda"
 
@@ -538,7 +536,7 @@ static void
 die_x(int ret) {
     signal(SIGINT, old_SIGINT);
     signal(SIGTERM, old_SIGTERM);
-#ifdef SLCURSES
+#if defined(HAVE_SLCURSES_H) || defined(HAVE_SLANG_SLCURSES_H)
     SLsmg_gotorc(LINES-1, 0);
     SLsmg_refresh();
 #else
@@ -717,7 +715,7 @@ get_linux_label(int i) {
 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
 		+ REISERFS_DISK_OFFSET_IN_BYTES;
 	if (ext2_llseek(fd, offset, SEEK_SET) == offset
-	    && read(fd, &reiserfsb, sizeof(reiserfsb)) == sizeof(reiserfsb)
+	    && read(fd, &reiserfsb, 1024) == 1024
 	    && has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) {
 		if (reiserfs_is_3_6) {
 			/* label only on version 3.6 onward */
@@ -2100,7 +2098,7 @@ print_p_info(void) {
 	if (to_file) {
 	    if ((fp = fopen(fname, "w")) == NULL) {
 		char errstr[LINE_LENGTH];
-		sprintf(errstr, _("Cannot open file '%s'"), fname);
+		snprintf(errstr, LINE_LENGTH, _("Cannot open file '%s'"), fname);
 		print_warning(errstr);
 		return;
 	    }
@@ -2184,7 +2182,7 @@ print_part_table(void) {
 	if (to_file) {
 	    if ((fp = fopen(fname, "w")) == NULL) {
 		char errstr[LINE_LENGTH];
-		sprintf(errstr, _("Cannot open file '%s'"), fname);
+		snprintf(errstr, LINE_LENGTH, _("Cannot open file '%s'"), fname);
 		print_warning(errstr);
 		return;
 	    }
@@ -2638,9 +2636,9 @@ draw_screen(void) {
 	mvaddstr(WARNING_START, 0, line);
 
 
-    sprintf(line, "cfdisk %s", VERSION);
+    snprintf(line, COLS+1, "cfdisk %s", VERSION);
     mvaddstr(HEADER_START, (COLS-strlen(line))/2, line);
-    sprintf(line, _("Disk Drive: %s"), disk_device);
+    snprintf(line, COLS+1, _("Disk Drive: %s"), disk_device);
     mvaddstr(HEADER_START+2, (COLS-strlen(line))/2, line);
     {
 	    long long bytes = actual_size*(long long) SECTOR_SIZE;
@@ -2654,7 +2652,7 @@ draw_screen(void) {
 			    bytes, megabytes/K, (10*megabytes/K)%10);
     }
     mvaddstr(HEADER_START+3, (COLS-strlen(line))/2, line);
-    sprintf(line, _("Heads: %d   Sectors per Track: %d   Cylinders: %lld"),
+    snprintf(line, COLS+1, _("Heads: %d   Sectors per Track: %d   Cylinders: %lld"),
 	    heads, sectors, cylinders);
     mvaddstr(HEADER_START+4, (COLS-strlen(line))/2, line);
 
diff --git a/fdisk/disksize.c b/fdisk/disksize.c
index f5687d266..28b8df0a5 100644
--- a/fdisk/disksize.c
+++ b/fdisk/disksize.c
@@ -1,3 +1,4 @@
+#include <errno.h>
 #include "common.h"
 
 int disksize(int fd, unsigned long long *sectors) {
@@ -6,8 +7,11 @@ int disksize(int fd, unsigned long long *sectors) {
 	long long b;
 
 	err = ioctl(fd, BLKGETSIZE, &sz);
-	if (err)
-		return err;
+	if (err) {
+		sz = 0;
+		if (errno != EFBIG)
+			return err;
+	}
 	err = ioctl(fd, BLKGETSIZE64, &b);
 	if (err || b == 0 || b == sz)
 		*sectors = sz;
diff --git a/fdisk/doc/CFdisk-Portuguese.html b/fdisk/doc/CFdisk-Portuguese.html
deleted file mode 100644
index 6b699ee9b..000000000
--- a/fdisk/doc/CFdisk-Portuguese.html
+++ /dev/null
@@ -1,1704 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="Gleydson Mazioli da Silva">
-   <meta name="GENERATOR" content="Mozilla/4.5 [en] (Win95; I) [Netscape]">
-   <title>CFdisk-Portugues-HOWTO</title>
-</head>
-<body>
-
-<center><b><font size=+1>CFdisk-Portuguese Copyright (C) 1999 Gleydson
-M. da Silva</font></b></center>
-
-<p><br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<p>
-<hr WIDTH="100%">
-<center>&nbsp;<i>Gleydson M. da Silva</i> - <b>gleydson@linuxbr.com.br</b>
-<br>Vers&atilde;o: 1.68
-<br>
-<hr WIDTH="100%"></center>
-
-<p><br>
-<br>
-<br>
-<br>
-<p><a NAME="Indice"></a><b><font size=+1>[ Indice ]</font></b>
-<br>&nbsp;
-<p><b><font size=+1>1</font></b> - <a href="#1">Introdu&ccedil;&atilde;o
-ao CFdisk</a>
-<br>&nbsp; <b>1.1</b> - <a href="#1.1">O que &eacute; uma parti&ccedil;&atilde;o
-de disco</a>
-<br>&nbsp; <b>1.2</b> - <a href="#1.2">O que &eacute; a Tabela de parti&ccedil;&atilde;o</a>
-<br>&nbsp; <b>1.3</b> - <a href="#1.3">Introdu&ccedil;&atilde;o ao Particionamento
-de Discos</a>
-<br>&nbsp; <b>1.4</b> - <a href="#1.4">Identificadores utilizados neste
-manual</a>
-<br>&nbsp; <b>1.5</b> - <a href="#1.5">Identifica&ccedil;&atilde;o de discos
-e parti&ccedil;&otilde;es no Sistema Linux</a>
-<br>&nbsp; <b>1.6</b> - <a href="#1.6">Tipos de parti&ccedil;&otilde;es
-de disco</a>
-<br>&nbsp; <b>1.7</b> - <a href="#1.7">Observa&ccedil;&otilde;es sobre
-o formato DOS 6.xx (FAT16)</a>
-<p><b><font size=+1>2</font></b> - <a href="#2">Iniciando o programa CFdisk</a>
-<br>&nbsp; <b>2.1</b> - <a href="#2.1">Op&ccedil;&otilde;es de Linha de
-comando</a>
-<br>&nbsp; <b>2.2</b> - <a href="#2.2">Conhecendo a tela do CFdisk</a>
-<br>&nbsp; <b>2.3</b> - <a href="#2.3">Descri&ccedil;&atilde;o dos comandos</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.1</b> - <a href="#2.3.1">Setas Acima/Abaixo
-- Esquerda/Direita</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.2</b> - <a href="#2.3.2">&lt;CTRL>+&lt;l></a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.3</b> - <a href="#2.3.3">Boot</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.4</b> - <a href="#2.3.4">Delete</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.5</b> - <a href="#2.3.5">Geometry</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.6</b> - <a href="#2.3.6">Help</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.7</b> - <a href="#2.3.7">Maximize</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.8</b> - <a href="#2.3.8">New</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.9</b> - <a href="#2.3.9">Print</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.10</b> - <a href="#2.3.10">Quit</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.11</b> - <a href="#2.3.11">Type</a>
-<br>&nbsp;&nbsp;&nbsp;<b> 2.3.12</b> - <a href="#2.3.12">Units</a>
-<br>&nbsp;&nbsp;&nbsp; <b>2.3.13</b> - <a href="#2.3.13">Write</a>
-<p><b><font size=+1>3</font></b> - <a href="#3">Tipos de parti&ccedil;&otilde;es
-compat&iacute;veis com o CFdisk</a>
-<p><b><font size=+1>4</font></b> - <a href="#4">Direitos do Autor</a>
-<p><b><font size=+1>5</font></b> - <a href="#5">Licen&ccedil;as e Garantias
-sobre este documento</a>
-<p><b><font size=+1>6</font></b> - <a href="#6">Notas sobre marcas registradas</a>
-<p><font size=+1>7</font> - <a href="#7">Agradecimentos</a>
-<br>
-<hr WIDTH="100%">
-<br>&nbsp;
-<br>&nbsp;
-<br>
-<br>
-<br>
-<center>
-<p><a NAME="1"></a><u><font size=+1>1-) Introdu&ccedil;&atilde;o ao CFdisk</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; CFdisk &eacute; um programa utilizado para fazer
-o particionamento de discos, utilizando uma interface em modo texto.
-<br>As grandes caracter&iacute;sticas deste programa, al&eacute;m de sua
-interface de comunica&ccedil;&atilde;o com o usu&aacute;rio e a enorme
-quantidade de parti&ccedil;&otilde;es que manipula, &eacute; a grande facilidade
-de utiliza&ccedil;&atilde;o, o seu poder de manipula&ccedil;&atilde;o de
-parti&ccedil;&otilde;es e a sua precis&atilde;o que fazem com que o usu&aacute;rio
-tenha mais confian&ccedil;a durante o particionamento de disco.
-<br>&nbsp;&nbsp;&nbsp; &Eacute; recomend&aacute;vel a leitura deste texto,
-mesmo que tenha uma no&ccedil;&atilde;o sobre o particionamento de discos,
-exceto para os <i>gurus</i> que j&aacute; conhecem a fundo a forma de trabalho,
-em geral, de programas deste tipo, pois o particionamento de disco <b>pode
-destruir os seus arquivos e parti&ccedil;&otilde;es j&aacute; existentes</b>,
-se for usado de forma incorreta.
-<br>&nbsp; O programa CFdisk pode ser utilizado em qualquer sistema operacional
-que esteja de acordo com o padr&atilde;o POSIX (Linux, UNIX, FreeBSD, HPUX,
-etc).
-<p>&nbsp; A vers&atilde;o do CFdisk utilizada nas explica&ccedil;&otilde;es
-deste manual &eacute; a <i>0.8</i>, mas isto n&atilde;o impede que este
-manual seja utilizado com vers&otilde;es futuras ou anteriores deste programa.
-As caracter&iacute;sticas principais do programa CFdisk e as explica&ccedil;&otilde;es
-sobre particionamento, s&atilde;o v&aacute;lidas para quaisquer vers&otilde;es
-deste programa.
-<br>&nbsp;
-<p><b>&nbsp;&nbsp; Este documento &eacute; distribu&iacute;do com a iten&ccedil;&atilde;o
-de ser &uacute;til ao seu utilizador, no entanto N&Atilde;O TEM NENHUMA
-GARANTIA,&nbsp; EXPL&Iacute;CITAS OU IMPL&Iacute;CITAS , COMERCIAIS OU
-DE ATENDIMENTO A UMA DETERMINADA FINALIDADE. Consulte a Licen&ccedil;a
-P&uacute;blica Geral&nbsp; GNU para maiores detalhes.</b>
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<center>
-<p><a NAME="1.1"></a><u><font size=+1>1.1-) Parti&ccedil;&atilde;o de Disco</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Uma <i>Parti&ccedil;&atilde;o de Disco</i> &eacute;
-o local onde o sistema operacional armazena seu sistema de arquivos(arquivos,
-diret&oacute;rios, FAT, boot sector, etc).
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="1.2"></a><u><font size=+1>1.2-) Tabela de parti&ccedil;&atilde;o</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; A <i>Tabela de parti&ccedil;&atilde;o</i> &eacute;
-o local do disco r&iacute;gido onde se localizam os dados sobre todas as
-parti&ccedil;&otilde;es existentes no disco como o sistema de arquivos
-utilizado, se ela &eacute; inicializ&aacute;vel, a cabe&ccedil;a inicial/final,
-setor inicial/final, cilindro inicial/final, n&uacute;mero de setores ocupados
-por ela no disco.
-<br>&nbsp;
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="1.3"></a><u><font size=+1>1.3-) Introdu&ccedil;&atilde;o
-ao particionamento de discos</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Particionar o disco r&iacute;gido &eacute; dividir
-ele em partes para armazenamento de arquivos e programas. As parti&ccedil;&otilde;es
-criadas no disco podem ter o tamanho que desejar (desde que esteja dentro
-da capacidade m&aacute;xima do disco r&iacute;gido).
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Uma parti&ccedil;&atilde;o n&atilde;o interfere
-em outras parti&ccedil;&otilde;es do mesmo disco(&eacute; como se tivessemos
-v&aacute;rios discos r&iacute;gidos dentro de um), e nem em outros discos
-r&iacute;gidos(caso possuir mais que um disco r&iacute;gido) instalado
-em seu computador.
-<br>&nbsp;&nbsp;&nbsp; Pode ser criada&nbsp; uma parti&ccedil;&atilde;o
-&uacute;nica, que neste caso todo o disco r&iacute;gido &eacute; usado
-para armazenar os arquivos(que &eacute; o caso mais comum caso voce tenha
-o DOS), ou v&aacute;rias parti&ccedil;&otilde;es, que podem ser usadas
-pelo mesmo SO(Sistema Operacional) ou outros sistemas operacionais diferentes(um
-exemplo de v&aacute;rias parti&ccedil;&otilde;es: se for usar o DOS e o
-Linux no mesmo disco, os dois sistemas v&atilde;o
-<br>estar no mesmo disco mas um n&atilde;o interfere no outro).
-<br><b>ATEN&Ccedil;&Atilde;O</b> : A OPERA&Ccedil;&Atilde;O DE PARTICIONAMENTO
-DE DISCOS PODE FAZER
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-COM&nbsp; QUE OS DADOS ARMAZENADOS EM SEU DISCO R&Iacute;GIDO SEJAM
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-PERDIDOS, SE FOR USADA INCORRETAMENTE. &Eacute; SEMPRE
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-RECOMENDADO RETIRAR UMA C&Oacute;PIA DE SEGURAN&Ccedil;A DOS SEUS
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-ARQUIVOS EXISTENTES NO MICRO ANTES DE SE EXECUTAR UM
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-PROGRAMA DESTE TIPO, A N&Atilde;O SER QUE TENHA CONFIAN&Ccedil;A NO
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-QUE ESTA FAZENDO E QUE ENTENDEU AS EXPLICA&Ccedil;&Otilde;ES SOBRE A
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-IDENTIFICA&Ccedil;&Atilde;O DE&nbsp; DISCOS R&Iacute;GIDOS E SUAS PARTI&Ccedil;&Otilde;ES
-NO
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-SISTEMA.
-<br>&nbsp;&nbsp;&nbsp; Neste manual voce aprender&aacute; como deve particionar
-seu disco r&iacute;gido para a instala&ccedil;&atilde;o do SO usando o
-programa CFdisk.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="1.4"></a><u><font size=+1>1.4-) Algumas identifica&ccedil;&otilde;es
-utilizadas neste manual para facilitar a</font></u>
-<br><u><font size=+1>compreens&atilde;o do texto</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Esta parte descreve algumas caracter&iacute;sticas
-de organiza&ccedil;&atilde;o deste manual e algumas identifica&ccedil;&otilde;es
-que utilizei para facilitar o seu entendimento, e as explica&ccedil;&otilde;es
-que ser&atilde;o dadas.
-<p>&nbsp;&nbsp;&nbsp; Explica&ccedil;&atilde;o de nomes e comandos, sera
-seguida da palavra "<b>onde:</b>" e abaixo dela as explica&ccedil;&otilde;es
-sobre os comandos, exemplo:
-<p><b>onde:</b>
-<br><i>nome a ser explicado1</i>&nbsp; : Descri&ccedil;&atilde;o
-<br><i>nome a ser explicado2</i>&nbsp; : Descri&ccedil;&atilde;o
-<br><i>nome a ser explicado3</i>&nbsp; : Descri&ccedil;&atilde;o
-<p>ou
-<p><b>onde:</b>
-<br><i>nome a ser explicado1</i>&nbsp; - Descri&ccedil;&atilde;o
-<br><i>nome a ser explicado2</i>&nbsp; - Descri&ccedil;&atilde;o
-<br><i>nome a ser explicado3</i>&nbsp; - Descri&ccedil;&atilde;o
-<br>&nbsp;
-<p>&nbsp;&nbsp;&nbsp; Quando for feita alguma refer&ecirc;ncia com tecla
-do teclado, por exemplo, pressione <b>p</b> para listar as parti&ccedil;&otilde;es,
-a letra sera colocada entre &lt;> para que seja melhor entendida, por exemplo:
-<p>pressione &lt;d> para deletar uma parti&ccedil;&atilde;o...
-<br>...pressione &lt;Enter> para escolher a op&ccedil;&atilde;o do menu.
-<br>pressione &lt;t> para listar os tipos de parti&ccedil;&otilde;es dispon&iacute;veis...
-<br>&nbsp;
-<p>&nbsp;&nbsp;&nbsp; As linhas pontilhadas que aparecem na tela, veja
-abaixo,
-<br>----------------------------------------------------------------------------
-<br>----------------------------------------------------------------------------
-<br>servem para identificar que o que esta entre as linhas &eacute; um
-exemplo de como
-<br>ser&aacute; a resposta do comando para a tela de seu computador.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="1.5"></a><u><font size=+1>1.5-) Identifica&ccedil;&atilde;o
-de discos e parti&ccedil;&otilde;es no Linux</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Antes de descrever como se utiliza o programa CFdisk,
-&eacute; importante fazer algumas explica&ccedil;&otilde;es sobre a identifica&ccedil;&atilde;o
-das parti&ccedil;&otilde;es e unidades de disco no sistema Linux( e outros
-*nix).
-<br>&nbsp;&nbsp;&nbsp; Se voce for um usu&aacute;rio que j&aacute; conhece
-a interpreta&ccedil;&atilde;o de discos e parti&ccedil;&otilde;es neste
-sistema, voce n&atilde;o precisar&aacute; ler esta parte.
-<br>&nbsp;&nbsp;&nbsp; No sistema operacional Linux, os dispositivos existentes
-no computador (como impressoras, unidades de disquetes, discos r&iacute;gidos,
-monitor, placa de som, etc...) s&atilde;o identificados por um nome referente
-a este dispositivo e colocado no diret&oacute;rio <b>/dev</b> (que &eacute;
-utilizado para identificar os dispositivos ou perif&eacute;ricos existentes
-no computador).
-<br>&nbsp;&nbsp; A identifica&ccedil;&atilde;o dos discos r&iacute;gidos
-segue a seguinte forma:
-<p>&nbsp; /dev/hda1
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |&nbsp; |&nbsp;
-|
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |&nbsp; |&nbsp;
-|_N&uacute;mero que identifica a parti&ccedil;&atilde;o do disco r&iacute;gido(<i>1=Primeira,
-2=segunda</i>)
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |&nbsp; |
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |&nbsp; |_Letra
-que identifica o disco r&iacute;gido(<i>a=primeiro disco, b=segundo disco,
-etc..</i>)
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |_Sigla <i>hd</i>
-- Significa que &eacute; um disco r&iacute;gido <i>IDE</i>(Se tiver um
-<i>sd</i>
-significa <i>SCSI</i>)
-<br>&nbsp; |
-<br>&nbsp; |_ Identifica&ccedil;&atilde;o do diret&oacute;rio onde os dispositivos
-do sistema s&atilde;o armazenados
-<p><b>OBS</b>: As unidades de disco r&iacute;gido <b>SCSI</b>, s&atilde;o
-identificadas com as letras <b>sd</b>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; seguida pela letra
-da unidade e n&uacute;mero da parti&ccedil;&atilde;o e os discos <b>IDE</b>
-s&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; identificados por
-<b>hd</b>
-seguida pela letra da unidade de disco e o n&uacute;mero
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; da parti&ccedil;&atilde;o
-do disco(como visto acima).
-<p>Abaixo, algumas identifica&ccedil;&otilde;es de disco do sistema Linux:
-<p>/dev/hda1&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE prim&aacute;rio
-principal - Primeira parti&ccedil;&atilde;o
-<br>/dev/hda2&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE prim&aacute;rio
-principal - Segunda parti&ccedil;&atilde;o
-<br>/dev/hda3&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE prim&aacute;rio
-principal - Terceira parti&ccedil;&atilde;o
-<br>/dev/hdb1&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE prim&aacute;rio
-escravo - Primeira parti&ccedil;&atilde;o
-<br>/dev/hdb2&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE prim&aacute;rio
-escravo - Segunda parti&ccedil;&atilde;o
-<br>/dev/hdb3&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE prim&aacute;rio
-escravo - Terceira parti&ccedil;&atilde;o
-<br>/dev/hdc1&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE secund&aacute;rio
-principal - Primeira parti&ccedil;&atilde;o
-<br>/dev/hdc2&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE secund&aacute;rio
-principal - Segunda parti&ccedil;&atilde;o
-<br>/dev/hdc3&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE secund&aacute;rio
-principal - Terceira parti&ccedil;&atilde;o
-<br>/dev/hdd1&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE secund&aacute;rio
-escravo - Primeira parti&ccedil;&atilde;o
-<br>/dev/hdd2&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE secund&aacute;rio
-escravo - Segunda parti&ccedil;&atilde;o
-<br>/dev/hdd3&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido IDE secund&aacute;rio
-escravo - Terceira parti&ccedil;&atilde;o
-<br>/dev/sda1&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Primeiro disco r&iacute;gido
-SCSI - Primeira parti&ccedil;&atilde;o
-<br>/dev/sda2&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Primeiro disco r&iacute;gido
-SCSI - Segunda parti&ccedil;&atilde;o
-<br>/dev/sda3&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Primeiro disco r&iacute;gido
-SCSI - Terceira parti&ccedil;&atilde;o
-<br>/dev/sdb1&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Segundo disco r&iacute;gido
-SCSI - Primeira parti&ccedil;&atilde;o
-<br>/dev/sdb2&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Segundo disco r&iacute;gido
-SCSI - Segunda parti&ccedil;&atilde;o
-<br>/dev/sdb3&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Segundo disco r&iacute;gido
-SCSI - Terceira parti&ccedil;&atilde;o
-<p>&nbsp;&nbsp;&nbsp; No exemplo acima foram usadas 3 parti&ccedil;&otilde;es
-por disco, mas podem existir mais parti&ccedil;&otilde;es no mesmo disco,
-um exemplo &eacute; se o disco r&iacute;gido possuir <b>parti&ccedil;&otilde;es
-L&oacute;gicas</b>, que s&atilde;o identificadas no sistemas a partir de
-<b>/dev/hdx5</b>.
-<br>&nbsp;
-<p>&nbsp;&nbsp;&nbsp; Abaixo um exemplo de como o Linux identifica as parti&ccedil;&otilde;es
-em cada disco existente em seu computador:
-<p>Vamos supor que eu tenha 2 discos r&iacute;gidos:
-<br>o 1&ordm;disco de <i>2GB</i> e o 2&ordm;disco&nbsp; de <i>1GB</i>(Giga
-Byte ou 1.000 Megas!)
-<p>&nbsp;&nbsp;&nbsp; No primeiro disco(de <i>2GB</i>), a primeira parti&ccedil;&atilde;o
-&eacute; de <b>800MB</b> do tipo <b>FAT16</b>(DOS), a segunda parti&ccedil;&atilde;o
-&eacute; de <b>1.2GB</b> do tipo <b>EXT2</b>(Linux)(1.2GB+800MB=2GB que
-&eacute; a capacidade total do disco). Assim as parti&ccedil;&otilde;es
-seriam identificadas da seguinte forma no Linux:
-<p><i>/dev/hda&nbsp;</i>&nbsp; - Disco r&iacute;gido Prim&aacute;rio Principal
-<br><i>/dev/hda1</i> - Primeira parti&ccedil;&atilde;o do primeiro disco
-r&iacute;gido (de <b>800MB</b> do tipo <b>DOS</b>)
-<br><i>/dev/hda2</i> - Segunda parti&ccedil;&atilde;o do primeiro disco
-r&iacute;gido( de <b>1.2GB</b> do tipo <b>Linux</b>)
-<p>&nbsp;&nbsp;&nbsp; Neste caso estariam dispon&iacute;veis 800MB para
-serem usados com o DOS e 1.2GB para o Linux.&nbsp;&nbsp;&nbsp;&nbsp; Por
-exemplo, se voce particionar um disco r&iacute;gido em duas partes e usar
-as duas parti&ccedil;&otilde;es no DOS, ele reconhecer&aacute; as parti&ccedil;&otilde;es
-como sendo <b>C:</b> e <b>D:</b>.
-<p><b>Lembre-se</b>: Quando um disco &eacute; particionado, nenhuma parti&ccedil;&atilde;o
-interfere na outra, repare que
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-quando voce particiona(divide) um disco,&nbsp; &eacute; como se tivesse
-dois discos r&iacute;gidos(o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&uacute;nico cuidado que voce deve tomar &eacute; com as c&oacute;pias
-de seguran&ccedil;a, porque se der um
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-problema de parte eletr&ocirc;nica no disco r&iacute;gido, por exemplo,
-a sua placa controladora
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-queimar ou o cabe&ccedil;ote dele ir pro espa&ccedil;o, voce perder&aacute;
-as suas 2 parti&ccedil;&otilde;es que est&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-armazenadas nele.
-<br>&nbsp;
-<p>Voltando ao exemplo das classifica&ccedil;&otilde;es das parti&ccedil;&otilde;es
-do disco, vamos para o segundo disco:
-<p>&nbsp;&nbsp;&nbsp; No segundo disco(1GB), eu tenho uma parti&ccedil;&atilde;o
-de <b>950MB</b> do tipo <b>FAT16</b>(DOS), que costumo usar para armazenar
-arquivos tempor&aacute;rios e c&oacute;pias de seguran&ccedil;a de meu
-sistema, etc..., e outra de <b>50MB</b> SWAP(Parti&ccedil;&atilde;o de
-mem&oacute;ria virtual como descrevi acima)(950MB+50MB=1GB). Ent&atilde;o
-as parti&ccedil;&otilde;es deste disco seriam identificadas da seguinte
-forma no Linux:
-<p><i>/dev/hdb&nbsp;</i>&nbsp; - Disco r&iacute;gido principal escravo
-<br><i>/dev/hdb1</i> - Primeira parti&ccedil;&atilde;o do disco acima (
-de 950MB do tipo DOS)
-<br><i>/dev/hdb2</i> - Segunda parti&ccedil;&atilde;o do disco acima (
-de 50MB do tipo SWAP)
-<p>&nbsp;&nbsp;&nbsp; No disco acima, <b>950MB</b> est&atilde;o dispon&iacute;veis
-para serem usados pelo <i>DOS</i> e <b>50 MB</b> pela mem&oacute;ria virtual
-(<i>SWAP</i>) do Linux.
-<p>&nbsp;&nbsp;&nbsp; Note que se voce utiliza o <i>MS-DOS</i>, voce n&atilde;o
-conseguir&aacute; ver as parti&ccedil;&otilde;es do <i>Linux</i> e <i>SWAP</i>,
-porque s&atilde;o imcompat&iacute;veis com o formato aceito pelo <i>DOS</i>
-(ele identificaria a primeira parti&ccedil;&atilde;o do primeiro disco(<b>800MB</b>)
-como a unidade C: e a primeira parti&ccedil;&atilde;o do segundo disco(<b>950MB</b>)
-como unidade D), mas o contr&aacute;rio n&atilde;o acontece; O <i>Linux</i>
-tem total compatibilidade com a parti&ccedil;&atilde;o
-<br><i>DOS FAT12, FAT16, FAT32, OS/2 HPFS,</i> e muitas outras.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="1.6"></a><u><font size=+1>1.6-) Tipos de parti&ccedil;&otilde;es
-de discos</font></u></center>
-
-<p>&nbsp;&nbsp; As parti&ccedil;&otilde;es de disco s&atilde;o divididas
-em tres tipos: <b>Prim&aacute;ria, Extendida</b> e <b>L&oacute;gica</b>.
-<br>&nbsp;&nbsp; Pode se ter, no m&aacute;ximo, <b>4</b> parti&ccedil;&otilde;es
-<i>Prim&aacute;rias</i>
-e <i>Extendidas</i> no mesmo disco (3 Prim&aacute;rias e 1 Extendida ou
-4 parti&ccedil;&otilde;es Prim&aacute;rias em cada disco).
-<br>A parti&ccedil;&atilde;o <i>Prim&aacute;ria</i> permite o armazenamento
-de arquivos e diret&oacute;rios. Todos os computadores que possuem somente
-a unidade <i>C: </i>(supondo que utilize o DOS), utilizam este tipo de
-parti&ccedil;&atilde;o para armazenamento de arquivos e inicializa&ccedil;&atilde;o
-do sistema operacional.
-<br>&nbsp;&nbsp;&nbsp; Se for preciso criar mais que <i>4</i> parti&ccedil;&otilde;es
-no mesmo disco, ser&aacute; necess&aacute;rio criar uma parti&ccedil;&atilde;o
-<i>Extendida</i>.
-A parti&ccedil;&atilde;o Extendida n&atilde;o pode ser utilizada para armazenar
-arquivos. Ela &eacute; usada para a cria&ccedil;&atilde;o de outras parti&ccedil;&otilde;es,
-dentro dela, que s&atilde;o chamadas de parti&ccedil;&otilde;es <i>L&oacute;gicas</i>.
-<br>&nbsp;&nbsp;&nbsp; Uma parti&ccedil;&atilde;o <i>Extendida</i> podem
-conter v&aacute;rias parti&ccedil;&otilde;es <i>L&oacute;gicas</i>. As
-parti&ccedil;&otilde;es <i>L&oacute;gicas</i> podem armazenar arquivos
-e diret&oacute;rios(como as parti&ccedil;&otilde;es prim&aacute;rias).
-<br>&nbsp;&nbsp;&nbsp; Um mesmo disco r&iacute;gido pode armazenar mais
-de 64 parti&ccedil;&otilde;es independentes uma das outras.
-<p><b>LEMBRE-SE</b>: Os arquivos e diret&oacute;rios podem ser armazenados
-somente em parti&ccedil;&otilde;es de disco prim&aacute;rias ou l&oacute;gicas,
-a parti&ccedil;&atilde;o extendida n&atilde;o &eacute; usada para armazanamento
-de arquivos e diret&oacute;rios.
-<p>&nbsp;&nbsp; Se possuir duas parti&ccedil;&otilde;es em seu computador
-(<b>C:</b> e <b>D:</b> no DOS), e n&atilde;o estiver usando a parti&ccedil;&atilde;o
-<b>D:</b>,
-a instala&ccedil;&atilde;o do Linux pode ser feita nesta parti&ccedil;&atilde;o
-desde que ela tenha o espa&ccedil;o necess&aacute;rio para o sistema operacional
-Linux, os programas que desejar instalar, mais a parti&ccedil;&atilde;o
-SWAP.&nbsp;
-<div align=right>
-<br><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="1.7"></a><u><font size=+1>1.7-) Observa&ccedil;&otilde;es
-sobre o formato DOS 6.XX(FAT 16)</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp; No formato <b>DOS 6.XX(FAT16)</b>, o primeiro
-setor da &aacute;rea de dados da parti&ccedil;&atilde;o &eacute; utilizado
-frequentemente pelo DOS para armazenamento de dados sobre a parti&ccedil;&atilde;o
-de disco, e estes dados s&atilde;o usados pelo sistema para se ter maior
-confiabilidade do que os dados armazenados na tabela de parti&ccedil;&atilde;o.
-O sistema de arquivos DOS, faz o FDISK(do DOS) limpar os primeiros 512
-bytes da &aacute;rea de dados da parti&ccedil;&atilde;o sempre que uma
-mudan&ccedil;a de tamanho acontecer.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; O formatador do DOS(<b>format</b>) verifica
-este primeiro setor toda vez que a up&ccedil;&atilde;o <b>/U</b> (que &eacute;
-utilizada para n&atilde;o salvar dados para se fazer a desformata&ccedil;&atilde;o
-do disco) foi utilizada.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Isto &eacute; considerado uma FALHA no <b>Format</b>(do
-DOS) e no <b>Fdisk</b>(do DOS).
-<p>&nbsp;&nbsp;&nbsp;&nbsp; A op&ccedil;&atilde;o abaixo deve ser utilizada
-caso voce crie uma parti&ccedil;&atilde;o do DOS FAT16 com o CFdisk, que
-faz com que os primeiros 512 bytes daquela parti&ccedil;&atilde;o sejam
-"limpos", para manter a compatibilidade com o DOS. Utilize esta op&ccedil;&atilde;o
-dentro do Linux, ap&oacute;s criar a parti&ccedil;&atilde;o com o CFdisk
-e reiniciar o seu computador. Foi notado que esta op&ccedil;&atilde;o s&oacute;
-funciona corretamente somente quando o Sistema Linux estiver instalado
-em seu computador. N&atilde;o me responsabilizo caso utiliza-la a partir
-de um disquete de recupera&ccedil;&atilde;o.
-<p><b>dd if=/dev/zero of=/dev/hdx1 bs=512 count=1</b>
-<p><b>onde:</b>
-<br><i>hdx1</i> - &Eacute; a identifica&ccedil;&atilde;o da unidade de
-disco e a parti&ccedil;&atilde;o que foi criada&nbsp; pelo CFdisk utilizando
-o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sistema
-de arquivos DOS que ter&aacute; seu primeiro setor "limpo".
-<br>&nbsp;
-<p><b>OBS1</b>: Cuidado ao utilizar esta op&ccedil;&atilde;o, um pequeno
-descuido pode resultar na perda de dados do
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-seu disco r&iacute;gido ou outras parti&ccedil;&atilde;o.
-<br><b>OBS2</b>: N&atilde;o utilize este comando com parti&ccedil;&otilde;es
-que utilizam o sistema de arquivos <i>FAT32</i>(utilizada
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-nos sistemas operacionais Windows 95 OSR/2 e superiores) .Se esta op&ccedil;&atilde;o
-for utilizada
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-em um disco utlizando este sistema de arquivos, sua FAT ser&aacute; corrompida,
-caso isto
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-acontecer, ser&aacute; necess&aacute;ria a re-formata&ccedil;&atilde;o
-da parti&ccedil;&atilde;o.
-<br><b>OBS3</b>: &Eacute; extremamente recomendado que se utilize o programa
-de particionamento que
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; acompanha&nbsp;
-o seu sistema operacional. Por exemplo, se deseja criar&nbsp; uma parti&ccedil;&atilde;o
-DOS
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 6.XX,
-utilize o FDisk qua acompanha o DOS.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2"></a><u><font size=+1>2-) Iniciando o programa CFdisk</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Para entrar no programa CFdisk digite:
-<p><i>cfdisk</i> &lt;unidade>
-<p><b>onde:</b>
-<br><i>unidade</i> - &eacute; a unidade de disco que deseja utilizar para
-fazer o particionamento. A unidade pode
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-ser:&nbsp; /dev/hda, /dev/hdb, /dev/hdc ..., /dev/sda, /dev/sdb...,etc
-<p><b>NOTA:</b> Se voce n&atilde;o digitar a unidade, o cfdisk utilizar&aacute;
-a unidade <i>/dev/hda</i> como padr&atilde;o.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.1"></a><u><font size=+1>2.1-) Op&ccedil;&otilde;es de
-linha de comando utilizadas com o CFdisk</font></u></center>
-
-<p>&nbsp; Op&ccedil;&otilde;es de linha de comando fazem com que o programa
-inicie de forma espec&iacute;fica ou personalizada. As op&ccedil;&otilde;es
-devem ser digitadas ap&oacute;s o nome do programa (cfdisk).
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>cfdisk</b> &lt;<i>unidade</i>>
-&lt;<i> -avz</i> > &lt; -<i>c cilindros </i>> &lt; <i>-h cabe&ccedil;otes
-</i>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&lt; <i>-s&nbsp; setores_por trilha </i>> &lt; <i>-P opt</i> > &lt; <i>dispositivo</i>
->
-<p><b>onde:</b>
-<br><i>-a</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Usa um cursor seta
-ao inv&eacute;s de video reverso para destacar a
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; parti&ccedil;&atilde;o
-atual.
-<br><i>-v</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Mostra a vers&atilde;o
-do programa e Coyright(Direitos Reservados).
-<br><i>-z&nbsp;</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Ignora a leitura
-da tabela das parti&ccedil;&otilde;es existentes no disco
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ao iniciar o
-CFdisk.
-<p><i>-c</i> N&uacute;mero de Cilindros do disco
-<br><i>-h</i> N&uacute;mero de Cabe&ccedil;otes do disco
-<br><i>-s</i> Setores por trilha existentes no disco.
-<br><i>-P</i> <i>OPC</i>&nbsp;&nbsp;&nbsp; Mostra a tabela de parti&ccedil;&atilde;o
-no formato especifico.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>OPC</i> -
-Pode ser:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-<i>r</i> - Mostra a tabela de parti&ccedil;&atilde;o em Formato RAW
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-<i>s</i> - Mostra a tabela de parti&ccedil;&atilde;o em Format de Setores
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-<i>t</i> -&nbsp; Mostra a tabela de parti&ccedil;&atilde;o classificada
-pelo n&uacute;mero da parti&ccedil;&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Para maiores detalhes, veja <a href="#2.3.9">O comando Print &lt;p></a>.
-<p><b>OBS:</b> A utiliza&ccedil;&atilde;o dos par&acirc;metros -c -h -s,
-substituir&atilde;o os par&acirc;metros da BIOS da placa, utilize
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; estas op&ccedil;&otilde;es
-se sua bios n&atilde;o utilizar estes par&acirc;metros ou se mostrar valores
-incorretos.
-<p>&nbsp;&nbsp;&nbsp; Ap&oacute;s entrar o programa CFdisk, ele verificar&aacute;
-automaticamente o tamanho do Disco R&iacute;gido, se n&atilde;o conseguir,
-o programa ser&aacute; terminado.
-<br>&nbsp;&nbsp;&nbsp; Para resolver este problema, especifique o tamanho
-do disco em cilindros, cabe&ccedil;as, e setores na linha de comando que
-inicia o programa. Este problema geralmente acontece quando se tenta particionar
-uma unidade de disco <i>SCSI</i> que esteja conectada a uma placa controladora
-que n&atilde;o possui <i>BIOS</i>, e&nbsp; quando&nbsp; uma&nbsp; <i>BIOS</i>&nbsp;
-mostra&nbsp; os&nbsp; valores&nbsp; da&nbsp; geometria&nbsp; do&nbsp; disco(tamanho)
-<br>incorretamente.
-<br>&nbsp;&nbsp;&nbsp; O pr&oacute;ximo passo do CFdisk &eacute; fazer
-a leitura das parti&ccedil;&otilde;es atuais do disco, se n&atilde;o conseguir,
-o programa ser&aacute; terminado. O &uacute;nico motivo para o CFdisk mostrar
-esta mensagem de erro, &eacute; se voce digitar par&acirc;metros incorretos
-para o tamanho do disco, caso tenha acontecido o problema
-<br>descrito no paragrafo anterior. Verifique se os par&acirc;metros foram
-digitados incorretamente, se os par&acirc;metros estiverem digitados corretamente
-e mesmo assim o programa continua dando erro na leitura das parti&ccedil;&otilde;es,
-utilize a op&ccedil;&atilde;o <i>-z</i> na linha de comando do programa,
-que faz com que ele ignore a leitura das parti&ccedil;&otilde;es existentes
-no disco ao iniciar .
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.2"></a><u><font size=+1>2.2-) Conhecendo a Tela do CFdisk</font></u></center>
-
-<p>&nbsp;&nbsp; Ap&oacute;s digitar CFdisk, ser&aacute; mostrada a tela
-principal onde voce poder&aacute; acionar os comandos para manipula&ccedil;&atilde;o
-das parti&ccedil;&otilde;es de disco, e visualizar as parti&ccedil;&otilde;es
-de disco atuais e outros dados.
-<br>Abaixo o exemplo e explica&ccedil;&otilde;es sobre esta tela.
-<p>O disco utilizado para os exemplos &eacute; um disco de <b>5157 MB</b>
-de Capacidade com:
-<br>- <i>10672</i> Cilindros&nbsp; <i>15</i> Cabe&ccedil;as&nbsp; <i>63</i>
-Setores (no modo <b>C/H/S</b>)
-<br>- <i>627</i> Cilindros&nbsp;&nbsp; <i>255</i> Cabe&ccedil;as&nbsp;<i>
-63</i> Setores (no modo <b>LBA</b>)
-<br>&nbsp;&nbsp; A unidade de medida utilizada pelo CFdisk para mostrar
-os par&acirc;metros do disco ser&aacute; o mesmo configurado na BIOS, ou
-seja, se estiver utilizando o disco com o modo de opera&ccedil;&atilde;o
-em <i>LBA</i>, os valores de cilindros, cabe&ccedil;as e setores motrados
-pelo CFdisk sera em <b>LBA</b>.
-<br>&nbsp;
-<p>---------------------------------------------------------------------------------------------------
-<center>CFdisk 0.8l
-<br>Disk Drive: /dev/hda
-<br>Heads:255&nbsp; Sectores per track:63&nbsp; Cylinders:627</center>
----------------------------------------------------------------------------------------------------
-<br>Name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Flags&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Part Type&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; FSType&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-[LABEL]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Size(MB)
-<br>hda1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Boot&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Primary&nbsp;&nbsp;&nbsp;&nbsp; Win 95 FAT 32&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1953.12
-<br>hda5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Logical&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT 16 (BIG)&nbsp;&nbsp;&nbsp; GLEYDSON&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-172.58
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Pri/Log&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Free Space&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-2910.55
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<p>[Bootable]&nbsp;&nbsp; [Delete]&nbsp;&nbsp; [Help]&nbsp;&nbsp; [Maximize]&nbsp;&nbsp;
-[Print]
-<br>[Quit]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [Type]&nbsp;&nbsp;&nbsp;&nbsp;
-[Units]&nbsp; [Write]
-<br>----------------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp;&nbsp; No cabe&ccedil;alho da tela, &eacute; mostrada
-a vers&atilde;o do programa, a unidade de disco que ser&aacute; usada no
-particionamento e os par&acirc;metros de tamanho do disco(cabe&ccedil;otes,
-cilindros e setores).
-<br>Abaixo do cabe&ccedil;alho ap&oacute;s a linha pontilhada, se encontra
-a &aacute;rea das parti&ccedil;&otilde;es.
-<p><b>onde:</b>
-<br>- <i>Name</i>&nbsp; : &eacute; o nome da(s) parti&ccedil;&atilde;o(&otilde;es)
-de Disco.
-<br>- <i>Flags</i>&nbsp;&nbsp; : Se estiver marcada como BOOT, ser&aacute;
-poss&iacute;vel iniciar o sistema a partir desta parti&ccedil;&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(quando n&atilde;o se utiliza um Boot Manager). Se estiver marcada como
-NC (N&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-compat&iacute;vel)&nbsp; significa que esta parti&ccedil;&atilde;o n&atilde;o
-&eacute; compat&iacute;vel com o DOS, OS/2, etc. Para
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-maiores detalhes, veja <a href="#2.3.7">O comando Maximize &lt;m></a>.
-<br>- <i>Type</i>&nbsp;&nbsp; : O tipo da parti&ccedil;&atilde;o pode ser
-Prim&aacute;ria ou L&oacute;gica. Para espa&ccedil;o n&atilde;o particionado,
-o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-tipo da parti&ccedil;&atilde;o pode ser Prim&aacute;rio/Log.
-<br>- <i>FileSystems</i> : Tipo de Sistema de Arquivos que &eacute; usado
-naquela parti&ccedil;&atilde;o. Se o sistema de
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-arquivos for desconhecido, ele ser&aacute; mostrado como um valor Hexadecimal.
-Um
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-caso especial ocorre quando h&aacute; Parti&ccedil;&otilde;es do Disco
-R&iacute;gido que n&atilde;o podem ser
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-usadas ( porque toda a parti&ccedil;&atilde;o prim&aacute;ria esta em uso).
-Quando isto &eacute; detectado, o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-tipo de FileSystems &eacute; mostrado como n&atilde;o us&aacute;vel(Unusable)
-para cria&ccedil;&atilde;o de novas
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-parti&ccedil;&otilde;es.
-<br>- Label&nbsp;&nbsp; : Nome de volume da parti&ccedil;&atilde;o de disco.
-Os nomes de parti&ccedil;&otilde;es FAT32,&nbsp; n&atilde;o s&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-mostrados com esta vers&atilde;o do CFdisk.
-<br>- Size&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : Mostra o tamanho que cada parti&ccedil;&atilde;o
-ocupa no disco r&iacute;gido em&nbsp; MegaBytes (por
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-padr&atilde;o).
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Tamb&eacute;m pode mostrar o tamanho ocupado por Setores ou Cilindros.
-Se for mostrado
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-um asterisco (*) ap&oacute;s o tamanho, isto diz que a parti&ccedil;&atilde;o
-n&atilde;o esta alinhada com Cilindro.
-<p>&nbsp;&nbsp; O espa&ccedil;o livre existente no disco para cria&ccedil;&atilde;o
-de novas parti&ccedil;&otilde;es, &eacute; mostrado como uma outra parti&ccedil;&atilde;o,
-com o FSType(<i>sistema de arquivos</i>) Free Space(<i>espa&ccedil;o Livre</i>).
-<p><b>OBS:</b> As parti&ccedil;&otilde;es de disco Extendidas n&atilde;o
-s&atilde;o mostradas na tela do CFdisk durante o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; particionamento,
-mesmo assim, as parti&ccedil;&otilde;es l&oacute;gicas que este tipo de
-parti&ccedil;&atilde;o armazena,
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ser&atilde;o
-mostradas a partir de hdx5 ou sdx5.
-<p>&nbsp;&nbsp;&nbsp; No rodap&eacute; da tela, encontramos os comandos
-utilizados pelo CFdisk para manipular as parti&ccedil;&otilde;es de disco.
-Os comandos s&atilde;o mostrados entre Chaves [].
-<br>&nbsp;&nbsp;&nbsp; Todos os comandos no rodap&eacute; da tela, s&atilde;o
-aplicaveis somente para a parti&ccedil;&atilde;o que estiver destacada
-com a barra(video reverso).&nbsp; Veja descri&ccedil;&otilde;es dos comandos
-do CFdisk para mais detalhes.
-<br>&nbsp;&nbsp;&nbsp; Abaixo do rodap&eacute; da tela, &eacute; mostrada
-a descri&ccedil;&atilde;o do comando que estiver em destaque com o cursor
-em video reverso.
-<p>&nbsp;&nbsp;&nbsp; Veja abaixo a tradu&ccedil;&atilde;o da tela principal
-do programa CFdisk:
-<br>---------------------------------------------------------------------------------------------------
-<center>CFdisk 0.8l
-<br>Unidade de Disco: /dev/hda
-<br>Cabe&ccedil;as:255&nbsp; Setores por trilha:63&nbsp; Cilindros:627</center>
----------------------------------------------------------------------------------------------------
-<br>Nome&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Op&ccedil;&otilde;es&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Tipo Part.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Tipo Sist. Arquivos&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-[VOLUME]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Tamanho(MB)
-<br>hda1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Boot&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Primary&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Win
-95 FAT 32&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1953.12
-<br>hda5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Logical&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT 16 (BIG)&nbsp;&nbsp;&nbsp;&nbsp;
-GLEYDSON&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-172.58
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Pri/Log&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Espa&ccedil;o Livre&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-2910.55
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<p>[Inicializ&aacute;vel]&nbsp;&nbsp;&nbsp; [Apagar]&nbsp;&nbsp;&nbsp;
-[Ajuda]&nbsp;&nbsp;&nbsp;&nbsp; [Maximizar]&nbsp;&nbsp;&nbsp; [Imprimir]
-<br>[Sair]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-[Tipo]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [Unidades][Gravar]
-<br>----------------------------------------------------------------------------
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3"></a><u><font size=+1>2.3-) Descri&ccedil;&atilde;o
-dos comandos do CFdisk</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Os comandos do programa s&atilde;o utilizados criar
-parti&ccedil;&otilde;es, entrar na ajuda do programa, alterar o tipo da
-parti&ccedil;&atilde;o, apagar uma parti&ccedil;&atilde;o, etc.
-<br>&nbsp;&nbsp;&nbsp; Pode ser utilizado Seta p/ Esquerda e Seta p/ direita
-para se movimentar entre os comandos, quando o cursor estiver em cima do
-comando que deseja executar, pressione &lt;Enter>.
-<br>&nbsp;&nbsp;&nbsp; Outro m&eacute;todo que se pode utilizar para acionar
-uma op&ccedil;&atilde;o do CFdisk, &eacute; pressionando a primeira letra
-de cada op&ccedil;&atilde;o, automaticamente a op&ccedil;&atilde;o &eacute;
-executada(sem ter que pressionar &lt;Enter>). Neste m&eacute;todo, todos
-os comandos aceitam letras mai&uacute;sculas e min&uacute;sculas, exceto
-o comando Write(gravar parti&ccedil;&atilde;o) que &eacute; executado somente
-se pressionar &lt;W> mai&uacute;scula, para evitar
-<br>grava&ccedil;&otilde;es acidentais o disco.
-<br>&nbsp;&nbsp;&nbsp; Quando estiver em um Sub-Menu e desejar retornar
-ao menu principal, pressione a tecla &lt;Esc>.&nbsp;
-<div align=right>
-<br><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.1"></a><u><font size=+1>2.3.1-) Setas Acima e Abaixo/
-Esquerda e Direita (Movimenta&ccedil;&atilde;o do Cursor)</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Setas Acima e Abaixo s&atilde;o utilizadas para se
-movimentar entre as parti&ccedil;&otilde;es existentes no disco e espa&ccedil;o
-livre, selecionando-a para que seja utilizada as op&ccedil;&otilde;es do
-CFdisk.
-<br>&nbsp;&nbsp;&nbsp; Setas Esquerda e Direita s&atilde;o utilizadas para
-selecionar entre as op&ccedil;&otilde;es dipon&iacute;veis do programa(que
-ser&atilde;o explicadas abaixo). Para confirmar uma op&ccedil;&atilde;o,
-pressione &lt;Enter>.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.2"></a><u><font size=+1>2.3.2-) &lt;CTRL>+&lt;l></font></u></center>
-
-<p>&nbsp;&nbsp; Este comando &eacute; utilizado para atualizar a tela manualmente
-caso a atualiza&ccedil;&atilde;o autom&aacute;tica falhar, por exemplo,
-quando uma parti&ccedil;&atilde;o for excluida, e continuar a ser mostrada
-na tela.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.3"></a><u><font size=+1>2.3.3-) Boot &lt;b></font></u></center>
-
-<p>&nbsp;&nbsp; Este comando permite escolher se a parti&ccedil;&atilde;o
-Prim&aacute;ria atual ser&aacute; utilizada para iniciar o sistema(BOOT).
-Selecione esta op&ccedil;&atilde;o para selecionar entre parti&ccedil;&atilde;o
-inicializ&aacute;vel ou n&atilde;o inializ&aacute;vel. Quando uma parti&ccedil;&atilde;o
-estiver marcada como inicializ&aacute;vel, aparecer&aacute; a palavra BOOT
-na coluna Flags(na tela principal do programa).
-<p><b>OBS:</b> N&atilde;o ser&aacute; necess&aacute;rio marcar a parti&ccedil;&atilde;o
-Linux como inicializ&aacute;vel, caso se esteja utilizando um
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Boot Manager(como
-o <i>LILO</i>) para escolher qual sistema operacional sera utilizado para
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; inicializar o sistema.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.4"></a><u><font size=+1>2.3.4-) Delete &lt;d></font></u></center>
-
-<p>&nbsp;&nbsp; Este comando apaga a parti&ccedil;&atilde;o selecionada
-do disco. Ap&oacute;s apagar a parti&ccedil;&atilde;o, o espa&ccedil;o
-ocupado por ela &eacute; convertido para espa&ccedil;o livre.
-<br>&nbsp; A parti&ccedil;&atilde;o marcada atualmente como Free Space
-ou como Unusable n&atilde;o pode ser apagada.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.5"></a><u><font size=+1>2.3.5-) Geometry &lt;g></font></u></center>
-
-<p>&nbsp;&nbsp; Este comando n&atilde;o &eacute; mostrado no menu, pois
-&eacute; utilizado para alterar o tamanho (Cilindros, Cabe&ccedil;as e
-Setores do disco). Este comando s&oacute; pode ser acionado se for pressionada
-a tecla &lt;g>.
-<p><b>CUIDADO:</b> Esta op&ccedil;&atilde;o &eacute; recomendada somente
-para aqueles que sabem os riscos que o uso
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-desta op&ccedil;&atilde;o pode fazer, e se a situa&ccedil;&atilde;o que
-est&atilde;o, requerem o seu uso.
-<br>&nbsp;&nbsp; Uma situa&ccedil;&atilde;o que esta op&ccedil;&atilde;o
-&eacute; util, &eacute; se o BIOS do seu computador n&atilde;o mostrar
-corretamente os par&acirc;metros do disco(Cilindros, Cabe&ccedil;otes ou
-Setores), sendo necess&aacute;rio que se passe manualmente o tamanho do
-disco para que seja feito o correto particionamento do disco.
-<p><b>OBS:</b> Caso seu disco r&iacute;gido for <i>SCSI</i> e placa controladora
-dele n&atilde;o tiver BIOS,&nbsp; provavelmente o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CFdisk n&atilde;o
-ser&aacute; iniciado. Se este problema ocorrer, digite os par&acirc;metros
-do disco na linha
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; de comando ao
-iniciar o programa. Para maiores detalhes, veja op&ccedil;&otilde;es de
-linha de comando
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; do CFdisk..
-<p>Ap&oacute;s pressionar &lt;g> ser&aacute; mostrada a seguinte tela:
-<p>----------------------------------------------------------------------------------------------------
-<center>CFdisk 0.8l
-<br>Disk Drive: /dev/hda
-<br>Heads:255&nbsp; Sectors:63&nbsp; Cilinders:627</center>
-----------------------------------------------------------------------------------------------------
-<br>Name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Flags&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Part Type&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; File
-System&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-[LABEL]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Size(MB)
-<p>hda1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Boot&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Primary&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Win 95 FAT
-32&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1953.12
-<br>hda5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Logical&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT 16 (BIG)&nbsp;&nbsp;&nbsp;&nbsp;
-GLEYDSON&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 172.58
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Pri/Log&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Espa&ccedil;o Livre&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-2910.55
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<p>[ Cylinders]&nbsp; [Heads]&nbsp; [Sectors]&nbsp; [Done]
-<p>----------------------------------------------------------------------------
-<br><b>onde:</b>
-<br><i>Cylinders&nbsp; </i>: Altera o n&uacute;mero de Cilindros do disco
-atual durante o particionamento.
-<br><i>Heads</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : Altera o n&uacute;mero
-de Cabe&ccedil;as do disco atual durante o particionamento.
-<br><i>Sectors</i>&nbsp;&nbsp;&nbsp;&nbsp; : Altera o n&uacute;mero de
-Setores do disco atual durante o particionamento.
-<br><i>Done</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : Quando finalizar
-as altera&ccedil;&otilde;es, tecle &lt;d> ou selecione Done para
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-que o CFdisk modifique os valores de Cilindros, Cabe&ccedil;as e Setores
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-que utiliza para particionar o disco e retorne a tela anterior.
-<br>&nbsp;
-<p>&nbsp;&nbsp;&nbsp;&nbsp; Quando escolher algum par&acirc;metro acima
-para altera&ccedil;&atilde;o(Cilindros, cabe&ccedil;otes ou Setores do
-disco), ser&aacute; vista uma tela como esta:
-<br>----------------------------------------------------------------------------------------------------
-<center>CFdisk 0.8l
-<br>Disk Drive: /dev/hda
-<br>Heads:255&nbsp; Sectors:63&nbsp; Cilinders:627</center>
-----------------------------------------------------------------------------------------------------
-<br>Name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Flags&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Part Type&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-File System&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-[LABEL]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Size(MB)
-<p>hda1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Boot&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Primary&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Win 95 FAT 32&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1953.12
-<br>hda5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Logical&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS
-FAT 16 (BIG)&nbsp;&nbsp;&nbsp;&nbsp; GLEYDSON&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-172.58
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Pri/Log&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Espa&ccedil;o Livre&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-2910.55
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<p>Enter the number of Cylinders: 627
-<p>----------------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp;&nbsp; O valor que aparece ao selecionar a op&ccedil;&atilde;o,
-&eacute; o valor que o disco esta utilizando atualmente (<i>cilindros</i>),
-e ser&aacute; pedido que digite um valor para os Cilindros, que substituir&aacute;
-os da BIOS durante a se&ccedil;&atilde;o de particionamento.&nbsp; Para
-sair desta tela sem alterar o valor, pressione &lt;ESC>. A mesma tela e
-explica&ccedil;&atilde;o se aplicam para as altera&ccedil;&otilde;es de
-Cabe&ccedil;as e Setores.
-<p><b>OBS:</b> Se por acaso digitar um valor incorretamente para o tamanho
-do disco e&nbsp;&nbsp;&nbsp;&nbsp; n&atilde;o se lembrar
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; mais do valor
-antigo ou original, selecione a op&ccedil;&atilde;o Done, e&nbsp; tecle
-&lt;q> para sair do CFdisk
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sem gravar as altera&ccedil;&otilde;es
-feitas para o disco, pois se continuar a utilizar o CFdisk com o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; tamanho do disco incorreto,
-os dados existentes nele e at&eacute; mesmo parti&ccedil;&otilde;es poder&atilde;o
-ser
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; perdidos(as).
-<p>&nbsp;&nbsp; Se aumentar o tamanho do disco, setores adicionais s&atilde;o
-acrescentados no final do disco, e s&atilde;o mostrados como espa&ccedil;o
-livre.
-<br>&nbsp;&nbsp; Se diminuir o tamanho do disco, as parti&ccedil;&otilde;es
-que estavam localizadas ap&oacute;s o setor/cilindro que foi excluido(se
-existir alguma), ser&aacute; apagada e a &uacute;ltima parti&ccedil;&atilde;o(ou
-espa&ccedil;o livre ao final do disco r&iacute;gido), ter&aacute; seu tamanho
-alterado e terminar&aacute; neste "novo" &uacute;ltimo setor do disco.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.6"></a><u><font size=+1>2.3.6-) Help &lt;h> ou &lt;?></font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; O comando Help mostra a tela de ajuda do programa,
-que descreve as fun&ccedil;&otilde;es das teclas utilizadas pelo programa
-e suas fun&ccedil;&otilde;es.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.7"></a><u><font size=+1>2.3.7-) Maximize &lt;m></font></u></center>
-
-<p>&nbsp;&nbsp; Este comando aumenta a utiliza&ccedil;&atilde;o de espa&ccedil;o
-do disco na parti&ccedil;&atilde;o atual. Isto porque o <i>DOS</i>, <i>OS/2</i>
-e outros sistemas operacionais utilizam o primeiro setor da primeira trilha
-da parti&ccedil;&atilde;o do disco e em todas as <i>parti&ccedil;&otilde;es
-L&oacute;gicas</i> para iniciar o sistema operacional, utilizando a segunda
-trilha em diante daquela parti&ccedil;&atilde;o para fazer o armazenamento
-de arquivos. Este espa&ccedil;o perdido entre o <i>segundo</i> e o <i>&uacute;ltimo</i>
-Setor da primeira trilha da primeira cabe&ccedil;a, pode ser recuperado
-com a utilizando este comando.
-<br>&nbsp;&nbsp;&nbsp; Este comando faz com que a parti&ccedil;&atilde;o
-se torne imcompat&iacute;vel com <i>DOS</i>, <i>OS/2</i> e outros Sistemas
-Operacionais que utilizam este primeiro Setor do disco para iniciar o sistema
-operacional.
-<br>&nbsp;&nbsp; Se este comando for utilizado, ser&aacute; colocada uma
-op&ccedil;&atilde;o chamada <i>NC</i>(n&atilde;o compat&iacute;vel) em
-Flags(na tela principal do CFdisk).
-<br>&nbsp;&nbsp; Esta op&ccedil;&atilde;o faz o uso m&aacute;ximo do disco
-e a incompatibilidade com o <i>DOS/OS/2</i>, etc. O padr&atilde;o quando
-criando uma Parti&ccedil;&atilde;o, &eacute; criando Parti&ccedil;&otilde;es
-compativeis com o <i>DOS, OS/2</i>, etc.
-<p><b>OBS:</b> O Fdisk(vers&atilde;o 8 e superiores) e parti&ccedil;&otilde;es
-formatadas com o sistema de arquivos <i>FAT32</i>,
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; fazem a utiliza&ccedil;&atilde;o
-completa deste espa&ccedil;o entre o segundo e o &uacute;ltimo Setor da&nbsp;
-primeira trilha
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; do disco, eliminando
-o desperd&iacute;cio de espa&ccedil;o.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.8"></a><u><font size=+1>2.3.8-) New &lt;n></font></u></center>
-
-<p>&nbsp;&nbsp; O comando New&lt;n>, cria uma nova parti&ccedil;&atilde;o
-usando o espa&ccedil;o livre(FreeSpace) existente no disco. Ap&oacute;s
-escolher esta op&ccedil;&atilde;o, o CFdisk perguntar&aacute; se deseja
-criar uma <i>parti&ccedil;&atilde;o Prim&aacute;ria</i>, <i>L&oacute;gica</i>
-ou <i>Cancelar</i> o comando.
-<br>&nbsp;&nbsp;&nbsp; Escolhendo criar uma parti&ccedil;&atilde;o <i>Prim&aacute;ria</i>
-ou <i>L&oacute;gica</i>, o sistema perguntar&aacute; o tamanho da parti&ccedil;&atilde;o
-que deseja criar, por padr&atilde;o, o CFdisk mostrar&aacute; o espa&ccedil;o
-livre total dispon&iacute;vel no disco para a cria&ccedil;&atilde;o da
-nova parti&ccedil;&atilde;o(em MegaBytes). Tecle &lt;Enter> para criar
-uma parti&ccedil;&atilde;o do tipo escolhido com este tamanho ou digite
-um tamamho menor. O CFdisk permite que seja digitados valores em:
-<br>- <i>MegaBytes</i>(M - o padr&atilde;o do programa)
-<br>- <i>KiloBytes</i>(K)
-<br>- <i>Cilindros</i>(C)
-<br>- <i>Setores</i>(S)
-<br>Digitando-se o tamanho da parti&ccedil;&atilde;o seguida de uma das
-letras acima. Se a letra n&atilde;o for digitada,
-<br>o programa assumir&aacute; o tamanho que digitou em MegaBytes.
-<p><b>OBS1:</b> Quando criar uma parti&ccedil;&atilde;o L&oacute;gica,
-automaticamente ser&aacute; criada uma parti&ccedil;&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Extendida, entre hdx1 e hdx4, e a parti&ccedil;&atilde;o Extendida n&atilde;o
-&eacute;&nbsp; mostrada na tela de
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-particionamento de disco. Se desejar exibir a parti&ccedil;&atilde;o extendida,
-execute o comando
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-PRINT &lt;p> e escolha a op&ccedil;&atilde;o <i>Sector</i> para verificar
-qual &eacute; a identifica&ccedil;&atilde;o da <i>parti&ccedil;&atilde;o</i>
-<br><i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Extendida</i>&nbsp; no disco. Para maiores detalhes, veja o <a href="#2.3.9">comando
-PRINT &lt;p></a>.
-<br><b>OBS2</b>: S&atilde;o permitidas, no m&aacute;ximo, 4 parti&ccedil;&otilde;es
-<i>Prim&aacute;rias</i>
-e <i>Extendidas</i>(3 <i>Prim&aacute;rias</i> e 1
-<br><i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Extendida </i>ou 4 <i>parti&ccedil;&otilde;es Prim&aacute;rias</i> em cada
-disco). O CFdisk calcular&aacute;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-automaticamente os valores das parti&ccedil;&otilde;es L&oacute;gicas caso
-as primeiras 4 parti&ccedil;&otilde;es forem
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-ocupadas.
-<p>&nbsp;&nbsp;&nbsp; O pr&oacute;ximo passo, &eacute; a localiza&ccedil;&atilde;o
-da parti&ccedil;&atilde;o no espa&ccedil;o livre existente o disco. As
-duas op&ccedil;&otilde;es dispon&iacute;veis s&atilde;o:
-<br>- <i><u>Beginning</u></i> : A parti&ccedil;&atilde;o &eacute; colocada
-a partir do inicio do espa&ccedil;o livre no disco, ocupando o espa&ccedil;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-livre de acordo com o seu tamanho (do in&iacute;cio para o fim do espa&ccedil;o
-livre ), este &eacute; o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-padr&atilde;o para a cria&ccedil;&atilde;o de novas parti&ccedil;&otilde;es
-e o mais utilizado. Veja o exemplo,&nbsp; a
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-cria&ccedil;&atilde;o de uma parti&ccedil;&atilde;o de <b>30MB</b> em um
-disco com <b>50MB</b> de espa&ccedil;o n&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-particionado, sendo que este disco j&aacute; possui uma parti&ccedil;&atilde;o
-de <b>120MB</b>(com espa&ccedil;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-total de <b>170MB</b>).
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-##################################MMMMMMMMMMMMMMMMMMMMMM
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Parti&ccedil;&atilde;o existente(<b>120MB</b>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Espa&ccedil;o Livre(<b>50MB</b>)
-<br>&nbsp;
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-com a nova parti&ccedil;&atilde;o criada:
-<p>&nbsp;###################################################MMMMMMMMM
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Parti&ccedil;&atilde;o existente(<b>120</b>MB)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Nova parti&ccedil;&atilde;o&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Espa&ccedil;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(<b>30</b>MB)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Livre
-<p>-<i> <u>End&nbsp;</u></i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : A parti&ccedil;&atilde;o
-&eacute; criada subtraindo-se o espa&ccedil;o livre total do disco pelo
-tamanho da
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-parti&ccedil;&atilde;o&nbsp; que ser&aacute; criada, come&ccedil;ando a
-criar esta parti&ccedil;&atilde;o a partir do ponto que
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-resultou esta subtra&ccedil;&atilde;o.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Veja abaixo no exemplo, a parti&ccedil;&atilde;o que ser&aacute; criada
-ter&aacute; o tamanho de <b>30</b>MB e existe
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-no disco um espa&ccedil;o n&atilde;o particionado de <b>50</b>MB, com <b>120</b>MB
-j&aacute; ocupados por uma
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-parti&ccedil;&atilde;o existente:
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-##################################MMMMMMMMMMMMMMMMMMMMM
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Parti&ccedil;&atilde;o existente(<b>120</b>MB)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Espa&ccedil;o Livre(<b>50</b>MB)
-<br>&nbsp;
-<p>com a nova parti&ccedil;&atilde;o criada (Selecionando a op&ccedil;&atilde;o
-End):
-<p>##################################MMMMMMMMMM#################
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-|
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Parti&ccedil;&atilde;o existente(<b>120</b>MB)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Espa&ccedil;o&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Nova parti&ccedil;&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Livre&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(<b>30</b>MB)
-<p>&nbsp;&nbsp;&nbsp; A parti&ccedil;&atilde;o que ser&aacute; criada utilizara
-o espa&ccedil;o livre entre o &uacute;ltimo Setor do disco e o setor resultante
-da subtra&ccedil;&atilde;o(<b>170</b>MB-<b>30</b>MB). Mesmo assim, a ordem
-que ser&aacute; criada esta parti&ccedil;&atilde;o parti&ccedil;&atilde;o
-ser&aacute; criada do Setor inicial(que &eacute; o resultado da subtra&ccedil;&atilde;o)
-para o &uacute;ltimo Setor do disco. Existir&aacute; um espa&ccedil;o livre
-de <b>20</b>MB entre a primeira parti&ccedil;&atilde;o (de <b>120</b>MB)
-e a nova parti&ccedil;&atilde;o de <b>30</b>MB.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.9"></a><u><font size=+1>2.3.9-) Print &lt;p></font></u></center>
-
-<p>&nbsp;&nbsp; Este comando mostra a tabela de parti&ccedil;&atilde;o
-no formato selecionado na tela, ou permite que seja gravado um arquivo
-no disco. Todas as parti&ccedil;&otilde;es s&atilde;o classificadas na
-ordem que foram gravadas no disco.
-<p>Os formatos aceitos para visualiza&ccedil;&atilde;o de parti&ccedil;&otilde;es
-s&atilde;o:
-<p><u><i>RAW &lt;r></i> </u>: Formato de dados do disco, mostra os setores
-que ser&atilde;o gravados para o disco, caso
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-seja escolhido o comando WRITE &lt;W>. O formato mostrado &eacute; exatamente
-aquele
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-que ser&aacute; gravado para ao disco.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Abaixo um exemplo
-deste formato:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Disk Drive:
-/dev/hda</i>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Sector 0:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x000: EB 69
-4C 49 4C 4F 01 00 14 00 D7 02 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x010: FB 1B
-CF 36 74 D8 80 23 01 75 D8 80 23 01 73 D8
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x020: 80 23
-01 01 77 01 77 D8 80 23 01 78 D8 80 23 01
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x030: 64 D8
-80 23 01 65 D8 80 23 01 66 D8 80 23 01 67
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x040: D8 80
-23 01 68 D8 80 23 01 69 D8 80 23 01 6A D8
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x050: 80 23
-01 6B D8 80 23 01 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x060: 00 00
-00 00 00 00 00 00 00 00 00 B8 C0 07 8E D8
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x070: 8C 06
-66 00 89 36 64 00 89 1E 68 00 88 16 6A 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x080: B8 00
-9A 8E C0 B9 00 01 29 F6 29 FF FC F3 A5 EA
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x090: 94 00
-00 9A FA 8E D8 8E C0 BC 00 B0 B8 00 90 8E
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0A0: D0 FB
-B0 0D E8 57 00 B0 0A E8 52 00 B0 4C E8 4D
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0B0: 00 BE
-30 00 BB 00 10 FC AD 89 C1 AD 89 C2 09 C8
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0C0: 74 20
-46 E8 43 00 72 06 81 C3 00 02 EB EA 50 B0
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0D0: 20 E8
-2A 00 58 88 E0 E8 12 00 31 C0 88 C2 CD 13
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0E0: EB CF
-B0 49 E8 17 00 EA 00 00 00 9B 50 C0 E8 04
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0F0: E8 01
-00 58 24 0F 04 30 3C 3A 72 02 04 07 30 FF
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x100: B4 0E
-CD 10 C3 5A 59 5B C3 F6 C2 40 74 52 80 E2
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x110: BF 53
-51 52 B4 08 CD 13 72 EB 88 F3 5A 88 16 6D
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x120: 01 88
-F2 30 F6 88 F7 58 51 86 CD D0 C5 D0 C5 80
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x130: E5 03
-89 0E 6B 01 59 83 E1 3F F7 F1 FE C2 88 16
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x140: 6E 01
-31 D2 43 F7 F3 88 D6 8A 16 6D 01 3B 06 6B
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x150: 01 77
-13 86 C4 D0 C8 D0 C8 0A 06 6E 01 89 C1 5B
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x160: B8 01
-02 CD 13 C3 5B 31 C0 F9 C3 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x170: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x180: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x190: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1A0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1B0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 80 01
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1C0: 01 00
-0B FE 3F 8F 3F 00 00 00 51 4C 23 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1D0: 41 D7
-83 FE BF 6F 17 75 73 00 59 81 25 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1E0: 01 98
-05 FE 7F D6 98 42 25 00 7F 32 4E 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1F0: 81 70
-82 FE BF 72 70 F6 98 00 43 BC 00 00 55 AA
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Sector 2441880:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x000: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x010: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x020: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x030: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x040: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x050: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x060: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x070: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x080: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x090: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0A0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0B0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0C0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0D0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0E0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x0F0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x100: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x110: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x120: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x130: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x140: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x150: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x160: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x170: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x180: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x190: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1A0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1B0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 01
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1C0: 01 98
-0B FE 7F D6 3F 00 00 00 40 32 4E 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1D0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1E0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0x1F0: 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 55 AA
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -----------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-A primeira tabela de parti&ccedil;&atilde;o mostrada &eacute; a Prim&aacute;ria,
-depois
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; as tabelas de
-parti&ccedil;&otilde;es ligadas com cada parti&ccedil;&atilde;o l&oacute;gica.
-Como
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; no exemplo,
-os dados s&atilde;o mostrados em bytes Hexadecimais(na
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; primeira coluna)
-seguidos de 16 bytes por linha.
-<p><i><u>Sector &lt;s></u></i>: Mostra a tabela de parti&ccedil;&atilde;o
-classificada por setores. Esta
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; op&ccedil;&atilde;o
-mostra o espa&ccedil;o n&atilde;o particionado no disco e a<i> parti&ccedil;&atilde;o</i>
-<br><i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Extendida</i>,
-que &eacute; mostrada antes das <i>parti&ccedil;&otilde;es L&oacute;gicas</i>.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Abaixo um exemplo
-deste formato:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Partition Table
-for /dev/hda
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-First&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Last
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # Type&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Sector&nbsp;&nbsp;&nbsp;&nbsp; Sector&nbsp;&nbsp;&nbsp;&nbsp; Offset&nbsp;&nbsp;
-Length&nbsp;&nbsp; Filesystem Type (ID)&nbsp;&nbsp; Flags
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- -------&nbsp;&nbsp;&nbsp;&nbsp;
---------&nbsp;&nbsp; ---------&nbsp;&nbsp; ------ --------- ----------------------
----------
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1 Primary&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2313359&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-63&nbsp; 2313360&nbsp; Win95 FAT32 (0B)&nbsp;&nbsp; Boot (80)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Logical&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2313360&nbsp; 2441879&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-0&nbsp;&nbsp;&nbsp; 128520&nbsp; Free Space&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-None (00)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 3 Primary&nbsp;&nbsp;
-2441880&nbsp; 7566614&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0&nbsp;
-5124735&nbsp; Extended&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(05)&nbsp;&nbsp; None (00)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 5 Logical&nbsp;&nbsp;
-2441880&nbsp;&nbsp; 7566614&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 63&nbsp; 5124735&nbsp;
-Win95 FAT32 (0B)&nbsp;&nbsp; None (00)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2 Primary&nbsp;
-7566615&nbsp; 10024559&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0&nbsp; 2457945&nbsp;
-Linux&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(83)&nbsp;&nbsp; None (00)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 4 Primary
-10024560 10072754&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-48195&nbsp; Linux Swap&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (82)&nbsp; None
-(00)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ------------------------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>Onde</b>:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>#</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Identifica&ccedil;&atilde;o da parti&ccedil;&atilde;o no disco /dev/hda
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Type</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Tipo da parti&ccedil;&atilde;o(veja o exemplo)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>First Sector</i>
-- Primeiro Setor utilizado para o armazanamento da parti&ccedil;&atilde;o.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Last Sector</i>&nbsp;
-- &Uacute;ltimo Setor utilizado para o armazenamento da parti&ccedil;&atilde;o.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Offset&nbsp;</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
--
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i> Lenght</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Tamanho total da parti&ccedil;&atilde;o em setores (Last Sector - First
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Sector).
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>&nbsp; FileSystem
-Type (ID)</i> - Identifica&ccedil;&atilde;o do Sistema de Arquivos da parti&ccedil;&atilde;o,&nbsp;
-seguido do seu
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-c&oacute;digo hexadecimal no CFDisk. A <i>parti&ccedil;&atilde;o Extendida</i>
-&eacute; identificada como
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-um sistema de arquivos&nbsp; com o c&oacute;digo 05 (veja o exemplo).
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i> Flags&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;&nbsp;&nbsp;
--&nbsp;&nbsp;&nbsp;&nbsp; Op&ccedil;&otilde;es da parti&ccedil;&atilde;o
-seguido de seu valor em&nbsp; hexadecimal.
-<p><i><u>Table &lt;t></u></i> : Mostra a tabela de parti&ccedil;&atilde;o
-classificada pelo n&uacute;mero da parti&ccedil;&atilde;o.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Esta op&ccedil;&atilde;o deixa fora todo espa&ccedil;o livre e n&atilde;o
-usado na parti&ccedil;&atilde;o.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Abaixo um exemplo deste formato.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-----------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Partition Table for /dev/hda
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
----Starting---&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ----Ending----&nbsp;&nbsp;&nbsp;
-Start&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Number of
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# Flags Head Sect Cyl&nbsp;&nbsp; ID&nbsp; Head Sect Cyl&nbsp;&nbsp;&nbsp;
-Sector&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Sectors
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
--- ----- ----&nbsp;&nbsp; ----&nbsp; ----&nbsp; ----&nbsp;&nbsp; ---- ----
-----&nbsp; --------&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ---------
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1&nbsp; 0x80&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-0&nbsp; 0x0B&nbsp; 254&nbsp;&nbsp; 63&nbsp; 143&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-63&nbsp;&nbsp; 2313297
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-2&nbsp; 0x00&nbsp;&nbsp;&nbsp; 0&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;
-471&nbsp; 0x83&nbsp; 254&nbsp;&nbsp; 63&nbsp; 623&nbsp; 7566615&nbsp;&nbsp;
-2457945
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-3&nbsp; 0x00&nbsp;&nbsp;&nbsp; 0&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;
-152&nbsp; 0x05&nbsp; 254&nbsp;&nbsp; 63&nbsp; 470&nbsp; 2441880&nbsp;&nbsp;
-5124735
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-4&nbsp; 0x00&nbsp;&nbsp;&nbsp; 0&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;
-624&nbsp; 0x82&nbsp; 254&nbsp;&nbsp; 63&nbsp; 626 10024560&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-48195
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-5&nbsp; 0x00&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;
-152&nbsp; 0x0B&nbsp; 254&nbsp;&nbsp; 63&nbsp; 470&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-63&nbsp;&nbsp; 5124672
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
--------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>Onde</b>:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>#</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- N&uacute;mero da parti&ccedil;&atilde;o de disco
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Flags</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- As op&ccedil;&otilde;es utilizadas com a parti&ccedil;&atilde;o (em&nbsp;
-valor Hexadecimal).
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-O valor <b>0x80</b> equivale a BOOT.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-O valor <b>0x00</b> equivale a nenhuma op&ccedil;&atilde;o&nbsp; utilizada
-naquela parti&ccedil;&atilde;o.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>Starting</b>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Head</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Cabe&ccedil;ote Inicial
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Sector</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Setor Inicial
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Cyl</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Cilindro Inicial
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>ID</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Identifica&ccedil;&atilde;o do Sistema de arquivos(em&nbsp; hexadecimal,
-conforme a
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-tabela do CFdisk).
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>Ending</b>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Head</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Cabe&ccedil;ote Final
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Sector</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Setor Final
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Cyl</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Cilindro Final
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Start
-Sector</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Setor inicial da parti&ccedil;&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>Number
-of Sectors</i> - N&uacute;mero de setores ocupados pela parti&ccedil;&atilde;o.
-<p>&nbsp;&nbsp;&nbsp; Se a parti&ccedil;&atilde;o n&atilde;o inicia ou
-n&atilde;o termina em um cilindro limite do disco ou se o seu tamanho n&atilde;o
-&eacute; divis&iacute;vel pelo tamanho do cilindro, um <b>*</b> &eacute;
-ser&aacute; mostrado ap&oacute;s o setor n&atilde;o alinhado. Este problema
-normalmente ocorre quando a parti&ccedil;&atilde;o &eacute; criada por
-um Sistema operacional em que o limite da parti&ccedil;&atilde;o n&atilde;o
-&eacute; alinhada com o cilindro ou que utiliza a contagem do tamanho do
-disco
-<br>de forma diferente.
-<br>&nbsp;&nbsp;&nbsp; A tabela de parti&ccedil;&atilde;o somente tem 10
-bits dispon&iacute;vel para identificar o cilindro inicial e final. Assim,
-quando o setor inicial absoluto &eacute; um cilindro maior que <b>1023</b>(<i>final
-do disco</i>), o valor m&aacute;ximo para a cabe&ccedil;a inicial, setor
-e cilindro s&atilde;o definidos. Este metodo &eacute; usado pelo <i>OS/2</i>,
-e
-<br>e corrige os problemas associados com <i>OS/2</i> caso o Fdisk regrava
-a tabela de parti&ccedil;&atilde;o quanto ela n&atilde;o esta neste formato.
-<br>&nbsp;&nbsp;&nbsp; Desde ent&atilde;o <i>Linux</i> e <i>OS/2</i> utilizam
-esta contagem de setores absolutos, os valores na cabe&ccedil;a inicial
-e final, Setor e Cilindro n&atilde;o s&atilde;o usadas.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.10"></a><u><font size=+1>2.3.10-) Quit &lt;q></font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp; Esta op&ccedil;&atilde;o faz com que o CFdisk
-abandonar todas as altera&ccedil;&otilde;es e retornar para o Aviso de
-comando. Quando esta op&ccedil;&atilde;o &eacute; escolhida, o programa
-retorna deixando o disco como estava antes de se iniciar o particionamento.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Se escolher esta op&ccedil;&atilde;o o CFdisk
-abandonar&aacute; o particionamento de disco e voltar&aacute; para a linha
-de comandos imediatamente. Se <i>alterar/criar/excluir</i> alguma parti&ccedil;&atilde;o
-de disco e escolher esta op&ccedil;&atilde;o, o programa emitir&aacute;
-um Beep indicando que alguma altera&ccedil;&atilde;o feita no disco foi
-abandonada.
-<p><b>OBS</b>: Esta op&ccedil;&atilde;o &eacute; &uacute;til caso tenha
-se cometido algum engano durante o particionamento do disco,
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; como apagar
-por uma parti&ccedil;&atilde;o que cont&eacute;m arquivos, alterar o tamanho
-do disco(geometria),
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; etc. Lembre-se
-que tudo o que fez ser&aacute; abandonado, durante o particionamento, se
-escolher
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; esta op&ccedil;&atilde;o.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.11"></a><u><font size=+1>2.3.11-) Type &lt;t></font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp; Comando usado para alterar o tipo do sistema
-de arquivos utilizado pela parti&ccedil;&atilde;o. As parti&ccedil;&otilde;es,
-quando criadas, recebem o sistema de arquivos <b>Linux Native</b>(ou simplesmente
-Linux - <i>tipo 83</i>). O CFdisk pode criar, manipular, excluir, uma grande
-variedade de Sistemas de arquivos para os mais diversos tipos de sistemas
-operacionais existentes, veja o final deste manual para ver as parti&ccedil;&otilde;es
-compat&iacute;veis com este programa.
-<br>&nbsp;&nbsp; Para alterar o tipo do sistema de arquivos (<i>File System</i>)
-utilizado pela parti&ccedil;&atilde;o, tecle &lt;t>, e digite o valor de
-acordo com a lista de parti&ccedil;&otilde;es dispon&iacute;veis no programa.
-<br>&nbsp;&nbsp; Por exemplo, para mudar a parti&ccedil;&atilde;o do tipo
-Linux para Linux Swap, selecione esta parti&ccedil;&atilde;o, e tecle &lt;t>,
-e digite o n&uacute;mero <i>82</i>(que corresponde a <b>Linux Native</b>)
-e tecle &lt;Enter>, e a parti&ccedil;&atilde;o ter&aacute; seu sistema
-de arquivos alterado.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.12"></a><u><font size=+1>2.3.12-) Units &lt;u></font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp; A fun&ccedil;&atilde;o deste comando &eacute;
-alterar as unidades de medida do tamanho da parti&ccedil;&atilde;o que
-&eacute; mostrado na tela, por padr&atilde;o, ele &eacute; mostrado em
-MegaBytes.
-<br>&nbsp;&nbsp;&nbsp; As unidades de medida do tamanho da parti&ccedil;&atilde;o
-s&atilde;o em MegaBytes, Cilindros e Setores ocupados pela parti&ccedil;&atilde;o
-de disco.
-<br>Abaixo um exemplo da mudan&ccedil;a da unidade de medida para Cilindros.
-<br>----------------------------------------------------------------------------------------------------
-<center>CFdisk 0.8l
-<br>Disk Drive: /dev/hda
-<br>Heads:255&nbsp; Sectors:63&nbsp; Cilinders:627</center>
-----------------------------------------------------------------------------------------------------
-<br>Name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Flags&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Part Type&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; FSType&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-[LABEL]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Cilinders
-<br>hda1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Boot&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Primary&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Win 95 FAT 32&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-249
-<br>hda5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Logical&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT 16 (BIG)&nbsp;&nbsp; GLEYDSON&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-22
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Pri/Log&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Free
-Space&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-371
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<p>[Bootable]&nbsp;&nbsp; [Delete]&nbsp;&nbsp; [Help]&nbsp;&nbsp; [Maximize]&nbsp;&nbsp;
-[Print]
-<br>[Quit]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [Type]&nbsp;&nbsp;&nbsp;&nbsp;
-[Units]&nbsp;&nbsp; [Write]
-<br>----------------------------------------------------------------------------------------------------
-<br>&nbsp;&nbsp; Ser&aacute; mostrada a quantidade de cilindros que a parti&ccedil;&atilde;o
-ocupa no disco ao inv&eacute;s do espa&ccedil;o em MB.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="2.3.13"></a><u><font size=+1>2.3.13-) Write &lt;W></font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Este comando grava todas as tabelas de
-parti&ccedil;&otilde;es criadas/modificadas e excluidas para o disco. S&oacute;
-&eacute; aceita a tecla &lt;W> em mai&uacute;scula para grava&ccedil;&atilde;o
-da parti&ccedil;&atilde;o de disco, por motivos de seguran&ccedil;a para
-que n&atilde;o seja feita a grava&ccedil;&atilde;o acidental das parti&ccedil;&otilde;es
-enquando estiver utilizando o programa. Para quem utiliza as setas do teclado,
-o m&eacute;todo &eacute; o mesmo que as outras op&ccedil;&otilde;es.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Ap&oacute;s selecionar esta op&ccedil;&atilde;o,
-o CFdisk perguntar&aacute; se confirma a grava&ccedil;&atilde;o das parti&ccedil;&otilde;es
-para o disco.
-<br>Para gravar a parti&ccedil;&atilde;o, digite "<i>yes</i>" e tecle &lt;Enter>.
-<br>Para cancelar o comando, pressione &lt;Esc> ou digite "<i>no</i>" e
-tecle &lt;Enter>.
-<p>&nbsp;&nbsp;&nbsp; Ap&oacute;s confirmar com "<i>yes</i>", o CFdisk
-gravar&aacute; a tabela de parti&ccedil;&atilde;o no disco e fara o Kernel
-re-ler a tabela de parti&ccedil;&atilde;o do disco, para se evitar reiniciar
-o sistema para utilizar a nova tabela de parti&ccedil;&atilde;o.
-<br>&nbsp;&nbsp;&nbsp; A tentativa de re-leitura da tabela de parti&ccedil;&atilde;o
-pode falhar. Para solucionar este problema, &eacute; preciso reiniciar
-o computador, quando o computador &eacute; reiniciado, o sistema operacional
-faz uma nova leitura das tabelas de parti&ccedil;&otilde;es existentes
-no disco, fazendo com que sejam reconhecidas
-<br>corretamente.
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="3"></a><u><font size=+1>3-) Tipos de parti&ccedil;&otilde;es
-compat&iacute;veis com o CFdisk</font></u></center>
-
-<p>&nbsp; Abaixo uma listagem das parti&ccedil;&otilde;es compat&iacute;veis
-com o programa <i>CFdisk</i> e seus respectivos c&oacute;digos H<i>exadecimais</i>,
-para consulta t&eacute;cnica ou utiliza&ccedil;&atilde;o durante o particionamento
-de disco.
-<p><b><u>C&oacute;digo</u></b>&nbsp;&nbsp; <b><u>Nome</u></b>
-<br>01 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT12
-<br>02 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Xenix root
-<br>03 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Xenix usr
-<br>04 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT16 (&lt;32MB)
-<br>05 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Extendida
-<br>06 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT16 (>=32MB)
-<br>07 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; OS/2 HPFS ou NTFS
-<br>08 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; AIX
-<br>09 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; AIX inicializ&aacute;vel
-<br>0A -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; OS/2 Boot Manager
-<br>0B -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Windows 95 FAT32
-<br>0C -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Windows 95 FAT32(LBA)
-<br>0E -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Windows 95 FAT16(LBA)
-<br>0F -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Windows 95 Extendida
-<br>11 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT12 oculta
-<br>12 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT16 oculta
-<br>16 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT16 oculta
-<br>17 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; HPFS OS/2 oculta
-<br>40 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Venix 80286
-<br>51 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Novell
-<br>52 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Microport
-<br>63 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; GNU Hurd
-<br>64 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Novell Netware
-286
-<br>65 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Novell Netware
-386
-<br>75 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; PC/IX
-<br>80 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Minix Antigo
-<br>81 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Linux / Minix
-<br>82 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Linux Swap
-<br>83 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Linux Nativa
-<br>85 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Linux Extendida
-<br>93 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Amoeba
-<br>94 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Amoeba BBT
-<br>A5 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BSD/386
-<br>A6 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Open BSD
-<br>A7 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; NextStep
-<br>B7 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BSDI Sistema de
-Arquivos
-<br>B8 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BSDI Swap
-<br>C7 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Syrinx
-<br>DB -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CP/M
-<br>E1 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS access
-<br>E3 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS R/O
-<br>F2 -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS secund&aacute;ria
-<br>FF -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BBT
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="4"></a><u><font size=+1>4- ) Direitos Autorais</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Este documento foi desenvolvido com base
-em minha experi&ecirc;ncia e conhecimento em discos e parti&ccedil;&otilde;es,
-mediante pesquisa em alguns documentos como os How-TO do Linux e verificando
-as principais d&uacute;vidas de usu&aacute;rios durante a utiliza&ccedil;&atilde;o
-de particionadores de disco, tendo como objetivo levar o conhecimento sobre
-discos, parti&ccedil;&otilde;es e utiliza&ccedil;&atilde;o deste programa,
-atendendo tanto usu&aacute;rios iniciantes como avan&ccedil;ados e como
-contribui&ccedil;&atilde;o para a comunidade Linux em geral.
-<center>
-<p>Gleydson M. da Silva (<i>gleydson_s@yahoo.com</i> e <i>gleydson@linuxbr.com.br</i>)</center>
-
-<p>&nbsp;&nbsp;&nbsp; Qualquer d&uacute;vida, sugest&atilde;o ou reclama&ccedil;&atilde;o
-podem ser mandadas para um dos E-Mail's Acima. Conto com sua contribui&ccedil;&atilde;o
-para a melhoria deste Manual.
-<p><b>&nbsp;&nbsp;&nbsp; Autorizo a reprodu&ccedil;&atilde;o Total ou parcial
-deste texto para que seja utilizado para fins educativos, autoaprendizado,
-coloca&ccedil;&atilde;o em Home pages e qualquer outra forma de distribui&ccedil;&atilde;o
-n&atilde;o comercial do documento desde que sejam mantidos os meus cr&eacute;ditos
-pela pesquisa e elabora&ccedil;&atilde;o deste documento de acordo com
-os termos da GNU (veja abaixo <a href="#6">Licen&ccedil;as e Garantias
-sobre este documento</a>).</b>
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="5"></a><u><font size=+1>5- ) Licen&ccedil;as e Garantias
-sobre este documento</font></u></center>
-
-<p>CFdisk-Portuguese copyright (C) 1999 Gleydson M. da Silva
-<p>&nbsp;&nbsp; Este documento &eacute; de livre distribui&ccedil;&atilde;o,
-que pode ser copiado e distribu&iacute;do sob os termos da Licen&ccedil;a
-P&uacute;blica Geral&nbsp; GNU, conforme publicada pela Free Software Foundation,
-vers&atilde;o 2 da licen&ccedil;a ou (a crit&eacute;rio do autor) qualquer
-vers&atilde;o posterior.
-<p><b>&nbsp;&nbsp; Este documento &eacute; distribu&iacute;do com a iten&ccedil;&atilde;o
-de ser &uacute;til ao seu utilizador, no entanto N&Atilde;O TEM NENHUMA
-GARANTIA,&nbsp; EXPL&Iacute;CITAS OU IMPL&Iacute;CITAS , COMERCIAIS OU
-DE ATENDIMENTO A UMA DETERMINADA FINALIDADE. Consulte a Licen&ccedil;a
-P&uacute;blica Geral&nbsp; GNU para maiores detalhes.</b>
-<p><i>gleydson_s@yahoo.com</i>
-<br><i>gleydson@linuxbr.com.br</i>
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="6"></a><u><font size=+1>6- ) Nota sobre Marcas Registradas</font></u></center>
-
-<p>Os programas mencionados neste manual s&atilde;o de propriedade dos
-seus respectivos donos:
-<p>MS-DOS, Windows 3.1x, Windows 9x, Windows NT s&atilde;o de propriedade
-da Microsoft.
-<br>OS/2 e OS/2 Warp s&atilde;o de propriedade da IBM
-<div align=right><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<center>
-<p><br><a NAME="7"></a><u><font size=+1>7- ) Agradecimentos</font></u></center>
-
-<p>Agrade&ccedil;o a todas as pessoas que me mandam corre&ccedil;&otilde;es,
-coment&aacute;rios, cr&iacute;ticas e elogios sobre este documento, pois
-atrav&eacute;s destas mensagens, est&atilde;o contribuindo para a melhoria
-deste projeto.
-<p><b>Agradecimentos especiais a:</b>
-<p><b>Eduardo Marcel Macan</b> <i>&lt;macan@thecore.com.br></i> - Pelo
-apoio e interesse na divulga&ccedil;&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-deste projeto e outros documentos relacionados com a tradu&ccedil;&atilde;o
-e divulga&ccedil;&atilde;o de
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-documentos do Linux no Brasil.
-<br><b>Jorge Godoy</b> <i>&lt;jorge@bestway.com.br></i> - Pela revis&atilde;o
-deste documento e primeiras orienta&ccedil;&otilde;es
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-para a convers&atilde;o deste para SGML.
-<br><b>Adam di Carlo</b> <i>&lt;adam@onshore.com></i> - Que me deu apoio
-na coloca&ccedil;&atilde;o deste
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-documento&nbsp; na documenta&ccedil;&atilde;o da distribui&ccedil;&atilde;o
-Debian.
-<p>E a voce pelo enteresse em conhecer mais sobre o Linux.&nbsp;
-<div align=right>
-<br><i><a href="#Indice">Voltar ao Indice</a></i></div>
-
-<br>&nbsp;
-<p>&lt;EOF>
-</body>
-</html>
diff --git a/fdisk/doc/CFdisk-Portuguese.txt b/fdisk/doc/CFdisk-Portuguese.txt
deleted file mode 100644
index 99981c4df..000000000
--- a/fdisk/doc/CFdisk-Portuguese.txt
+++ /dev/null
@@ -1,1236 +0,0 @@
-          CFdisk-Portuguese Copyright (C) 1999 Gleydson M. da Silva
-
-
-
-
-
-
-
-              Gleydson M. da Silva - gleydson@linuxbr.com.br
-                             Versão: 1.68
-
-
-
-
-
-
-
-[ Indice ]
-
-1 - Introdução ao CFdisk
- 1.1 - O que é uma partição de disco
- 1.2 - O que é a tabela de partição
- 1.3 - Introdução ao Particionamento de Discos
- 1.4 - Identificadores utilizados neste manual
- 1.5 - Identificação de discos e partições no Sistema Linux
- 1.6 - Tipos de partições de disco
- 1.7 - Observações sobre o formato DOS 6.xx(FAT16)
-
-2 - Iniciando o programa CFdisk
- 2.1 - Opções de Linha de comando
- 2.2 - Conhecendo a tela do CFdisk
- 2.3 - Descrição dos comandos
-  2.3.1 - Setas Acima/Abaixo - Esquerda/Direita
-  2.3.2 - <CTRL>+<l>
-  2.3.3 - Boot
-  2.3.4 - Delete
-  2.3.5 - Geometry
-  2.3.6 - Help
-  2.3.7 - Maximize
-  2.3.8 - New
-  2.3.9 - Print
-  2.3.10 - Quit
-  2.3.11 - Type
-  2.3.12 - Units
-  2.3.13 - Write
-
-3 - Tipos de partições compatíveis com o CFdisk
-
-4 - Direitos Autorais
-
-5 - Licenças e Garantias sobre este documento
-
-6 - Notas sobre marcas registradas
-
-7 - Agradecimentos
-
-
-
-
-
-
-
-
-
-
-
-1-) Introdução ao CFdisk
-
-CFdisk é um programa utilizado para fazer o particionamento de discos, 
-utilizando uma interface em modo texto.
-
-A grande características deste programa, além de sua interface de comunicação
-com o usuário e a enorme quantidade de partições que manipula, é a grande
-facilidade de operação, o seu poder de manipulação de partições e a sua
-precisão que fazem com que o usuário tenha mais confiança durante o 
-particionamento de disco.
-
-É recomendável a leitura deste texto, mesmo que tenha uma noção sobre o
-particionamento de discos, exceto para os gurus que já conhecem a fundo a
-forma de trabalho, em geral, de programas deste tipo, pois o particionamento
-de disco pode destruir os seus arquivos e partições já existentes, se for
-usado de forma incorreta.
-
-O programa CFdisk pode ser utilizado em qualquer sistema operacional que 
-esteja de acordo com o padrão POSIX (Linux, UNIX, FreeBSD, HPUX, etc).
-
-A versão do CFdisk utilizada nas explicações deste manual é a 0.8, mas 
-isto não impede que este manual seja utilizado com versões futuras ou 
-anteriores deste programa. As características principais 
-do programa CFdisk e as explicações sobre particionamento, são válidas para 
-quaisquer versões deste programa.
-
-Este documento é distribuído com a itenção de ser útil ao seu utilizador,
-no entanto NÃO TEM NENHUMA GARANTIA,  EXPLÍCITAS OU IMPLÍCITAS , COMERCIAIS
-OU DE ATENDIMENTO A UMA DETERMINADA FINALIDADE. Consulte a Licença Pública 
-Geral  GNU para maiores detalhes. 
-
-
-1.1-) Partição de Disco
-
-Uma partição de disco é o local onde o sistema operacional armazena seu
-sistema de arquivos(arquivos, diretórios, FAT, boot sector, etc). 
-
-
-
-1.2-) Tabela de partição
-
-A Tabela de partição é o local do disco rígido onde se localizam os dados sobre
-todas as partições existentes no disco como o sistema de arquivos utilizado, se
-ela é inicializável, a cabeça inicial/final, setor inicial/final, cilindro
-inicial/final, número de setores ocupados por ela no disco.
-
-
-1.3-) Introdução ao particionamento de discos
-
-Particionar o disco rígido é dividir ele em partes para armazenamento 
-de arquivos e programas. As partições criadas no disco podem ter o tamanho 
-que desejar (desde que esteja dentro da capacidade máxima do disco rígido).
-
-Uma partição não interfere em outras partições do mesmo disco(é como 
-se tivessemos vários discos rígidos dentro de um), e nem em outros discos
-rígidos(caso possuir mais que um disco rígido instalado em seu computador).
-
-Pode ser criada uma partição única, que neste caso todo o disco rígido
-é usado para armazenar os arquivos(que é o caso mais comum caso voce tenha 
-o DOS), ou várias partições, que podem ser usadas pelo mesmo SO(Sistema 
-Operacional) ou outros sistemas operacionais diferentes(um exemplo de várias
-partições: se for usar o DOS e o Linux no mesmo disco, os dois sistemas vão 
-estar no mesmo disco mas um não interfere no outro).
-
-ATENÇÃO : A OPERAÇÃO DE PARTICIONAMENTO DE DISCOS PODE FAZER COM QUE OS DADOS
-          ARMAZENADOS EM SEU DISCO RÍGIDO SEJAM PERDIDOS, SE FOR USADA 
-          INCORRETAMENTE. É SEMPRE RECOMENDADO RETIRAR UMA CÓPIA DE SEGURANÇA
-          DOS SEUS ARQUIVOS EXISTENTES NO MICRO ANTES DE SE EXECUTAR UM
-          PROGRAMA DESTE TIPO, A NÃO SER QUE TENHA CONFIANÇA NO QUE ESTA
-          FAZENDO E QUE ENTENDEU AS EXPLICAÇÕES SOBRE A IDENTIFICAÇÃO DE
-          DISCOS RÍGIDOS E SUAS PARTIÇÕES NO SISTEMA.
-
-Neste manual voce aprenderá como deve particionar seu disco rígido para 
-a instalação do SO usando o programa CFdisk.
-
-
-1.4-) Algumas identificações utilizadas neste manual para facilitar a 
-      compreensão do texto
-
-Esta parte descreve algumas características de organização deste manual e
-algumas identificações que utilizei para facilitar o seu entendimento, e as
-explicações que serão dadas.
-
-Explicação de nomes e comandos, sera seguida da palavra "onde:" e abaixo
-dela as explicações sobre os comandos, exemplo:
-
-onde:
-nome a ser explicado1  : Descrição 
-nome a ser explicado2  : Descrição 
-nome a ser explicado3  : Descrição 
-
-ou
-
-onde:
-nome a ser explicado1  - Descrição 
-nome a ser explicado2  - Descrição 
-nome a ser explicado3  - Descrição 
-
-
-Quando for feita alguma referência com tecla do teclado, por exemplo, 
-pressione p para listar as partições, a letra sera colocada entre <> para
-que seja melhor entendida:
-
-pressione <d> para deletar uma partição...
-...pressione <Enter> para escolher a opção do menu.
-pressione <t> para listar os tipos de partições disponíveis...
-
-
-    As linhas pontilhadas que aparecem na tela, veja abaixo,
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-servem para identificar que o que esta entre as linhas é um exemplo de como 
-será a resposta do comando para a tela de seu computador.
-
-
-
-1.5-) Identificação de discos e partições no Linux
-
-Antes de descrever como se utiliza o programa CFdisk, é importante fazer
-algumas explicações sobre a identificação das partições e unidades de disco
-no sistema Linux( e outros *nix). 
-
-Se voce for um usuário que já conhece a interpretação de discos e partições
-neste sistema, voce não precisará ler esta parte.
-
-No sistema operacional Linux, os dispositivos existentes no computador
-(como impressoras, unidades de disquetes, discos rígidos, monitor, placa de
-som, etc...) são identificados por um nome referente a este dispositivo e
-colocado no diretório /dev (que é utilizado para identificar os dispositivos
-ou periféricos existentes no computador).
-
-   A identificação dos discos rígidos segue a seguinte forma:
-
-  /dev/hda1
-  |    | ||
-  |    | ||_Número que identifica a partição do disco rígido(1=Primeira, 2=segunda)
-  |    | |
-  |    | |_Letra que identifica o disco rígido(a=primeiro disco, b=segundo disco, etc..)
-  |    |
-  |    |_Sigla HD - Significa que é um disco rígido IDE(Se tiver um SD significa SCSI)
-  |
-  |_ Identificação do diretório onde os dispositivos do sistema são armazenados
-
-OBS: As unidades de disco rígido SCSI, são identificadas com as letras SD 
-     seguida pela letra da unidade e número da partição e os discos IDE são
-     identificados por HD seguida pela letra da unidade de disco e o número
-     da partição do disco(como visto acima).
-
-Abaixo, algumas identificações de disco do sistema Linux:
-
-/dev/hda1    -   Disco rígido IDE primário principal - Primeira partição
-/dev/hda2    -   Disco rígido IDE primário principal - Segunda partição
-/dev/hda3    -   Disco rígido IDE primário principal - Terceira partição
-/dev/hdb1    -   Disco rígido IDE primário escravo - Primeira partição
-/dev/hdb2    -   Disco rígido IDE primário escravo - Segunda partição
-/dev/hdb3    -   Disco rígido IDE primário escravo - Terceira partição
-/dev/hdc1    -   Disco rígido IDE secundário principal - Primeira partição
-/dev/hdc2    -   Disco rígido IDE secundário principal - Segunda partição
-/dev/hdc3    -   Disco rígido IDE secundário principal - Terceira partição
-/dev/hdd1    -   Disco rígido IDE secundário escravo - Primeira partição
-/dev/hdd2    -   Disco rígido IDE secundário escravo - Segunda partição
-/dev/hdd3    -   Disco rígido IDE secundário escravo - Terceira partição
-/dev/sda1    -   Primeiro disco rígido SCSI - Primeira partição
-/dev/sda2    -   Primeiro disco rígido SCSI - Segunda partição
-/dev/sda3    -   Primeiro disco rígido SCSI - Terceira partição
-/dev/sdb1    -   Segundo disco rígido SCSI - Primeira partição
-/dev/sdb2    -   Segundo disco rígido SCSI - Segunda partição
-/dev/sdb3    -   Segundo disco rígido SCSI - Terceira partição
-
-No exemplo acima foram usadas 3 partições por disco, mas podem existir mais 
-partições no mesmo disco, um exemplo é se o disco rígido possuir partições 
-Lógicas, que são identificadas no sistemas a partir de /dev/hdx5.
-
-
-
-Abaixo um exemplo de como o Linux identifica as partições em cada disco 
-existente em seu computador:
-
-Vamos supor que eu tenha 2 discos rígidos: 
-o 1ºdisco de 2GB e o 2ºdisco  de 1GB(Giga Byte ou 1.000 Megas!) 
-
-No primeiro disco(de 2GB), a primeira partição é de 800MB do tipo 
-FAT16(DOS), a segunda partição é de 1.2GB do tipo EXT2(Linux)(1.2GB+800MB=2GB
-que é a capacidade total do disco). Então as partições seriam identificadas 
-da seguinte forma no Linux:
-
-/dev/hda - Disco rígido Primário Principal 
-/dev/hda1 - Primeira partição do primeiro disco rígido (de 800MB do tipo DOS)
-/dev/hda2 - Segunda partição do primeiro disco rígido( de 1.2GB do tipo Linux)
-
-Neste caso estariam disponíveis 800MB para serem usados com o DOS e 
-1.2GB para o Linux. 
-
-Por exemplo, se voce particionar um disco rígido em duas partes e usar 
-as duas partições no DOS, ele reconhecerá as partições como sendo C: e D:.
-
-Lembre-se: Quando um disco é particionado, nenhuma partição interfere 
-           na outra, repare que quando voce particiona(divide) um disco,
-           é como se tivesse dois discos rígidos(o único cuidado que 
-           voce deve tomar é com as cópias de segurança, porque se der
-           um problema de parte eletrônica no disco rígido, por exemplo,
-           a sua placa controladora queimar ou o cabeçote dele ir pro 
-           espaço, voce perderá as suas 2 partições que estão armazenadas
-           nele.
-
-
-Voltando ao exemplo das classificações das partições do disco, vamos 
-para o segundo disco: 
-
-No segundo disco(1GB), eu tenho uma partição de 950MB do tipo FAT16(DOS),
-que costumo usar para armazenar arquivos temporários e cópias de segurança 
-de meu sistema, etc..., e outra de 50MB SWAP(Partição de memória virtual 
-como descrevi acima)(950MB+50MB=1GB). Então as partições deste disco seriam
-identificadas da seguinte forma no Linux: 
-
-/dev/hdb - Disco rígido principal escravo 
-/dev/hdb1 - Primeira partição do disco acima ( de 950MB do tipo DOS) 
-/dev/hdb2 - Segunda partição do disco acima ( de 50MB do tipo SWAP) 
-
-No disco acima, 950MB estão disponíveis para serem usados pelo DOS e 
-50 MB pela memória virtual (SWAP) do Linux. 
-
-Note que se voce utiliza o MS-DOS, voce não conseguirá ver as partições
-do Linux e SWAP, porque são imcompatíveis com o formato aceito pelo DOS (ele
-identificaria a primeira partição do primeiro disco(800MB) como a unidade C:
-e a primeira partição do segundo disco(950MB) como unidade D), mas o 
-contrário não acontece; O Linux tem total compatibilidade com a partição 
-DOS FAT12, FAT16, FAT32, OS/2 HPFS, e muitas outras.
-
-
-
-1.6-)Tipos de partições de discos
-
-As partições de disco são divididas em tres tipos: Primária, Extendida
-e Lógica.    
-Pode se ter, no máximo, 4 partições Primárias e Extendidas no mesmo disco
-(3 Primárias e 1 Extendida ou 4 partições Primárias em cada disco). 
-A partição Primária permite o armazenamento de arquivos e diretórios.
-
-Todos os computadores que possuem somente a unidade C(supondo que utilize
-o DOS), utilizam este tipo de partição para armazenamento de arquivos e
-inicialização do sistema operacional.
-
-Se for preciso criar mais que 4 partições no mesmo disco, será necessário
-criar uma partição Extendida. A partição Extendida não pode ser utilizada
-para armazenar arquivos. Ela é usada para a criação de outras partições,
-dentro dela, que são chamadas de partições Lógicas. 
-
-Uma partição extendida podem conter várias partições Lógicas. As partições 
-Lógicas podem armazenar arquivos e diretórios(como as partições primárias).
-
-Um mesmo disco rígido pode armazenar mais de 64 partições independentes
-uma das outras.
-
-LEMBRE-SE: Os arquivos e diretórios podem ser armazenados somente em
-           partições de disco primárias ou lógicas, a partição extendida não
-           é usada para armazanamento de arquivos e diretórios.
-
-Se possuir duas partições em seu computador (C: e D: no DOS), e não 
-estiver usando a partição D:, a instalação pode ser feita nesta partição 
-desde que ela tenha o espaço necessário para o sistema operacional Linux, 
-os programas que desejar instalar, mais a partição SWAP.
-
-
-
-1.7-) Observações sobre o formato DOS 6.XX(FAT 16)
-
-No formato DOS 6.XX(FAT16), o primeiro setor da área de dados da partição
-é utilizado frequentemente pelo DOS para armazenamento de dados sobre a
-partição de disco, e estes dados são usados pelo sistema para se ter maior
-confiabilidade do que os dados armazenados na tabela de partição. O sistema
-de arquivos DOS, faz o FDISK(do DOS) limpar os primeiros 512 bytes da área
-de dados da partição sempre que uma mudança de tamanho acontecer.
-
-O formatador do DOS(format) verifica este primeiro setor toda vez que
-a upção /U (que é utilizada para não salvar dados para se fazer a desformatação
-do disco) é utilizada.
-
-Isto é considerado uma FALHA no Format(do DOS) e no Fdisk(do DOS).
-A opção abaixo deve ser utilizada caso voce crie uma partição do DOS FAT16
-com o CFdisk, que faz com que os primeiros 512 bytes daquela partição
-sejam "limpos", para manter a compatibilidade com o DOS. Utilize esta opção
-dentro do Linux, após criar a partição com o CFdisk e reiniciar o seu 
-computador. Foi notado que esta opção só funciona corretamente somente quando
-o Sistema Linux estiver instalado em seu computador. Não me responsabilizo 
-caso utiliza-la a partir de um disquete de recuperação.
-
-dd if=/dev/zero of=/dev/hdx1 bs=512 count=1
-
-onde: 
-hdx1 - É a identificação da unidade de disco e a partição que foi criada
-       pelo CFdisk utilizando o sistema de arquivos DOS que terá seu 
-       primeiro setor "limpo".
-
-
-OBS1: Cuidado ao utilizar esta opção, um pequeno descuido pode resultar na
-     perda de dados do seu disco rígido ou outras partição.
-
-OBS2: Não utilize este comando com partições que utilizam o sistema de arquivos
-     FAT32(utilizada nos sistemas operacionais Windows 95 OSR/2 e superiores)
-     se for utilizada em um disco com este sistema, sua FAT será corrompida,
-     se isto acontecer, será necessária a re-formatação da partição.
-
-OBS3: É extremamente recomendado que se utilize o programa de particionamento
-     que acompanha o seu sistema operacional. Por exemplo, se deseja criar
-     uma partição DOS 6.XX, utilize o FDisk qua acompanha o DOS.
-
-
-
-2-) Iniciando o programa CFdisk
-
-Para entrar no programa CFdisk digite:
-cfdisk <unidade>
-
-onde:
-unidade - é a unidade de disco que deseja utilizar para fazer o particionamento
-          a unidade pode ser: /dev/hda, /dev/hdb, /dev/hdc ..., /dev/sda, 
-          /dev/sdb...,etc
-
-NOTA: Se voce não digitar a unidade, o cfdisk utilizará a unidade /dev/hda 
-      como padrão.
-
-
-
-2.1-) Opções de linha de comando utilizadas com o CFdisk
-
-Opções de linha de comando fazem com que o programa inicie de forma 
-específica ou personalizada. As opções devem ser digitadas após o nome do
-programa (cfdisk).
-
-       cfdisk <unidade> < -avz > < -c cilindros > < -h cabeçotes >  
-              < -s  setores_por trilha > < -P opt > < dispositivo >
-
-onde:
--a        Usa um cursor seta ao invés de video reverso para destacar a
-          partição atual.
--v        Mostra a versão do programa e Coyright(Direitos Reservados).
--z        Ignora a leitura da tabela das partições existentes no disco 
-          ao iniciar o CFdisk.
-
--c Número de Cilindros do disco
--h Número de Cabeçotes do disco
--s Setores por trilha existentes no disco.
--P OPC    Mostra a tabela de partição no formato especifico.
-          OPC - Pode ser: r - Mostra a tabela de partição em Formato RAW
-                          s - Mostra a tabela de partição em Format de Setores
-                          t - Mostra a tabela de partição classificada por 
-                              setores
-          Para maiores detalhes, veja O comando Print <p>.
-
-OBS: A utilização dos parâmetros -c -h -s, substituirão os parâmetros da BIOS
-     da placa, utilize estas opções se sua bios não utilizar estes parâmetros
-     ou se mostrar valores incorretos.
-
-Após entrar o programa CFdisk, ele verificará automaticamente o 
-tamanho do Disco Rígido, se não conseguir, o programa será terminado. 
-Para resolver este problema, especifique o tamanho do disco em cilindros, 
-cabeças, e setores na linha de comando que inicia o programa.
-Este problema geralmente acontece quando se tenta particionar uma unidade de
-disco SCSI que esteja conectada a uma placa controladora que não possui BIOS,
-e  quando  uma  BIOS  mostra  os  valores  da  geometria  do  disco(tamanho) 
-incorretamente.
-
-O próximo passo do CFdisk é fazer a leitura das partições atuais do 
-disco, se não conseguir, o programa será terminado. O único motivo para o 
-CFdisk mostrar esta mensagem de erro, é se voce digitar parâmetros 
-incorretos para o tamanho do disco, caso tenha acontecido o problema 
-descrito no paragrafo anterior. Verifique se os parâmetros foram digitados 
-incorretamente, se os parâmetros estiverem digitados corretamente e mesmo 
-assim o programa continua dando erro na leitura das partições, utilize a 
-opção -z na linha de comando do programa, que faz com que ele ignore a 
-leitura das partições existentes no disco ao iniciar.
-
-
-
-2.2-) Conhecendo a Tela do CFdisk
-   
-Após digitar CFdisk, será mostrada a tela principal onde voce poderá 
-acionar os comandos para manipulação das partições de disco, e visualizar
-as partições de disco atuais e outros dados. Abaixo o exemplo e explicações
-sobre esta tela.
-
-O disco utilizado para os exemplos é um disco de 5157 MB de Capacidade com:
-- 10672 Cilindros  15 Cabeças  63 Setores (no modo C/H/S)
-- 627 Cilindros   255 Cabeças  63 Setores (no modo LBA)
-
-   A unidade de medida utilizada pelo CFdisk para mostrar os parâmetros do 
-disco será o mesmo configurado na BIOS, ou seja, se estiver utilizando o 
-disco com o modo de operação em LBA, os valores de cilindros, cabeças e 
-setores motrados pelo CFdisk sera em LBA.
-
-
-----------------------------------------------------------------------------
-                              CFdisk 0.8l
-
-                         Disk Drive: /dev/hda
-            Heads:255  Sectores per track:63  Cylinders:627
------------------------------------------------------------------------------
-Name       Flags        Part Type   FSType           [LABEL]    Size(MB)
-hda1       Boot         Primary     Win 95 FAT 32               1953.12
-hda5                    Logical     DOS FAT 16 (BIG) GLEYDSON    172.58
-                        Pri/Log     Free Space                  2910.55
-
-
-
-
-
-
-
-
-
-
-[Bootable]  [Delete]  [Help]  [Maximize]  [Print]
-[Quit]      [Type]    [Units] [Write]
-----------------------------------------------------------------------------
-No cabeçalho da tela, é mostrada a versão do programa, a unidade de disco
-que será usada no particionamento e os parâmetros de tamanho do disco(cabeçotes,
-cilindros e setores).
-Abaixo do cabeçalho após a linha pontilhada, se encontra a área das partições.
-
-onde:
-- Name  : é o nome da(s) partição(ões) de Disco.
-- Flags : Se estiver marcada como BOOT, será possível iniciar o sistema
-          a partir desta partição(quando não se utiliza um Boot Manager).
-          Se estiver marcada como NC (Não compatível) significa que esta
-          partição não é compatível com o DOS, OS/2, etc. Para maiores
-          detalhes, veja O comando Maximize <m>.
-- Type  : O tipo da partição pode ser Primária ou Lógica. Para espaço não 
-          utilizado no Disco, o tipo da partição pode ser Primário/Log.
-- FileSystems : Tipo de Sistema de Arquivos que é usado naquela partição.
-          Se o sistema de arquivos for desconhecido, ele será mostrado como 
-          um valor Hexadecimal.
-          Um caso especial ocorre quando há Partições do Disco Rígido que
-          não podem ser usadas ( porque toda a partição primária esta em uso).
-          Quando isto é detectado, o tipo de FileSystems é mostrado como não
-          usável(Unusable) para criação de novas partições.
-- Label : Nome de volume da partição de disco. Os nomes de partições FAT32,
-          não são mostrados com esta versão do CFdisk.
-- Size  : Mostra o tamanho que cada partição ocupa no disco rígido em 
-          MegaBytes (por padrão). Também pode mostrar o tamanho ocupado por
-          Setores ou Cilindros. Se for mostrado um asterisco (*) após o 
-          tamanho, isto diz que a partição não esta alinhada com Cilindro.
-
-
-O espaço livre existente no disco para criação de novas partições, é 
-mostrado como uma outra partição, com o FSType(sistema de arquivos) Free 
-Space(espaço Livre).
-
-OBS: As partições de disco Extendidas não são mostradas na tela do CFdisk 
-     durante o particionamento, mesmo assim, as partições lógicas que este
-     tipo de partição armazena, serão mostradas.
-
-No rodapé da tela, encontramos os comandos utilizados pelo CFdisk para
-manipular as partições de disco. Os comandos são mostrados entre Chaves [].
-
-Todos os comandos no rodapé da tela, são aplicaveis somente para a
-partição que estiver destacada com a barra(video reverso).  Veja descrições 
-dos comandos do CFdisk para mais detalhes.
-
-Abaixo do rodapé da tela, é mostrada a descrição do comando que estiver
-em destaque com o cursor em video reverso.
-
-    Veja abaixo a tradução da tela principal do programa CFdisk:
-----------------------------------------------------------------------------
-                              CFdisk 0.8l
-
-                       Unidade de Disco: /dev/hda
-            Cabeças:255  Setores por trilha:63  Cilindros:627
------------------------------------------------------------------------------
-Nome    Opções    Tipo Part.  Tipo Sist. Arquivos   [VOLUME]    Tamanho(MB)
-hda1     Boot      Primary     Win 95 FAT 32                     1953.12
-hda5               Logical     DOS FAT 16 (BIG)     GLEYDSON      172.58
-                   Pri/Log     Espaço Livre                      2910.55
-
-
-
-
-
-
-
-
-
-
-[Inicializável]  [Apagar]  [Ajuda]   [Maximizar]  [Imprimir]
-[Sair]           [Tipo]    [Unidades][Gravar]
-----------------------------------------------------------------------------
-
-
-
-2.3-) Descrição dos comandos do CFdisk
-
-Os comandos do programa são utilizados criar partições, entrar na ajuda do
-programa, alterar o tipo da partição, apagar uma partição, etc.
-
-Pode ser utilizado Seta p/ Esquerda e Seta p/ direita para se movimentar
-entre os comandos, quando o cursor estiver em cima do comando que deseja
-executar, pressione <Enter>. 
-
-Outro método que se pode utilizar para acionar uma opção do CFdisk, é
-pressionando a primeira letra de cada opção, automaticamente a opção é 
-executada(sem ter que pressionar <Enter>). Neste método, todos os comandos
-aceitam letras maiúsculas e minúsculas, exceto o comando Write(gravar 
-partição) que é executado somente se pressionar <W> maiúscula, para evitar
-gravações acidentais o disco.
-
-Quando estiver em um Sub-Menu e desejar retornar ao menu principal,
-pressione a tecla <Esc>.
-
-
-
-2.3.1-) Setas Acima e Abaixo/ Esquerda e Direita (Movimentação do Cursor)
-
-Setas Acima e Abaixo são utilizadas para se movimentar entre as partições
-existentes no disco e espaço livre, selecionando-a para que seja utilizada
-as opções do CFdisk.
-
-Setas Esquerda e Direita são utilizadas para selecionar entre as opções
-diponíveis do programa(que serão explicadas abaixo). Para confirmar uma
-opção, pressione <Enter>.
-
-
-
-2.3.2-) O comando <CTRL>+<l>
-
-Este comando é utilizado para atualizar a tela manualmente caso a
-atualização automática falhar, por exemplo, quando uma partição for
-excluida, e continuar a ser mostrada na tela.
-   
-
-
-2.3.3-) O comando Boot <b>
-
-Este comando permite escolher se a partição Primária atual será utilizada
-para iniciar o sistema(BOOT). Selecione esta opção para selecionar entre 
-partição inicializável ou não inializável. Quando uma partição estiver 
-marcada como inicializável, aparecerá a palavra BOOT na coluna Flags(na tela
-principal do programa).
-   
-OBS: Não será necessário marcar a partição Linux como inicializável, caso se
-     esteja utilizando um Boot Manager para escolher qual sistema operacional
-     sera utilizado para inicializar o sistema.
-
-
-
-2.3.4-) O comando Delete <d>
-
-Este comando apaga a partição selecionada do disco. Após apagar a partição,
-o espaço ocupado por ela é convertido para espaço livre. 
-A partição marcada atualmente como Free Space ou como Unusable não pode 
-ser apagada.
-
-
-
-2.3.5-) O comando Geometry <g>
-
-Este comando não é mostrado no menu, pois é utilizado para alterar o 
-tamanho (Cilindros, Cabeças e Setores do disco). Este comando só pode
-ser acionado se for pressionada a tecla <g>. 
-
-ALERTA: Esta opção é recomendada somente para aqueles que sabem os riscos
-        que o uso desta opção pode fazer, e se a situação que estão, requerem
-        o seu uso.
-
-Uma situação que esta opção é util, é se o BIOS do seu computador não
-mostrar corretamente os parâmetros do disco(Cilindros, Cabeçotes ou Setores),
-sendo necessário que se passe manualmente o tamanho do disco para que seja
-feito o correto particionamento do disco. 
-
-OBS: Caso seu disco rígido for SCSI e placa controladora dele não tiver BIOS,
-     provavelmente o CFdisk não será iniciado. Se este problema ocorrer,
-     digite os parâmetros do disco na linha de comando ao iniciar o programa.
-     Para maiores detalhes, veja opções de linha de comando do CFdisk.
-
-Após pressionar <g> será mostrada a seguinte tela:
-
-----------------------------------------------------------------------------
-                              CFdisk 0.8l
-
-                         Disk Drive: /dev/hda
-                Heads:255  Sectors:63  Cilinders:627
------------------------------------------------------------------------------
-Name    Flags     Part Type    File System          [LABEL]     Size(MB)
-hda1     Boot      Primary     Win 95 FAT 32                     1953.12
-hda5               Logical     DOS FAT 16 (BIG)     GLEYDSON      172.58
-                   Pri/Log     Espaço Livre                      2910.55
-
-
-
-
-
-
-
-
-
-[ Cylinders]  [Heads]  [Sectors]  [Done]
-
-----------------------------------------------------------------------------
-onde:
-Cylinders: Altera o número de Cilindros do disco atual durante o particionamento.
-Heads    : Altera o número de Cabeças do disco atual durante o particionamento.
-Sectors  : Altera o número de Setores do disco atual durante o particionamento.
-Done     : Quando finalizar as alterações, tecle <d> ou selecione Done para
-           que o CFdisk modifique os valores de Cilindros, Cabeças e Setores
-           que utiliza para particionar o disco e retorne a tela anterior.
-
-
-     Quando escolher algum parâmetro acima para alteração(Cilindros, cabeçotes 
-ou Setores do disco), será vista uma tela como esta:
-----------------------------------------------------------------------------
-                              CFdisk 0.8l
-
-                       Unidade de Disco: /dev/hda
-            Cabeças:255  Setores por trilha:63  Cilindros:627
------------------------------------------------------------------------------
-Nome    Opções    Tipo Part.  Tipo Sist. Arquivos   [VOLUME]    Tamanho(MB)
-hda1     Boot      Primary     Win 95 FAT 32                     1953.12
-hda5               Logical     DOS FAT 16 (BIG)     GLEYDSON      172.58
-                   Pri/Log     Espaço Livre                      2910.55
-
-
-
-
-
-
-
-
-
-Enter the number of Cylinders: 627
-
-----------------------------------------------------------------------------
-O valor que aparece ao selecionar a opção, é o valor que o disco esta
-utilizando atualmente(cilindros), e será pedido que digite um valor para os 
-Cilindros, que substituirá os da BIOS durante a seção de particionamento. 
-Para sair desta tela sem alterar o valor, pressione <ESC>. A mesma tela e 
-explicação se aplicam para as alterações de Cabeças e Setores.
-
-OBS: Se por acaso digitar um valor incorretamente para o tamanho do disco e 
-    não se lembrar mais do valor antigo ou original, selecione a opção Done, e
-    tecle <q> para sair do CFdisk sem gravar as alterações feitas para o 
-    disco, pois se continuar a utilizar o CFdisk com o tamanho do disco
-    incorreto, os dados existentes nele e até mesmo partições poderão ser
-    perdidos(as).
-
-Se aumentar o tamanho do disco, setores adicionais são acrescentados no 
-final do disco, e são mostrados como espaço livre.
-Se diminuir o tamanho do disco, as partições que estavam localizadas após
-o setor/cilindro que foi excluido(se existir alguma), será apagada e a
-última partição(ou espaço livre ao final do disco rígido), terá seu
-tamanho alterado e terminará neste "novo" último setor do disco.
-
-
-
-2.3.6-) O comando Help <h> ou <?>
-
-O comando Help mostra a tela de ajuda do programa, que descreve as funções
-das teclas utilizadas pelo programa e suas funções.
-
-
-
-2.3.7-) O comando Maximize <m>
-
-Este comando aumenta a utilização de espaço do disco na partição atual. 
-Isto porque o DOS, OS/2 e outros sistemas operacionais utilizam o primeiro 
-setor da primeira trilha da partição do disco e em todas as partições Lógicas
-para iniciar o sistema operacional, utilizando a segunda trilha em diante 
-daquela partição para fazer o armazenamento de arquivos. Este espaço perdido
-entre o segundo e o último Setor da primeira trilha da primeira cabeça, pode
-ser recuperado com a utilizando este comando.
-
-Este comando faz com que a partição se torne imcompatível com DOS, OS/2 
-e outros Sistemas Operacionais que utilizam este primeiro Setor do disco 
-para iniciar o sistema operacional.
-
-Se este comando for utilizado, será colocada uma opção chamada NC(não
-compatível) em Flags(na tela principal do CFdisk).
-
-Esta opção faz o uso máximo do disco e a incompatibilidade com o DOS/OS/2, 
-etc. O padrão quando criando uma Partição, é criando Partições compativeis 
-com o DOS, OS/2, etc.
-
-OBS: O Fdisk(8) e partições formatadas com o sistema de arquivos FAT32, fazem
-     a utilização completa deste espaço entre o segundo e o último Setor da
-     primeira trilha do disco, eliminando o desperdício de espaço.
-
-
-
-2.3.8-) O comando New <n>
-
-O comando New<n>, cria uma nova partição usando o espaço livre(FreeSpace)
-existente no disco. Após escolher esta opção, o CFdisk perguntará se deseja
-criar uma partição Primária, Lógica ou Cancelar o comando. 
-
-Escolhendo criar uma partição Primária ou Lógica, o sistema perguntará o
-tamanho da partição que deseja criar, por padrão, o CFdisk mostrará o espaço
-livre total disponível no disco para a criação da nova partição(em MegaBytes).
-Tecle <Enter> para criar uma partição do tipo escolhido com este tamanho ou
-digite um tamamho menor. O CFdisk permite que seja digitados valores em:
-
-- MegaBytes(M - o padrão do programa)
-- KiloBytes(K)
-- Cilindros(C)
-- Setores(S)
-
-Digitando-se o tamanho da partição seguida de uma das letras acima. Se a 
-letra não for digitada, o programa assumirá o tamanho que digitou em MegaBytes.
-
-OBS1: Quando criar uma partição Lógica, automaticamente será criada uma 
-      partição extendida, entre hdx1 e hdx4, e a partição Extendida não é
-      mostrada na tela de particionamento de disco. Se desejar exibir a 
-      partição extendida, execute o comando PRINT <p> e escolha a opção
-      Sector para verificar qual é a identificação da partição Extendida
-      no disco. Para maiores detalhes, veja o comando PRINT <p>.
-
-OBS2: São permitidas, no máximo, 4 partições Primárias e Extendidas(3 Primárias
-      e 1 Extendida ou 4 partições Primárias em cada disco). O CFdisk 
-      calculará automaticamente os valores das partições lógicas caso
-      as primeiras 4 partições forem ocupadas.
-
-O próximo passo, é a localização da partição no espaço livre existente no 
-disco. As duas opções disponíveis são:
-
-- Beginning : A partição é colocada a partir do inicio do espaço livre no
-              disco, ocupando o espaço livre de acordo com o seu tamanho
-              (do início para o fim do espaço livre ), este é o padrão para
-              a criação de novas partições e o mais utilizado. Veja o exemplo,
-              a criação de uma partição de 30MB em um disco com 50MB de
-              espaço não particionado, sendo que este disco já possui uma
-              partição de 120MB(com espaço total de 170MB)
-
-              ##################################MMMMMMMMMMMMMMMMMMMMMMMMMM
-                    |                                   |
-               Partição existente(120MB)           Espaço Livre(50MB)
-
-
-              com a nova partição criada:
-
-              ###################################################MMMMMMMMM
-                        |                            |            |
-              Partição existente(120MB)         Nova partição   Espaço
-                                                   (30MB)        Livre
-
-- End       : A partição é criada subtraindo-se o espaço livre total do disco
-              pelo tamanho da partição que será criada, começando a criar
-              esta partição a partir do ponto que resultou esta subtração.
-              Veja abaixo no exemplo, a partição que será criada terá o
-              tamanho de 30MB e existe no disco um espaço não particionado
-              de 50MB, com 120MB já ocupados por uma partição existente:
-
-              ##################################MMMMMMMMMMMMMMMMMMMMMMMMMM
-                    |                                   |
-               Partição existente(120MB)           Espaço Livre(50MB)
-
-
-              com a nova partição criada (Selecionando a opção End):
-
-              ##################################MMMMMMMMMM#################
-                        |                            |            |
-              Partição existente(120MB)           Espaço    Nova partição
-                                                   Livre        (30MB)
-                
-              A partição que será criada utilizara o espaço livre entre o
-              último Setor do disco e o setor resultante da subtração(170MB-30MB).
-              Mesmo assim, a ordem que será criada esta partição partição
-              será criada do Setor inicial(que é o resultado da subtração)
-              para o último Setor do disco. Existirá um espaço livre de 20MB
-              entre a primeira partição (de 120MB) e a nova partição de 30MB.
-              
-
-
-2.3.9-) O comando Print <p>
-
-Este comando mostra a tabela de partição no formato selecionado na tela,
-ou permite que seja gravado um arquivo no disco. Todas as partições são
-classificadas na ordem que foram gravadas no disco.
-
-Os formatos aceitos para visualização de partições são:
-
-RAW <r> : Formato de dados do disco, mostra os setores que serão gravados 
-          para o disco, caso seja escolhido o comando WRITE <W>. O formato
-          mostrado é exatamente aquele que será gravado para ao disco. 
-          Abaixo um exemplo deste formato:
-        --------------------------------------------------------------------  
-          Disk Drive: /dev/hda
-          Sector 0:
-          0x000: EB 69 4C 49 4C 4F 01 00 14 00 D7 02 00 00 00 00
-          0x010: FB 1B CF 36 74 D8 80 23 01 75 D8 80 23 01 73 D8
-          0x020: 80 23 01 01 77 01 77 D8 80 23 01 78 D8 80 23 01
-          0x030: 64 D8 80 23 01 65 D8 80 23 01 66 D8 80 23 01 67
-          0x040: D8 80 23 01 68 D8 80 23 01 69 D8 80 23 01 6A D8
-          0x050: 80 23 01 6B D8 80 23 01 00 00 00 00 00 00 00 00
-          0x060: 00 00 00 00 00 00 00 00 00 00 00 B8 C0 07 8E D8
-          0x070: 8C 06 66 00 89 36 64 00 89 1E 68 00 88 16 6A 00
-          0x080: B8 00 9A 8E C0 B9 00 01 29 F6 29 FF FC F3 A5 EA
-          0x090: 94 00 00 9A FA 8E D8 8E C0 BC 00 B0 B8 00 90 8E
-          0x0A0: D0 FB B0 0D E8 57 00 B0 0A E8 52 00 B0 4C E8 4D
-          0x0B0: 00 BE 30 00 BB 00 10 FC AD 89 C1 AD 89 C2 09 C8
-          0x0C0: 74 20 46 E8 43 00 72 06 81 C3 00 02 EB EA 50 B0
-          0x0D0: 20 E8 2A 00 58 88 E0 E8 12 00 31 C0 88 C2 CD 13
-          0x0E0: EB CF B0 49 E8 17 00 EA 00 00 00 9B 50 C0 E8 04
-          0x0F0: E8 01 00 58 24 0F 04 30 3C 3A 72 02 04 07 30 FF
-          0x100: B4 0E CD 10 C3 5A 59 5B C3 F6 C2 40 74 52 80 E2
-          0x110: BF 53 51 52 B4 08 CD 13 72 EB 88 F3 5A 88 16 6D
-          0x120: 01 88 F2 30 F6 88 F7 58 51 86 CD D0 C5 D0 C5 80
-          0x130: E5 03 89 0E 6B 01 59 83 E1 3F F7 F1 FE C2 88 16
-          0x140: 6E 01 31 D2 43 F7 F3 88 D6 8A 16 6D 01 3B 06 6B
-          0x150: 01 77 13 86 C4 D0 C8 D0 C8 0A 06 6E 01 89 C1 5B
-          0x160: B8 01 02 CD 13 C3 5B 31 C0 F9 C3 00 00 00 00 00
-          0x170: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x180: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x190: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x1A0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x1B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80 01
-          0x1C0: 01 00 0B FE 3F 8F 3F 00 00 00 51 4C 23 00 00 00
-          0x1D0: 41 D7 83 FE BF 6F 17 75 73 00 59 81 25 00 00 00
-          0x1E0: 01 98 05 FE 7F D6 98 42 25 00 7F 32 4E 00 00 00
-          0x1F0: 81 70 82 FE BF 72 70 F6 98 00 43 BC 00 00 55 AA
-          
-          Sector 2441880:
-          0x000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x0A0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x0B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x0C0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x0D0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x0E0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x0F0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x100: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x110: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x120: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x130: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x140: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x150: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x160: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x170: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x180: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x190: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x1A0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x1B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01
-          0x1C0: 01 98 0B FE 7F D6 3F 00 00 00 40 32 4E 00 00 00
-          0x1D0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x1E0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-          0x1F0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 55 AA
-          -----------------------------------------------------------------
-          A primeira tabela de partição mostrada é a Primária, depois
-          as tabelas de partições ligadas com cada partição lógica. Como
-          no exemplo, os dados são mostrados em bytes Hexadecimais(na 
-          primeira coluna) seguidos de 16 bytes por linha.
-
-Sector <s>: Mostra a tabela de partição classificada por setores. Esta 
-          opção mostra o espaço não particionado no disco e a partição
-          Extendida, que é mostrada antes das partições Lógicas. 
-          Abaixo um exemplo deste formato:
-          ------------------------------------------------------------------
-          Partition Table for /dev/hda
-
-                      First    Last
-           # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags
-          -- ------- -------- --------- ------ --------- ---------------------- ---------
-           1 Primary        0  2313359      63  2313360  Win95 FAT32 (0B)       Boot (80)
-             Logical  2313360  2441879       0   128520  Free Space             None (00)
-           3 Primary  2441880  7566614       0  5124735  Extended (05)          None (00)
-           5 Logical  2441880  7566614      63  5124735  Win95 FAT32 (0B)       None (00)
-           2 Primary  7566615 10024559       0  2457945  Linux (83)             None (00)
-           4 Primary 10024560 10072754       0    48195  Linux Swap (82)        None (00)
-          ------------------------------------------------------------------
-
-          onde:
-          #            - Identificação da partição no disco /dev/hda
-          Type         - Tipo da partição(veja o exemplo)
-          First Sector - Primeiro Setor utilizado para o armazanamento da partição.
-          Last Sector  - Último Setor utilizado para o armazenamento da partição.
-          Offset       - 
-          Lenght       - Tamanho total da partição em setores (Last Sector - First 
-                         Sector).
-          FileSystem Type (ID) - Identificação do Sistema de Arquivos da partição, 
-                        seguido do seu código hexadecimal no CFDisk. A partição
-                        Extendida é identificada como um sistema de arquivos
-                        com o código 05 (veja o exemplo).
-          Flags        - Opções da partição seguido de seu valor em
-                         hexadecimal.
-
-Table <t> : Mostra a tabela de partição classificada pelo número da partição. 
-            Esta opção deixa fora todo espaço livre e não usado na partição.
-            Abaixo um exemplo deste formato.
-            ----------------------------------------------------------------
-            Partition Table for /dev/hda
-
-                     ---Starting---      ----Ending----    Start Number of
-             # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors
-            -- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------
-             1  0x80    1    1    0 0x0B  254   63  143       63   2313297
-             2  0x00    0    1  471 0x83  254   63  623  7566615   2457945
-             3  0x00    0    1  152 0x05  254   63  470  2441880   5124735
-             4  0x00    0    1  624 0x82  254   63  626 10024560     48195
-             5  0x00    1    1  152 0x0B  254   63  470       63   5124672
-             ---------------------------------------------------------------
-
-             onde:
-             #                 - Número da partição de disco
-             Flags             - As opções utilizadas com a partição (em 
-                                 valor Hexadecimal).
-                                 O valor 0x80 equivale a BOOT.
-                                 O valor 0x00 equivale a nenhuma opção 
-                                 utilizada naquela partição.
-             Starting
-             Head              - Cabeçote Inicial             
-             Sector            - Setor Inicial
-             Cyl               - Cilindro Inicial
-             ID                - Identificação do Sistema de arquivos(em 
-                                 hexadecimal, conforme a tabela do CFdisk).
-             Ending
-             Head              - Cabeçote Final
-             Sector            - Setor Final
-             Cyl               - Cilindro Final
-             Start Sector      - Setor inicial da partição
-             Number of Sectors - Número de setores ocupados pela partição.  
-
-Se a partição não inicia ou não termina em um cilindro limite do disco
-ou se o seu tamanho não é divisível pelo tamanho do cilindro, um * é será
-mostrado após o setor não alinhado. Este problema normalmente ocorre quando
-a partição é criada por um Sistema operacional em que o limite da partição
-não é alinhada com o cilindro ou que utiliza a contagem do tamanho do disco
-de forma diferente. 
-
- A tabela de partição somente tem 10 bits disponível para identificar o 
-cilindro inicial e final. Assim, quando o setor inicial absoluto é um 
-cilindro maior que 1023(final do disco), o valor máximo para a cabeça 
-inicial, setor e cilindro são mostrados. Este metodo é usado pelo OS/2, e
-e corrige os problemas associados com OS/2 caso o Fdisk regrava a tabela de
-partição quanto ela não esta neste formato.
-
-Desde então Linux e OS/2 utilizam esta contagem de setores absolutos, os
-valores na cabeça inicial e final, Setor e Cilindro não são usadas.
-
-
-
-2.3.10-) O comando quit <q>
-
-Esta opção faz com que o CFdisk abandonar todas as alterações e
-retornar para o Aviso de comando. Quando esta opção é escolhida, o programa
-retorna deixando o disco como estava antes de se iniciar o particionamento.
-
-Se escolher esta opção o CFdisk abandonará o particionamento de disco
-e voltará para a linha de comandos imediatamente. Se alterar/criar/excluir
-alguma partição de disco e escolher esta opção, o programa emitirá um Beep
-indicando que alguma alteração feita no disco foi abandonada.
-
-OBS: Esta opção é útil caso tenha se cometido algum engano durante o
-     particionamento do disco, como apagar por uma partição que contém 
-     arquivos, alterar o tamanho do disco(geometria), etc. Lembre-se que
-     tudo o que fez será abandonado, durante o particionamento, se escolher
-     esta opção.
-
-
-
-2.3.11-) O comando type <t>
-
-Comando usado para alterar o tipo do sistema de arquivos utilizado
-pela partição. As partições, quando criadas, recebem o sistema de arquivos
-Linux Native(ou simplesmente Linux - tipo 83). O CFdisk pode criar, manipular,
-excluir, uma grande variedade de Sistemas de arquivos para os mais diversos
-tipos de sistemas operacionais existentes, veja o final deste manual para
-ver as partições compatíveis com este programa. 
-
-Para alterar o tipo do sistema de arquivos (File System) utilizado pela
-partição, tecle <t>, e digite o valor de acordo com a lista de partições
-disponíveis no programa.
-
-Por exemplo, para mudar a partição do tipo Linux para Linux Swap, selecione
-esta partição, e tecle <t>, e digite o número 82(que corresponde a Linux
-Native) e tecle <Enter>, e a partição terá seu sistema de arquivos alterado.
-
-
-
-2.3.12-) O comando units <u>
-
-A função deste comando é alterar as unidades de medida do tamanho da 
-partição que é mostrado na tela, por padrão, ele é mostrado em MegaBytes.
-As unidades de medida do tamanho da partição são em MegaBytes, Cilindros e
-Setores ocupados pela partição de disco.
-Abaixo um exemplo da mudança da unidade de medida para Cilindros.
-----------------------------------------------------------------------------
-                              CFdisk 0.8l
-
-                         Disk Drive: /dev/hda
-            Heads:255  Sectores per track:63  Cylinders:627
------------------------------------------------------------------------------
-Name       Flags        Part Type   FSType           [LABEL]    Cilinders
-hda1       Boot         Primary     Win 95 FAT 32                  249
-hda5                    Logical     DOS FAT 16 (BIG) GLEYDSON       22 
-                        Pri/Log     Free Space                     371
-
-
-
-
-
-
-
-
-
-
-[Bootable]  [Delete]  [Help]  [Maximize]  [Print]
-[Quit]      [Type]    [Units] [Write]
-----------------------------------------------------------------------------
-Será mostrada a quantidade de cilindros que a partição ocupa no disco ao
-invés do espaço em MB.
-
-
-
-2.3.13-) O comando Write <W>
-
-Este comando grava todas as tabelas de partições criadas/modificadas e
-excluidas para o disco. Só é aceita a tecla <W> em maiúscula para gravação 
-da partição de disco, por motivos de segurança para que não seja feita a
-gravação acidental das partições enquando estiver utilizando o programa. 
-Para quem utiliza as setas do teclado, o método é o mesmo que as outras 
-opções.
-
-Após selecionar esta opção, o CFdisk perguntará se confirma a gravação
-das partições para o disco. 
-
-Para gravar a partição, digite "yes" e tecle <Enter>.
-Para cancelar o comando, pressione <Esc> ou digite "no" e tecle <Enter>.
-
-Após confirmar com "yes", o CFdisk gravará a tabela de partição no disco
-e fara o Kernel re-ler a tabela de partição do disco, para se evitar 
-reiniciar o sistema para utilizar a nova tabela de partição. 
-
-A tentativa de re-leitura da tabela de partição pode falhar. Para 
-solucionar este problema, é preciso reiniciar o computador, quando o
-computador é reiniciado, o sistema operacional faz uma nova leitura das
-tabelas de partições existentes no disco, fazendo com que sejam reconhecidas
-corretamente.
-
-
-
-3-) Tipos de partições compatíveis com o CFdisk
-
-Abaixo uma listagem das partições compatíveis com o programa CFdisk e 
-seus respectivos códigos Hexadecimais, para consulta técnica ou utilização
-durante o particionamento de disco.
-
-Código Nome
-01 - 	 DOS FAT12
-02 - 	 Xenix root
-03 - 	 Xenix usr
-04 - 	 DOS FAT16 (<32MB)
-05 - 	 Extendida
-06 - 	 DOS FAT16 (>=32MB)
-07 - 	 OS/2 HPFS ou NTFS
-08 - 	 AIX
-09 - 	 AIX inicializável
-0A - 	 OS/2 Boot Manager
-0B - 	 Windows 95 FAT32
-0C - 	 Windows 95 FAT32(LBA)
-0E - 	 Windows 95 FAT16(LBA)
-0F - 	 Windows 95 Extendida
-11 - 	 DOS FAT12 oculta
-12 - 	 DOS FAT16 oculta
-16 - 	 DOS FAT16 oculta
-17 - 	 HPFS OS/2 oculta
-40 - 	 Venix 80286
-51 - 	 Novell
-52 - 	 Microport
-63 - 	 GNU Hurd
-64 - 	 Novell Netware 286
-65 - 	 Novell Netware 386
-75 - 	 PC/IX
-80 - 	 Minix Antigo
-81 - 	 Linux / Minix
-82 - 	 Linux Swap
-83 - 	 Linux Nativa
-85 - 	 Linux Extendida
-93 - 	 Amoeba
-94 - 	 Amoeba BBT
-A5 - 	 BSD/386
-A6 - 	 Open BSD
-A7 - 	 NextStep
-B7 - 	 BSDI Sistema de Arquivos
-B8 - 	 BSDI Swap
-C7 - 	 Syrinx
-DB - 	 CP/M
-E1 - 	 DOS access
-E3 - 	 DOS R/O
-F2 - 	 DOS secundária
-FF - 	 BBT
-
-
-
-
-4- ) Direitos Autorais
-
-Este documento foi desenvolvido com base em minha experiência e conhecimento em
-discos e partições, e mediante pesquisa em alguns documentos como os How-TO do
-Linux tendo como objetivo a contribuição para a comunidade Linux em geral.
-
-Gleydson M. da Silva (gleydson_s@yahoo.com ou gleydson@linuxbr.com.br)
-
-Qualquer dúvida, sugestão ou reclamação podem ser mandadas para um dos
-E-Mail's Acima. Conto com sua contribuição para a melhoria deste Manual.
-
-Autorizo a reprodução Total ou parcial deste texto para que seja utilizado para
-fins educativos, autoaprendizado, colocação em Home pages e qualquer outra 
-forma de distribuição não comercial do documento desde que sejam mantidos os 
-meus créditos pela pesquisa e desenvolvimento deste documento de acordo com os
-termos da GNU (veja abaixo).
-
-
-
-
-5- ) Licenças e Garantias sobre este documento
-
- 
-CFdisk-Portuguese Copyright (C) 1999 Gleydson M. da Silva
- 
-Este é um documento de livre distribuição, que pode ser copiado e 
-distribuído sob os termos da Licença Pública Geral  GNU, conforme publicada
-pela Free Software Foundation, versão 2 da licença ou (a critério do autor)
-qualquer versão posterior. 
-
-Este documento é distribuído com a itenção de ser útil ao seu utilizador,
-no entanto NÃO TEM NENHUMA GARANTIA,  EXPLÍCITAS OU IMPLÍCITAS , COMERCIAIS
-OU DE ATENDIMENTO A UMA DETERMINADA FINALIDADE. Consulte a Licença Pública 
-Geral  GNU para maiores detalhes. 
-
-gleydson_s@yahoo.com
-gleydson@linuxbr.com.br
-
-
-
-6- )Nota sobre Marcas Registradas
-
-Os programas mencionados neste manual são de propriedade dos seus respectivos
-donos:
-
-MS-DOS, Windows 3.1x, Windows 9x, Windows NT são de propriedade da Microsoft.
-OS/2 e OS/2 Warp são de propriedade da IBM
-
-
-7- ) Agradecimentos
-
-Agradeço a todas as pessoas que me mandam correções, comentários, críticas, 
-elogios, dúvidas sobre este documento, pois através destas mensagens, estão 
-contribuindo para a melhoria deste projeto e me icentivando em sua continuação.
- 
-
-Agradecimentos especiais a:
-
-Eduardo Marcel Macan <macan@thecore.com.br> - Pelo apoio e interesse na 
-         divulgação deste projeto e outros documentos relacionados com a 
-         tradução e divulgação de documentos sobre o Linux no Brasil.
-
-Jorge Godoy <jorge@bestway.com.br> - Pela revisão deste documento e primeiras
-         orientações para a conversão deste para SGML.
-
-Adam di Carlo <adam@onshore.com> - Que me deu apoio na colocação deste documento
-         na documentação da distribuição Debian.
-
-E a voce pelo interesse em conhecer mais sobre o Linux.
-
-
-<EOF>
\ No newline at end of file
diff --git a/fdisk/doc/Fdisk-Portuguese.html b/fdisk/doc/Fdisk-Portuguese.html
deleted file mode 100644
index fdf29b809..000000000
--- a/fdisk/doc/Fdisk-Portuguese.html
+++ /dev/null
@@ -1,1118 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="Gleydson Silva">
-   <meta name="GENERATOR" content="Mozilla/4.5 [en] (Win95; I) [Netscape]">
-   <title>Fdisk-Portugues-HOWTO</title>
-</head>
-<body>
-
-<center><b><font size=+1>Fdisk-Portugues-HOWTO Copyright (C) 1999 Gleydson
-M. da Silva</font></b>
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<br>&nbsp;
-<p>
-<hr WIDTH="100%">
-<br><b>Gleydson M. da Silva</b><i> - gleydson@linuxbr.com.br</i>
-<br><b>Vers&atilde;o 1.3</b></center>
-
-<hr WIDTH="100%">
-<br>&nbsp;
-<br>&nbsp;
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<center>
-<p><a NAME="Indice"></a><b><u><font size=+2>&Iacute;ndice</font></u></b></center>
-
-<p><b><font size=+1>1</font></b> -<a href="#1"> Introdu&ccedil;&atilde;o
-ao Fdisk</a>
-<br>&nbsp; <b>1.1</b> - <a href="#1.1">O que &eacute; uma Parti&ccedil;&atilde;o
-de Disco</a>
-<br>&nbsp; <b>1.2</b> - <a href="#1.2">A Tabela de Parti&ccedil;&atilde;o</a>
-<br>&nbsp; <b>1.3</b> - <a href="#1.3">Introdu&ccedil;&atilde;o ao Particionamento
-de discos</a>
-<br>&nbsp; <b>1.4</b> - <a href="#1.4">Identifica&ccedil;&otilde;es utilizadas
-neste documento</a>
-<br>&nbsp; <b>1.5</b> - <a href="#1.5">Identifica&ccedil;&atilde;o de discos
-e parti&ccedil;&otilde;es no Linux</a>
-<br>&nbsp; <b>1.6</b> - <a href="#1.6">Tipos de parti&ccedil;&otilde;es
-de disco</a>
-<br>&nbsp; <b>1.7</b>-) <a href="#1.7">Observa&ccedil;&otilde;es sobre
-o formato DOS 6.XX(FAT 16)</a>
-<p><b><font size=+1>2</font></b> - <a href="#2">Iniciando o programa Fdisk</a>
-<br>&nbsp; <b>2.1</b> - <a href="#2.1">Op&ccedil;&otilde;es de Linha de
-comando</a>
-<br>&nbsp; <b>2.2</b> - <a href="#2.2">Comandos do Fdisk</a>
-<p><b><font size=+1>3</font></b> - <a href="#3">Manipulando parti&ccedil;&otilde;es
-no disco r&iacute;gido</a>
-<br>&nbsp; <b>3.1</b> - <a href="#3.1">Listando parti&ccedil;&otilde;es
-existentes no disco</a>
-<br>&nbsp; <b>3.2</b> - <a href="#3.2">Criando parti&ccedil;&otilde;es
-de disco</a>
-<br>&nbsp; <b>3.3</b> - <a href="#3.3">Mudando o tipo da parti&ccedil;&atilde;o</a>
-<br>&nbsp; <b>3.4</b> - <a href="#3.4">Excluindo uma parti&ccedil;&atilde;o
-de disco</a>
-<br>&nbsp; <b>3.5</b> - <a href="#3.5">Gravando parti&ccedil;&otilde;es
-alteradas para o disco</a>
-<br>&nbsp; <b>3.6</b> - <a href="#3.6">Abandonando o programa sem gravar
-altera&ccedil;&otilde;es para o disco</a>
-<br>&nbsp; <b>3.7</b> - <a href="#3.7">Alternando entre parti&ccedil;&atilde;o
-inicializ&aacute;vel/n&atilde;o inicializ&aacute;vel</a>
-<br>&nbsp; <b>3.8</b> -<a href="#3.8"> Escolhendo a unidade&nbsp; para
-mostrar o tamanho ocupado pela parti&ccedil;&atilde;o</a>
-<p><b><font size=+1>4</font></b> - <a href="#4">Tipos de parti&ccedil;&otilde;es
-reconhecidas pelo Fdisk</a>
-<p><b><font size=+1>5</font></b> - <a href="#5">Direitos Autorais</a>
-<p><b><font size=+1>6</font></b> - <a href="#6">Licen&ccedil;as e Garantias
-sobre este documento</a>
-<p><b><font size=+1>7</font></b> - <a href="#7">Marcas Registradas</a>
-<p><font size=+1>8</font> - <a href="#8">Agradecimentos</a>
-<br>&nbsp;
-<br>&nbsp;
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<center>
-<p><a NAME="1"></a><u><font size=+1>1-) Introdu&ccedil;&atilde;o ao Fdisk</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Fdisk &eacute; um programa utilizado para o particionamento
-de discos r&iacute;gidos <i>IDE</i> e <i>SCSI</i>.&nbsp;&nbsp; A vers&atilde;o
-do programa Fdisk descrita neste manual &eacute; a <i>2.8</i>
-<p><b>ATEN&Ccedil;&Atilde;O</b>: ESTE MANUAL TEM COMO OBJETIVO A EXPLICA&Ccedil;&Atilde;O
-DE
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-FUNCIONAMENTO E&nbsp; UTILIZA&Ccedil;&Atilde;O DO FDISK DO LINUX (N&Atilde;O
-O
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-FDISK DO DOS), MESMO QUE&nbsp; VOCE SEJA UM USU&Aacute;RIO DO DOS,
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-RECOMENDO QUE LEIA ESTE MANUAL COMO UMA REFER&Ecirc;NCIA
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-T&Eacute;CNICA E PARA SEU APRENDIZADO.
-<p><b>&nbsp;&nbsp;&nbsp; Este documento &eacute; distribu&iacute;do com
-a iten&ccedil;&atilde;o de ser &uacute;til ao seu utilizador, no entanto
-N&Atilde;O TEM NENHUMA GARANTIA,&nbsp; EXPL&Iacute;CITAS OU IMPL&Iacute;CITAS
-, COMERCIAIS OU DE ATENDIMENTO A UMA DETERMINADA FINALIDADE. Consulte a
-Licen&ccedil;a P&uacute;blica Geral&nbsp; (GNU) para maiores detalhes.</b>
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="1.1"></a><u><font size=+1>1.1-) Parti&ccedil;&atilde;o de Disco</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Uma <i>parti&ccedil;&atilde;o de disco</i> &eacute;
-o local onde o sistema operacional armazena seu sistema de arquivos(<i>arquivos,
-diret&oacute;rios, FAT, boot sector, etc</i>).
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="1.2"></a><u><font size=+1>1.2-) Tabela de parti&ccedil;&atilde;o</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; A <i>Tabela de parti&ccedil;&atilde;o</i> &eacute;
-o local do disco r&iacute;gido onde se localizam os dados sobre todas as
-parti&ccedil;&otilde;es existentes no disco como o sistema de arquivos
-utilizado, se ela &eacute; inicializ&aacute;vel, a cabe&ccedil;a inicial/final,
-setor inicial/final, cilindro inicial/final, n&uacute;mero de setores ocupados
-por ela no disco.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="1.3"></a><u><font size=+1>1.3-) Introdu&ccedil;&atilde;o ao
-particionamento de discos</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Particionar o disco r&iacute;gido &eacute; dividir
-ele em partes para armazenamento de arquivos e programas. As parti&ccedil;&otilde;es
-criadas no disco podem ter o tamanho que desejar (desde que esteja dentro
-da capacidade m&aacute;xima do disco r&iacute;gido).
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Uma parti&ccedil;&atilde;o n&atilde;o interfere
-em outras parti&ccedil;&otilde;es do mesmo disco(&eacute; como se tivessemos
-v&aacute;rios discos r&iacute;gidos dentro de um).
-<br>&nbsp;&nbsp;&nbsp; Em um disco r&iacute;gido, pode ser criada uma parti&ccedil;&atilde;o
-&uacute;nica, que neste caso todo o disco r&iacute;gido&nbsp; &eacute;
-usado para armazenar os arquivos(que &eacute; o caso mais comum caso voce
-tenha o DOS), ou v&aacute;rias parti&ccedil;&otilde;es, que podem ser usadas
-pelo mesmo SO(Sistema Operacional) ou outros sistemas operacionais diferentes(um
-exemplo de v&aacute;rias parti&ccedil;&otilde;es, &eacute; se voce for
-usar o DOS e o Linux no mesmo disco, os dois
-<br>sistemas v&atilde;o estar no mesmo disco mas um n&atilde;o interfere
-no outro).
-<br>&nbsp;&nbsp;&nbsp; Este manual tem a iten&ccedil;&atilde;o de explicar
-o funcionamento do programa fdisk (fdisk do Linux n&atilde;o do DOS!).
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="1.4"></a><u><font size=+1>1.4-) Algumas identifica&ccedil;&otilde;es
-utilizadas neste manual para facilitar a&nbsp; compreens&atilde;o do texto</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Esta parte descreve algumas caracter&iacute;sticas
-de organiza&ccedil;&atilde;o deste manual e algumas identifica&ccedil;&otilde;es
-que adotei para facilitar o seu entendimento, e as explica&ccedil;&otilde;es
-que ser&atilde;o dadas.
-<p>&nbsp;&nbsp;&nbsp; Explica&ccedil;&atilde;o de nomes e comandos, ser&aacute;
-seguida da palavra "<b>onde</b>" e abaixo dela as explica&ccedil;&otilde;es
-sobre os comandos, exemplo:
-<p><b>onde</b>:
-<br><i>nome a ser explicado1</i>&nbsp; : Descri&ccedil;&atilde;o
-<br><i>nome a ser explicado2</i>&nbsp; : Descri&ccedil;&atilde;o
-<br><i>nome a ser explicado3</i>&nbsp; : Descri&ccedil;&atilde;o
-<p>ou
-<p><b>onde</b>:
-<br><i>nome a ser explicado1</i>&nbsp; - Descri&ccedil;&atilde;o
-<br><i>nome a ser explicado2</i>&nbsp; - Descri&ccedil;&atilde;o
-<br><i>nome a ser explicado3</i>&nbsp; - Descri&ccedil;&atilde;o
-<br>&nbsp;
-<p>&nbsp;&nbsp;&nbsp; Quando for feita alguma refer&ecirc;ncia com tecla
-do teclado, por exemplo, pressione p para listar as parti&ccedil;&otilde;es,
-a letra sera colocada entre &lt;> para facilitar a interpreta&ccedil;&atilde;o:
-<br>pressione &lt;p> para listar as parti&ccedil;&otilde;es
-<br>ap&oacute;s isto pressione &lt;Enter> para confirmar
-<br>pressione &lt;l> para listar os tipos de parti&ccedil;&otilde;es dispon&iacute;veis
-<br>&nbsp;
-<p>&nbsp;&nbsp;&nbsp; As linhas pontilhadas que aparecem na tela, veja
-abaixo,
-<br>----------------------------------------------------------------------------
-<br>----------------------------------------------------------------------------
-<br>servem para identificar que o que esta entre as linhas &eacute; um
-exemplo de como
-<br>ser&aacute; a resposta do comando para a tela de seu computador.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="1.5"></a><u><font size=+1>1.5-) Identifica&ccedil;&atilde;o
-de discos e parti&ccedil;&otilde;es no Linux</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Antes de descrever como se utiliza o programa fdisk,
-&eacute; importante fazer algumas explica&ccedil;&otilde;es sobre a identifica&ccedil;&atilde;o
-das parti&ccedil;&otilde;es e unidades de disco no sistema Linux( e outros
-*nix). Se voce for um usu&aacute;rio que j&aacute; conhece a interpreta&ccedil;&atilde;o
-de discos e parti&ccedil;&otilde;es neste sistema, voce n&atilde;o precisar&aacute;
-ler esta parte.
-<br>&nbsp;&nbsp;&nbsp; No sistema operacional Linux, os dispositivos existentes
-no computador (como impressoras, unidades de disquetes, discos r&iacute;gidos,
-monitor, placa de som, etc...) s&atilde;o identificados por um nome referente
-a este dispositivo e colocado no diret&oacute;rio /dev (que &eacute; utilizado
-para identificar dispositivos ou perif&eacute;ricos existentes no computador).
-<br>&nbsp;&nbsp; A identifica&ccedil;&atilde;o dos discos r&iacute;gidos
-segue a seguinte forma:
-<p>&nbsp; /dev/hda1
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |&nbsp;&nbsp; |&nbsp;
-|
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |&nbsp;&nbsp; |&nbsp;
-|_N&uacute;mero que identifica a parti&ccedil;&atilde;o do disco r&iacute;gido(<i>1=Primeira,
-2=segunda</i>)
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |&nbsp;&nbsp; |
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |&nbsp;&nbsp; |_Letra
-que identifica o disco r&iacute;gido(<i>a=primeiro disco, b=segundo disco,
-etc..</i>)
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |
-<br>&nbsp; |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |_Sigla HD - Significa
-que &eacute; um disco r&iacute;gido IDE(<i>Se tiver um SD significa SCSI</i>)
-<br>&nbsp; |
-<br>&nbsp; |_ Identifica&ccedil;&atilde;o do diret&oacute;rio onde os dispositivos
-do sistema s&atilde;o armazenados
-<p><b>OBS</b>: As unidades de disco r&iacute;gido <i>SCSI</i>, s&atilde;o
-identificadas com as letras <i>sd</i>&nbsp; seguida pela letra da
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; unidade e n&uacute;mero
-da parti&ccedil;&atilde;o e os discos <i>IDE</i> s&atilde;o identificados
-por <i>hd</i> seguida pela letra da
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; unidade de disco e
-o n&uacute;mero da parti&ccedil;&atilde;o do disco(como visto acima).
-<p>Abaixo, algumas identifica&ccedil;&otilde;es de disco do sistema Linux:
-<p><i>/dev/hda1</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE prim&aacute;rio principal - Primeira parti&ccedil;&atilde;o
-<br><i>/dev/hda2&nbsp;</i>&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE prim&aacute;rio principal - Segunda parti&ccedil;&atilde;o
-<br><i>/dev/hda3</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE prim&aacute;rio principal - Terceira parti&ccedil;&atilde;o
-<br><i>/dev/hdb1</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE prim&aacute;rio escravo - Primeira parti&ccedil;&atilde;o
-<br><i>/dev/hdb2</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE prim&aacute;rio escravo - Segunda parti&ccedil;&atilde;o
-<br><i>/dev/hdb3</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE prim&aacute;rio escravo - Terceira parti&ccedil;&atilde;o
-<br><i>/dev/hdc1</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE secund&aacute;rio principal - Primeira parti&ccedil;&atilde;o
-<br><i>/dev/hdc2</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE secund&aacute;rio principal - Segunda parti&ccedil;&atilde;o
-<br><i>/dev/hdc3</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE secund&aacute;rio principal - Terceira parti&ccedil;&atilde;o
-<br><i>/dev/hdd1</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE secund&aacute;rio escravo - Primeira parti&ccedil;&atilde;o
-<br><i>/dev/hdd2</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE secund&aacute;rio escravo - Segunda parti&ccedil;&atilde;o
-<br><i>/dev/hdd3</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Disco r&iacute;gido
-IDE secund&aacute;rio escravo - Terceira parti&ccedil;&atilde;o
-<br><i>/dev/sda1</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Primeiro disco r&iacute;gido
-SCSI - Primeira parti&ccedil;&atilde;o
-<br><i>/dev/sda2</i>&nbsp;&nbsp; -&nbsp;&nbsp; Primeiro disco r&iacute;gido
-SCSI - Segunda parti&ccedil;&atilde;o
-<br><i>/dev/sda3</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Primeiro disco r&iacute;gido
-SCSI - Terceira parti&ccedil;&atilde;o
-<br><i>/dev/sdb1</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Segundo disco r&iacute;gido
-SCSI - Primeira parti&ccedil;&atilde;o
-<br><i>/dev/sdb2</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Segundo disco r&iacute;gido
-SCSI - Segunda parti&ccedil;&atilde;o
-<br><i>/dev/sdb3</i>&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp; Segundo disco r&iacute;gido
-SCSI - Terceira parti&ccedil;&atilde;o
-<p>&nbsp;&nbsp;&nbsp; No exemplo acima foram usadas 3 parti&ccedil;&otilde;es
-por disco, mas podem existir mais parti&ccedil;&otilde;es no mesmo disco,
-um exemplo &eacute; se o disco r&iacute;gido possuir <i>parti&ccedil;&otilde;es
-L&oacute;gicas</i>, que s&atilde;o identificadas no sistemas a partir de
-/dev/hdx5 em diante.
-<p>&nbsp;&nbsp;&nbsp; Abaixo um exemplo de como o Linux identifica as parti&ccedil;&otilde;es
-em cada disco existente em seu computador:
-<p>Vamos supor que eu tenha 2 discos r&iacute;gidos:
-<br>o <i>1&ordm;disco de 2GB</i> e o <i>2&ordm;disco&nbsp; de 1GB </i>(Giga
-Byte ou 1.000 Megas)
-<p>&nbsp;&nbsp;&nbsp; No primeiro disco(<i>de 2GB</i>), a primeira parti&ccedil;&atilde;o
-&eacute; de <i>800MB</i> do tipo FAT16(<i>DOS</i>), a segunda parti&ccedil;&atilde;o
-&eacute; de <i>1.2GB</i> do tipo EXT2(<i>Linux</i>)(<i>1.2GB+800MB=2GB</i>
-que &eacute; a capacidade total do disco). Ent&atilde;o as parti&ccedil;&otilde;es
-seriam identificadas da seguinte forma no Linux:
-<p><i>/dev/hda</i> - Disco r&iacute;gido Prim&aacute;rio Principal
-<br><i>/dev/hda1</i> - Primeira parti&ccedil;&atilde;o do primeiro disco
-r&iacute;gido (de 800MB do tipo DOS)
-<br><i>/dev/hda2</i> - Segunda parti&ccedil;&atilde;o do primeiro disco
-r&iacute;gido( de 1.2GB do tipo Linux)
-<p>&nbsp;&nbsp;&nbsp; Neste caso estariam dispon&iacute;veis <i>800MB</i>
-para serem usados com o DOS e <i>1.2GB</i> para o Linux.
-<br>&nbsp;&nbsp;&nbsp; Por exemplo, se voce particionar um disco r&iacute;gido
-em duas partes e usar as duas parti&ccedil;&otilde;es no DOS, ele reconhecer&aacute;
-as parti&ccedil;&otilde;es como sendo C: e D:.
-<p><b>Lembre-se</b>: Quando um disco &eacute; particionado, uma parti&ccedil;&atilde;o
-n&atilde;o interfere nas outras, repare que
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-quando voce particiona(divide) um disco, &eacute; como se tivesse dois
-discos r&iacute;gidos(o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&uacute;nico cuidado que voce deve tomar &eacute; com as c&oacute;pias
-de seguran&ccedil;a, porque se der um
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-problema de parte eletr&ocirc;nica no disco r&iacute;gido, por exemplo,&nbsp;
-a sua placa controladora
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-queimar ou o cabe&ccedil;ote dele ir pro espa&ccedil;o, ser&atilde;o perdidas
-as suas 2 parti&ccedil;&otilde;es que
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-est&atilde;o armazenadas nele.
-<br>&nbsp;
-<p>Voltando ao exemplo das classifica&ccedil;&otilde;es das parti&ccedil;&otilde;es
-do disco, vamos para o segundo disco:
-<p>&nbsp;&nbsp;&nbsp; No segundo disco(<i>1GB</i>), eu tenho uma parti&ccedil;&atilde;o
-de <i>950MB</i> do tipo FAT16(<i>DOS</i>), que costumo usar para armazenar
-arquivos tempor&aacute;rios e c&oacute;pias de seguran&ccedil;a de meu
-computador, etc..., e outra de 50MB <i>SWAP</i>(Parti&ccedil;&atilde;o
-de mem&oacute;ria virtual como descrevi acima)(<i>950MB+50MB=1GB</i>).
-Ent&atilde;o as parti&ccedil;&otilde;es deste disco seriam identificadas
-da seguinte forma no Linux:
-<p><i>/dev/hdb</i>&nbsp;&nbsp; - Disco r&iacute;gido principal escravo
-<br><i>/dev/hdb1</i> - Primeira parti&ccedil;&atilde;o do disco acima (
-de 950MB do tipo DOS)
-<br><i>/dev/hdb2</i> - Segunda parti&ccedil;&atilde;o do disco acima (
-de 50MB do tipo SWAP)
-<p>&nbsp;&nbsp;&nbsp; No disco acima, <i>950MB</i> est&atilde;o dispon&iacute;veis
-para serem usados pelo DOS e <i>50 MB</i> pela mem&oacute;ria virtual (<i>SWAP</i>)
-do Linux.
-<p>&nbsp;&nbsp;&nbsp; Note que se voce utiliza o MS-DOS, n&atilde;o ser&aacute;
-poss&iacute;vel conseguir&aacute; ver as parti&ccedil;&otilde;es do Linux
-e SWAP, porque s&atilde;o imcompat&iacute;veis com o formato aceito pelo
-DOS (ele identificaria a primeira parti&ccedil;&atilde;o do primeiro disco(800MB)
-como a unidade C: e a primeira parti&ccedil;&atilde;o do segundo disco(950MB)
-como unidade D), mas o contr&aacute;rio n&atilde;o acontece; O Linux tem
-total compatibilidade com a parti&ccedil;&atilde;o DOS FAT12, FAT16, FAT32,
-OS/2 HPFS, e muitas outras.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="1.6"></a><u><font size=+1>1.6-) Tipos de parti&ccedil;&otilde;es
-de discos</font></u></center>
-
-<p>&nbsp;&nbsp; As parti&ccedil;&otilde;es de disco s&atilde;o divididas
-em tres tipos: <i>Prim&aacute;ria, Extendida </i>e<i> L&oacute;gica</i>.
-<p>&nbsp;&nbsp; Pode se ter no m&aacute;ximo quatro parti&ccedil;&otilde;es
-prim&aacute;rias e extendidas no mesmo disco. A <i>parti&ccedil;&atilde;o
-Prim&aacute;ria</i> permite o armazenamento de arquivos e diret&oacute;rios.
-<br>Todos os computadores que possuem somente a unidade C(supondo que voce
-use o DOS), usam este tipo de parti&ccedil;&atilde;o para armazenamento
-de arquivos e inicializa&ccedil;&atilde;o do sistema operacional.
-<br>&nbsp;&nbsp;&nbsp; Se for preciso criar mais que 4 parti&ccedil;&otilde;es
-no mesmo disco, ser&aacute; necess&aacute;rio
-<br>criar uma <i>parti&ccedil;&atilde;o Extendida</i>. A <i>parti&ccedil;&atilde;o
-Extendida</i>&nbsp; n&atilde;o pode ser utilizada para armazenar arquivos.
-Ela &eacute; usada para a cria&ccedil;&atilde;o de outras parti&ccedil;&otilde;es,
-dentro dela, que s&atilde;o chamadas de <i>parti&ccedil;&otilde;es L&oacute;gicas</i>.
-<br>&nbsp;&nbsp;&nbsp; Uma <i>parti&ccedil;&atilde;o extendida</i> podem
-conter v&aacute;rias <i>parti&ccedil;&otilde;es L&oacute;gicas</i>. As
-parti&ccedil;&otilde;es L&oacute;gicas podem armazenar arquivos e diret&oacute;rios(como
-as parti&ccedil;&otilde;es prim&aacute;rias).
-<br>&nbsp;&nbsp;&nbsp; Um mesmo disco r&iacute;gido pode armazenar mais
-de 64 parti&ccedil;&otilde;es independentes uma das outras.
-<p><b>OBS</b>: Os arquivos e diret&oacute;rios podem ser armazenados somente
-em parti&ccedil;&otilde;es de disco <i>Prim&aacute;rias</i> ou <i>L&oacute;gicas</i>,
-a parti&ccedil;&atilde;o <i>Extendida</i> n&atilde;o &eacute; usada para
-armazanamento de arquivos e diret&oacute;rios.
-<p>&nbsp;&nbsp;&nbsp;&nbsp; Se possuir duas parti&ccedil;&otilde;es em
-seu computador (C: e D: no DOS), e n&atilde;o estiver usando a parti&ccedil;&atilde;o
-D:, a instala&ccedil;&atilde;o pode ser feita nesta parti&ccedil;&atilde;o
-desde que ela tenha o espa&ccedil;o necess&aacute;rio para o sistema operacional
-Linux, os programas que desejar instalar, mais a parti&ccedil;&atilde;o
-SWAP.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="1.7"></a><u><font size=+1>1.7-) Observa&ccedil;&otilde;es sobre
-o formato DOS 6.XX(FAT 16)</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp; No formato DOS 6.XX(<i>FAT16</i>), o primeiro
-setor da &aacute;rea de dados da parti&ccedil;&atilde;o &eacute; utilizado
-frequentemente pelo DOS para armazenamento de dados sobre a parti&ccedil;&atilde;o
-de disco, e estes dados s&atilde;o usados pelo sistema para se ter maior
-confiabilidade do que os dados armazenados na tabela de parti&ccedil;&atilde;o.
-O sistema de arquivos DOS, faz o FDISK(do <i>DOS</i>) limpar os primeiros
-512 bytes da &aacute;rea de dados da parti&ccedil;&atilde;o sempre que
-uma mudan&ccedil;a de tamanho acontecer.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; O formatador do DOS(<i>format</i>) verifica
-este primeiro setor toda vez que a up&ccedil;&atilde;o <i>/U</i> (que &eacute;
-utilizada para n&atilde;o salvar dados para se fazer a desformata&ccedil;&atilde;o
-do disco) &eacute; utilizada.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Isto &eacute; considerado uma FALHA no Format(do
-<i>DOS</i>)
-e no Fdisk(do <i>DOS</i>).
-<br>A op&ccedil;&atilde;o abaixo deve ser utilizada caso voce crie uma
-parti&ccedil;&atilde;o do <i>DOS FAT16</i> com o Fdisk, que faz com que
-os primeiros 512 bytes daquela parti&ccedil;&atilde;o sejam "limpos", para
-manter a compatibilidade com o DOS. Utilize esta op&ccedil;&atilde;o dentro
-do Linux, ap&oacute;s criar a parti&ccedil;&atilde;o com o Fdisk e reiniciar
-o seu
-<br>computador. Foi notado que esta op&ccedil;&atilde;o s&oacute; funciona
-corretamente somente quando o Sistema Linux estiver instalado em seu computador.
-N&atilde;o me responsabilizo caso utiliza-la a partir de um disquete de
-recupera&ccedil;&atilde;o.
-<p><b>dd if=/dev/zero of=/dev/hdx1 bs=512 count=1</b>
-<p><b>onde</b>:
-<br><i>hdx1</i> - &Eacute; a identifica&ccedil;&atilde;o da unidade de
-disco e a parti&ccedil;&atilde;o que foi criada&nbsp; pelo Fdisk utilizando
-o sistema de arquivos DOS que ter&aacute; seu&nbsp; primeiro setor "limpo".
-<p><b>OBS1</b>: Cuidado ao utilizar esta op&ccedil;&atilde;o, um pequeno
-descuido pode resultar na&nbsp; perda de dados do
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-seu disco r&iacute;gido ou outras parti&ccedil;&atilde;o.
-<br><b>OBS2</b>: N&atilde;o utilize este comando com parti&ccedil;&otilde;es
-que utilizam o sistema de arquivos&nbsp; <i>FAT32</i>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(utilizada nos sistemas operacionais <i>Windows 95 OSR/2</i> e superiores)
-se for utilizada em
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-um disco com este sistema, sua FAT ser&aacute; corrompida,&nbsp; se isto
-acontecer, ser&aacute; necess&aacute;ria a
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-re-formata&ccedil;&atilde;o da parti&ccedil;&atilde;o.
-<br><b>OBS3</b>: &Eacute; extremamente recomendado que se utilize o programa
-de particionamento que
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-acompanha o seu sistema operacional para a cria&ccedil;&atilde;o da parti&ccedil;&atilde;o.
-Por exemplo, se deseja
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-criar uma parti&ccedil;&atilde;o DOS 6.XX, utilize o FDisk qua acompanha
-o DOS.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="2"></a><u><font size=+1>2-) Iniciando o programa Fdisk</font></u></center>
-
-<p>Para iniciar o programa fdisk(Linux)digite:
-<p><i>fdisk</i> [unidade]
-<p><b>Onde</b>:
-<br><i>unidade</i> - deve ser a unidade de disco r&iacute;gido no padr&atilde;o
-Linux(<i> /dev/hda,&nbsp; /dev/hdb, /dev/sda,</i>
-<br><i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-/dev/sdb, etc... </i>). Se voce tem apenas 1&nbsp; disco r&iacute;gido
-IDE, use <i>/dev/hda</i>, para fazer o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-fdisk trabalhar com este disco ou digite fdisk sem especificar a unidade.
-Se possuir 1
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-disco SCSI, use /dev/sda
-<p>&nbsp; Se unidade n&atilde;o for especificada, o programa fdisk usar&aacute;
-<i>/dev/hda</i>
-como unidade de disco padr&atilde;o.
-<p><b>ATEN&Ccedil;&Atilde;O</b> : A OPERA&Ccedil;&Atilde;O DE PARTICIONAMENTO
-DE DISCOS PODE FAZER COM
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-QUE OS DADOS&nbsp; ARMAZENADOS EM SEU DISCO R&Iacute;GIDO SEJAM
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-PERDIDOS, SE FOR USADA INCORRETAMENTE. &Eacute; SEMPRE
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-RECOMENDADO RETIRAR UMA C&Oacute;PIA DE SEGURAN&Ccedil;A DOS SEUS
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-ARQUIVOS EXISTENTES NO MICRO ANTES DE SE EXECUTAR UM
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-PROGRAMA DESTE TIPO, A N&Atilde;O SER QUE TENHA CONFIAN&Ccedil;A NO
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-QUE ESTA FAZENDO E QUE ENTENDEU AS EXPLICA&Ccedil;&Otilde;ES SOBRE A
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-IDENTIFICA&Ccedil;&Atilde;O DE&nbsp;&nbsp; DISCOS R&Iacute;GIDOS E SUAS
-PARTI&Ccedil;&Otilde;ES NO
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-SISTEMA.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="2.1"></a><u><font size=+1>2.1-) Op&ccedil;&otilde;es de linha
-de comando</font></u></center>
-
-<p>&nbsp;&nbsp; Com a utiliza&ccedil;&atilde;o de op&ccedil;&otilde;es
-de linha de comando, voce pode fazer com que o programa inicie de uma forma
-espec&iacute;fica, ou personalizada.
-<p><b>fdisk</b> [<i>-b</i>] [<i>-u</i>] [<i>unidade</i>]&nbsp;&nbsp; -
-Op&ccedil;&otilde;es aceitas para o particionamento.
-<br><b>fdisk</b> [<i>-l</i>] [<i>-b</i>] [<i>-u</i>]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Op&ccedil;&otilde;es aceitas para listar as parti&ccedil;&otilde;es atuais.
-<br><b>fdisk</b> [<i>-s</i>] [<i>unidade</i>]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Op&ccedil;&atilde;o aceita para mostrar o Tamanho da parti&ccedil;&atilde;o
-<br><b>fdisk</b> [<i>-v</i>]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Vers&atilde;o do programa
-<p><b>Onde</b>:
-<br><i>-b</i>&nbsp; : Faz com que o fdisk mostre na tela a coluna <i>BEGIN</i>
-quando utilizar a op&ccedil;&atilde;o &lt;p> durante o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; particionamento do disco ou com
-a op&ccedil;&atilde;o -l&nbsp; quando se for listar as parti&ccedil;&otilde;es
-na linha de
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; comando.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>OBS</b>: Esta op&ccedil;&atilde;o
-&eacute; geralmente desnecess&aacute;ria, porque seu valor equivale ao
-valor da coluna
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-START.
-<br><i>-u</i>&nbsp; : Muda a unidade de medida padr&atilde;o para Setores.
-Se esta op&ccedil;&atilde;o for usada&nbsp; na linha de
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; comando para se fazer o particionamento
-de disco, ap&oacute;s pressionar &lt;p>, o programa mostrar&aacute;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; na tela o inicio e o fim da parti&ccedil;&atilde;o
-em Setores ao inv&eacute;s de utilizar cilindros para a listagem.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Se for utilizada em conjunto com a op&ccedil;&atilde;o
--l, a unidade de medida do Inicio e Fim da parti&ccedil;&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ser&aacute; listada Setores ao inv&eacute;s
-de cilindros.
-<br><i>-l</i>&nbsp; : Lista as parti&ccedil;&otilde;es existentes no disco,
-sem entrar no programa fdisk, ou alterar qualquer
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; parti&ccedil;&atilde;o. Esta op&ccedil;&atilde;o
-&eacute; equivalente a entrar no programa fdisk e pressionar &lt;p>, mas
-ela
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; somente lista as parti&ccedil;&otilde;es
-sem entrar no programa.
-<br><i>-s</i>&nbsp; : Mostra o tamanho de uma parti&ccedil;&atilde;o de
-disco. A &uacute;nica diferen&ccedil;a desta para as outras op&ccedil;&otilde;es,
-&eacute;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; que se deve especificar a unidade mais
-a parti&ccedil;&atilde;o que deseja ver o tamanho, por exemplo,
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; digitando-se:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <i>fdisk -s /dev/hda1</i>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; voce visualizar&aacute; o tamanho total
-da parti&ccedil;&atilde;o de disco hda1.
-<br><i>-v</i>&nbsp; : Mostra a vers&atilde;o do programa fdisk que esta
-utilizando.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="2.2"></a><u><font size=+1>2.2-) Comandos do fdisk.</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp; O fdisk do Linux manipula as parti&ccedil;&otilde;es
-de seu disco atrav&eacute;s de comandos digitados no teclado. Cada letra
-digitada corresponde a um comando diferente no fdisk. Estes comandos ser&atilde;o
-utilizados ap&oacute;s iniciar o programa.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Aqui vai a lista de comandos dispon&iacute;veis
-no fdisk, recomendo que anote em um papel, ou imprima esta parte do texto(
-ou todo o documento) para que possa consultar estas op&ccedil;&otilde;es
-durante o particionamento do seu disco r&iacute;gido.
-<p><i>a</i>&nbsp; - Seleciona entre parti&ccedil;&atilde;o inicializ&aacute;vel
-e n&atilde;o inicializ&aacute;vel.
-<br><i>b</i>&nbsp; - Edita um volume de disco BSD(n&atilde;o usada em computadores
-com DOS)
-<br><i>d</i>&nbsp; - Apaga uma tabela de parti&ccedil;&atilde;o (Delete)
-<br><i>l</i>&nbsp;&nbsp; - Lista os tipos de parti&ccedil;&otilde;es dispon&iacute;veis
-(List)
-<br><i>m</i> - Ajuda
-<br><i>n</i>&nbsp; - Cria uma nova tabela de parti&ccedil;&atilde;o (New)
-<br><i>p</i>&nbsp; - Mostra a tabela de parti&ccedil;&atilde;o atual (Print)
-<br><i>q</i>&nbsp; - sai do fdisk sem gravar as altera&ccedil;&otilde;es
-no disco (quit)
-<br><i>t</i>&nbsp;&nbsp; - Muda o tipo da parti&ccedil;&atilde;o (Type)
-<br><i>u</i>&nbsp; - Altera as unidades de medidas que s&atilde;o mostradas
-na tela
-<br><i>v</i>&nbsp; - Verifica a tabela de parti&ccedil;&atilde;o (verify)
-<br><i>w</i> - grava as altera&ccedil;&otilde;es feitas para o disco e
-sai do fdisk (write)
-<br><i>x</i>&nbsp; - Comandos especiais do programa(somente para usu&aacute;rios
-experientes)
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="3"></a><u><font size=+1>3-) Manipulando parti&ccedil;&otilde;es
-no disco r&iacute;gido</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Agora vamos come&ccedil;ar realmente a trabalhar
-com o fdisk, os textos que foram colocados acima, foi para que voce entendesse
-o que &eacute; o particionamento de um disco r&iacute;gido e para que soubesse
-a diferen&ccedil;a entre parti&ccedil;&atilde;o e um disco r&iacute;gido,(j&aacute;
-vi muitas pessoas falarem de parti&ccedil;&atilde;o como se fosse disco
-r&iacute;gido...)
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Abaixo uma explica&ccedil;&atilde;o passo-a-passo
-de como particionar um disco usando
-<br>o fdisk e seus comandos.
-<p><b>ATEN&Ccedil;&Atilde;O</b>: O disco r&iacute;gido usado no particionamento
-&eacute; um exemplo. Ele n&atilde;o deve ser usado por
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-voce para fazer o particionamento de seu disco, uma vez que a capacidade
-e outros
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-par&acirc;metros do disco r&iacute;gido variam de um para o outro. Este
-exemplo serve apenas
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-para que voce entenda como o fdisk funciona, o que faz cada um de seus
-comandos
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-e a&nbsp; fazer o c&aacute;lculo do tamanho das parti&ccedil;&otilde;es.
-<p>&nbsp;&nbsp; A tradu&ccedil;&atilde;o das mensagens que aparecem em
-Ingles nos exemplos que vou colocar logo abaixo, e a ajuda do programa,
-n&atilde;o foram feitas porque aparecem exatamente como est&atilde;o quando
-fizer o particionamento de seu disco, e n&atilde;o conhe&ccedil;o nenhuma
-vers&atilde;o do fdisk(Linux) em portugu&ecirc;s (caso algu&eacute;m conhe&ccedil;a
-uma vers&atilde;o deste programa em portugu&ecirc;s, favor entrar em contato
-comigo para que eu possa atualizar este documento, meu endere&ccedil;o
-de E-mail esta no final do documento).
-<br>&nbsp;&nbsp;&nbsp; Somente vou explicar o que significa cada mensagem
-que aparece no fdisk
-<br>atrav&eacute;s de uma compara&ccedil;&atilde;o.
-<p>No exemplo eu vou usar um disco de <i>1.08GB</i>. Este disco possui
-<i>630</i>
-cilindros, <i>16</i> cabe&ccedil;as, e <i>21</i> setores por trilha( <i>emmodo
-LBA</i>).
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="3.1"></a><u><font size=+1>3.1-) Listando parti&ccedil;&otilde;es
-existentes no disco</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Primeiro digite <i>fdisk /dev/hda</i> (supondo que
-este seja o disco principal), se a unidade de disco n&atilde;o for digitada,
-o fdisk usar&aacute; /dev/hda como padr&atilde;o. Ap&oacute;s voce digitar
-este comando, o fdisk procura por parti&ccedil;&otilde;es existentes, seus
-tamanhos e outras caracter&iacute;sticas(geometria do disco) que ser&atilde;o
-utilizadas para se fazer o c&aacute;lculo de parti&ccedil;&otilde;es.
-<br>&nbsp;&nbsp;&nbsp; Quando entrar no programa, digite a letra &lt;p>
-para que o programa mostre as tabelas de parti&ccedil;&atilde;o existentes
-no disco r&iacute;gido.
-<p>A tela que aparece &eacute; a seguinte:
-<p>----------------------------------------------------------------------------------------------------
-<br>Command (m for help): p
-<br>Disk /dev/hda: 16 heads, 21 sectors, 630 cylinders
-<br>Units = cylinders of 630*512 bytes
-<p>&nbsp;Device&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Boot&nbsp;&nbsp;&nbsp; Begin&nbsp;&nbsp;&nbsp;
-Start&nbsp;&nbsp;&nbsp; End&nbsp;&nbsp; Blocks&nbsp;&nbsp; Id&nbsp;&nbsp;
-System
-<br>&nbsp;/dev/hda1&nbsp;&nbsp;&nbsp; *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-117&nbsp;&nbsp; 204800&nbsp;&nbsp;&nbsp; 6&nbsp;&nbsp; DOS 16-bits >=32M
-<p>Command (m for help):
-<br>-----------------------------------------------------------------------------------------------------
-<br>&nbsp;
-<p>Abaixo uma tradu&ccedil;&atilde;o desta tela:
-<br>-----------------------------------------------------------------------------------------------------
-<br>Commando (m para ajuda): &lt;p>
-<br>Disco /dev/hda: 16 cabe&ccedil;as, 21 setores, 630 cilindros
-<br>Unidades = cilindros de 630*512 bytes
-<p>Dispositivo&nbsp; Partida&nbsp; Come&ccedil;a&nbsp; Inicio&nbsp;&nbsp;
-Fim&nbsp; Blocos&nbsp; Identif.&nbsp; Sistema
-<br>/dev/hda1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 117&nbsp;
-204800&nbsp;&nbsp;&nbsp;&nbsp; 6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS 16-bits
->=32M
-<p>Comando (m para ajuda):
-<br>----------------------------------------------------------------------------------------------------
-<p><b>Onde</b>:
-<br><i>Device</i> : &Eacute; a identifica&ccedil;&atilde;o da parti&ccedil;&atilde;o
-de disco.
-<br><i>Boot</i>&nbsp;&nbsp;&nbsp;&nbsp; : Se estiver com "*", se a parti&ccedil;&atilde;o
-pode ser usada para BOOT.
-<br><i>Begin</i>&nbsp;&nbsp;&nbsp; : Cilindro inicial da parti&ccedil;&atilde;o
-de disco
-<br><i>Start</i>&nbsp;&nbsp;&nbsp;&nbsp; : Cilindro inicial da parti&ccedil;&atilde;o
-de disco
-<br><i>End</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : Cilindro Final da
-parti&ccedil;&atilde;o do disco
-<br><i>Blocks&nbsp;&nbsp;</i> : Quantidade de blocos ocupados pela parti&ccedil;&atilde;o
-de disco. No Linux, um
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Bloco equivale a 1024 bytes(1KB)
-<br><i>ID</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : Tipo da
-parti&ccedil;&atilde;o (conforme a lista de parti&ccedil;&otilde;es existentes
-quando &eacute;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-pressionada a letra &lt;L>.
-<br><i>System</i> : Descri&ccedil;&atilde;o do sistema de arquivos que
-&eacute; usado na parti&ccedil;&atilde;o de disco.
-<p>&nbsp;&nbsp;&nbsp; Como vemos acima, o disco r&iacute;gido possui uma
-parti&ccedil;&atilde;o do tipo <i>DOS- FAT16 </i>ocupando <i>200MB</i>
-de espa&ccedil;o em disco (200000 Blocos multiplicados por 1024).
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="3.2"></a><u><font size=+1>3.2-) Criando uma parti&ccedil;&atilde;o
-de Disco</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Para criar uma parti&ccedil;&atilde;o de disco, pressionamos
-a letra &lt;n>. Neste exemplo vamos criar uma parti&ccedil;&atilde;o do
-tipo<b> Linux EXT2</b>(Nativa) com o tamanho de <i>820MB</i>, esta parti&ccedil;&atilde;o
-&eacute; a que conter&aacute; todo o sistema de arquivos Linux e seus programas,
-veja o exemplo:
-<p>-----------------------------------------------------------------------------------------------------
-<br>Command ( m for help): &lt;n>
-<br>&nbsp;&nbsp;&nbsp; e&nbsp; extended
-<br>&nbsp;&nbsp;&nbsp; p&nbsp; primary partition (1-4)
-<br>&lt;p>
-<br>Partition number (1-4): &lt;2>
-<br>First cylinder(118-630): &lt;118>
-<br>Last cylinder or +size or +sizeK or +sizeM (118-630): &lt;+820M>
-<br>-----------------------------------------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp; O fdisk perguntar&aacute; se deseja criar uma parti&ccedil;&atilde;o
-extendida ou prim&aacute;ria. Crie uma parti&ccedil;&atilde;o prim&aacute;ria
-para o sistema de arquivos do Linux, ou uma parti&ccedil;&atilde;o extendida
-caso voce ja tenha 3 parti&ccedil;&otilde;es prim&aacute;rias criadas em
-seu disco, conforme foi visto acima.
-<br>&nbsp;&nbsp;&nbsp; Como pode ter notado no exemplo acima, como j&aacute;
-existia a parti&ccedil;&atilde;o 1, digitamos o n&uacute;mero 2 para que
-fosse criada uma segunda parti&ccedil;&atilde;o, se a parti&ccedil;&atilde;o
-n&uacute;mero 2 j&aacute; existisse, seria digitado o n&uacute;mero 3 para
-criar uma terceira parti&ccedil;&atilde;o, assim por diante.
-<br>&nbsp;&nbsp;&nbsp; Ap&oacute;s escolher o tipo de parti&ccedil;&atilde;o
-que ser&aacute; criada, voce dever&aacute; especificar o cilindro inicial
-da parti&ccedil;&atilde;o de disco. No exemplo acima, o valor do cilindro
-inicial &eacute; de 118. Utilize sempre o valor do cilindro inicial sugerido
-pelo fdisk, a n&atilde;o ser que se queira deixar um espa&ccedil;o entre
-uma parti&ccedil;&atilde;o antiga e a nova parti&ccedil;&atilde;o para
-a cria&ccedil;&atilde;o de uma parti&ccedil;&atilde;o menor ou por outros
-motivos.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; O &uacute;ltimo passo &eacute; especificar
-onde terminar&aacute; a parti&ccedil;&atilde;o de disco. &Eacute; permitida
-a utiliza&ccedil;&atilde;o de Cilindros, bytes, Kbytes e Mbytes para marcar
-o final da parti&ccedil;&atilde;o de disco (veja detalhes abaixo).
-<p><b>LEMBRE-SE</b>: Em um mesmo disco r&iacute;gido podem existir at&eacute;
-4 parti&ccedil;&otilde;es prim&aacute;rias (contando com
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-a parti&ccedil;&atilde;o Extendida).
-<p><b>Onde</b>:
-<br>&nbsp;&nbsp; <i>Partition number</i> : N&uacute;mero da parti&ccedil;&atilde;o
-que vai ser criada, como j&aacute; temos&nbsp; uma parti&ccedil;&atilde;o
-no
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-disco, digitamos o n&uacute;mero 2 para dizer ao fdisk que queremos criar
-uma
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-segunda parti&ccedil;&atilde;o prim&aacute;ria. Neste exemplo, voce acabou
-de criar a
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-parti&ccedil;&atilde;o /dev/hda2.
-<br>&nbsp;&nbsp;&nbsp;<i> First cylinder</i>&nbsp; : Primeiro cilindro
-dispon&iacute;vel ap&oacute;s o &uacute;ltimo cilindro usado pela parti&ccedil;&atilde;o
-1. Neste
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-caso usamos o cilindro 118 at&eacute; o cilindro final(Last Cylinder).
-O valor deve ser
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-digitado em cilindros.
-<br><i>&nbsp;&nbsp;&nbsp; Last cylinder or +size or +sizeK or +sizeM</i>
-: Aqui voce pode especificar o final da parti&ccedil;&atilde;o de
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-disco.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Os seguintes valores podem ser usados para marcar o&nbsp; final da parti&ccedil;&atilde;o
-de
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-disco:
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-597&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- &Eacute; o valor equivalente a parti&ccedil;&atilde;o de 820MB&nbsp;
-(em cilindros)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-+820000000&nbsp; - &Eacute; o valor equivalente a parti&ccedil;&atilde;o
-de&nbsp; 820MB (em bytes)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-+820000K&nbsp;&nbsp;&nbsp;&nbsp; - &Eacute; o valor equivalente a parti&ccedil;&atilde;o
-de 820MB (em Kbytes)
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-+820M&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; - &Eacute;
-o valor equivalente a parti&ccedil;&atilde;o de 820MB (em Mbytes)
-<p>&nbsp;&nbsp;&nbsp; Recomendo que especifique o valor em <i>MB</i> ou
-<i>KB</i>
-por n&atilde;o exigir o c&aacute;lculo do espa&ccedil;o do disco usado
-em cada cilindro, e por ser um dos mais utilizados e mais pr&aacute;ticos.
-Especificando o valor em <i>bytes, Kbytes</i> ou <i>Mbytes</i>, o fdisk
-se encarregar&aacute; de converter o tamanho digitado para um valor de
-cilindro final.
-<br>&nbsp;&nbsp;&nbsp; Se digitar um n&uacute;mero acima do espa&ccedil;o
-dispon&iacute;vel no disco(ou cilindro dipon&iacute;vel), ser&aacute; mostrada
-uma mensagem de erro dizendo que a parti&ccedil;&atilde;o n&atilde;o pode
-ser criada.
-<p><b>OBS</b>: Caso seja criada uma parti&ccedil;&atilde;o DOS FAT16, dever&aacute;
-ser utilizado o comando
-<br>&nbsp;&nbsp;&nbsp;&nbsp; <b>dd if=/dev/zero of=/dev/hdx1 bs=512 count=1</b>
-<br>&nbsp;&nbsp;&nbsp;&nbsp; para que a parti&ccedil;&atilde;o criada seja
-compat&iacute;vel com o formato utilizado pelo
-<br>&nbsp;&nbsp;&nbsp;&nbsp; DOS. Para maiores detalhes veja <a href="#1.7">Observa&ccedil;&otilde;es
-sobre o formato DOS 6.XX</a>
-<br>&nbsp;
-<p>&nbsp;&nbsp;&nbsp; Para verificar as parti&ccedil;&otilde;es existentes
-no disco tecle &lt;p>
-<br>-----------------------------------------------------------------------------------------------------
-<br>Command (m for help): p
-<br>Disk /dev/hda: 16 heads, 21 sectors, 630 cylinders
-<br>Units = cylinders of 630*512 bytes
-<p>&nbsp;Device&nbsp;&nbsp;&nbsp; Boot&nbsp; Begin&nbsp; Start&nbsp; End&nbsp;&nbsp;
-Blocks&nbsp;&nbsp;&nbsp; Id&nbsp;&nbsp;&nbsp;&nbsp; System
-<br>/dev/hda1&nbsp;&nbsp; *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1&nbsp;&nbsp;&nbsp; 117&nbsp;&nbsp; 204800&nbsp;&nbsp;&nbsp;&nbsp; 6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-DOS 16-bits >=32M
-<br>/dev/hda2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 118&nbsp;&nbsp;&nbsp;
-118&nbsp;&nbsp; 597&nbsp;&nbsp; 839680&nbsp;&nbsp;&nbsp; 83&nbsp;&nbsp;&nbsp;&nbsp;
-Linux Native
-<p>Command (m for help):
-<br>-----------------------------------------------------------------------------------------------------
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<br>&nbsp;
-<center>
-<p><a NAME="3.3"></a><u><font size=+1>3.3-) Mudando o tipo de uma parti&ccedil;&atilde;o</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; O tipo da parti&ccedil;&atilde;o &eacute; a identifica&ccedil;&atilde;o
-de qual sistema de arquvios que ela pertence e na qual possuem caracter&iacute;sticas
-pr&oacute;prias e diferentes de outros sistemas de arquivos.
-<br>&nbsp;&nbsp;&nbsp; Tecle &lt;t> para trocar o tipo de parti&ccedil;&atilde;o
-usado no disco.
-<br>Pressione a tecla &lt;l> se desejar ver os tipos de parti&ccedil;&otilde;es
-compat&iacute;veis com o programa fdisk.
-<br>&nbsp;&nbsp;&nbsp;&nbsp; Veja o exemplo de como trocar o tipo da parti&ccedil;&atilde;o
-de Linux Native (<i>tipo 83</i>) para Linux Swap (<i>tipo 82</i>).
-<br>-----------------------------------------------------------------------------------------------------
-<br>&nbsp; Command (m for help): &lt;t>
-<br>&nbsp; Partition number (1-4): &lt;3>
-<br>&nbsp; Hex code (type L to list codes): &lt;82>
-<br>-----------------------------------------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp; Agora a parti&ccedil;&atilde;o em /dev/hda3 &eacute;
-do tipo Linux SWAP(tipo 82).
-<br>&nbsp;
-<p>Pressione a tecla &lt;p> para verificar a parti&ccedil;&atilde;o /dev/hda3:
-<br>-----------------------------------------------------------------------------------------------------
-<br>Command (m for help): p
-<br>Disk /dev/hda: 16 heads, 21 sectors, 630 cylinders
-<br>Units = cylinders of 630*512 bytes
-<p>&nbsp;Device&nbsp;&nbsp;&nbsp; Boot&nbsp; Begin&nbsp; Start&nbsp; End&nbsp;
-Blocks&nbsp;&nbsp;&nbsp; Id&nbsp;&nbsp;&nbsp;&nbsp; System
-<br>/dev/hda1&nbsp;&nbsp; *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1&nbsp;&nbsp;&nbsp; 117&nbsp; 204800&nbsp;&nbsp;&nbsp;&nbsp; 6&nbsp;&nbsp;&nbsp;
-DOS 16-bits >=32M
-<br>/dev/hda2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 118&nbsp;&nbsp;&nbsp;
-118&nbsp;&nbsp; 597&nbsp; 839680&nbsp;&nbsp;&nbsp; 83&nbsp;&nbsp;&nbsp;
-Linux Native
-<br>/dev/hda3&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 598&nbsp;&nbsp;&nbsp;
-598&nbsp;&nbsp; 630&nbsp;&nbsp; 61440&nbsp;&nbsp;&nbsp; 83&nbsp;&nbsp;&nbsp;
-Linux SWAP
-<p>Command (m for help):
-<br>-----------------------------------------------------------------------------------------------------
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="3.4"></a><u><font size=+1>3.4-) Excluindo uma parti&ccedil;&atilde;o
-de Disco</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Para excluir uma parti&ccedil;&atilde;o, pressione
-a tecla &lt;d>, ser&aacute; mostrada a seguinte tela:
-<br>----------------------------------------------------------------------------------------------------
-<br>Command (m for help):&lt;d>
-<br>Partition number(1-4): 3
-<p>Command(m for help):
-<br>----------------------------------------------------------------------------------------------------
-<br>&nbsp;&nbsp;&nbsp; Com o comando acima, a parti&ccedil;&atilde;o n&uacute;mero
-3 (SWAP) foi excluida,. O espa&ccedil;o ocupado pela parti&ccedil;&atilde;o
-3 &eacute; novamente liberado para que voce possa utilizar para criar outra
-(ou outras) parti&ccedil;&otilde;es de disco.
-<p><b>ATEN&Ccedil;&Atilde;O</b>: TENHA MUITO CUIDADE COM O DA OP&Ccedil;&Atilde;O
-&lt;D>(Delete) DO FDISK.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Caso se tenha apagado acidentalmente alguma parti&ccedil;&atilde;o que
-cont&eacute;m dados, pressione
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-a tecla &lt;q> para sair do fdisk sem gravar o que fez. Neste caso, ser&aacute;
-necess&aacute;rio
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-refazer todo o particionamento do disco.&nbsp; N&atilde;o pressione a tecla
-&lt;w> se voce excluiu
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-alguma parti&ccedil;&atilde;o que utiliza, porque todo o que foi feito
-no fdisk ser&aacute; gravado,
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-inclusive a parti&ccedil;&atilde;o excluida acidentalmente, sem a possibilidade
-de recupera-la.
-<p>para verificar se a parti&ccedil;&atilde;o foi excluida pressionamos
-&lt;p>:
-<br>-----------------------------------------------------------------------------------------------------
-<br>Command (m for help): p
-<br>Disk /dev/hda: 16 heads, 21 sectors, 630 cylinders
-<br>Units = cylinders of 630*512 bytes
-<p>&nbsp;Device&nbsp;&nbsp;&nbsp; Boot Begin&nbsp; Start&nbsp; End&nbsp;
-Blocks&nbsp;&nbsp;&nbsp; Id&nbsp;&nbsp;&nbsp;&nbsp; System
-<br>/dev/hda1&nbsp;&nbsp; *&nbsp;&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-1&nbsp;&nbsp;&nbsp; 117&nbsp; 204800&nbsp;&nbsp;&nbsp;&nbsp; 6&nbsp;&nbsp;&nbsp;&nbsp;
-DOS 16-bits >=32M
-<br>/dev/hda2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 118&nbsp;&nbsp;&nbsp;
-118&nbsp;&nbsp; 597&nbsp; 839680&nbsp;&nbsp;&nbsp; 83&nbsp;&nbsp;&nbsp;
-Linux Native
-<br>Command (m for help):
-<br>----------------------------------------------------------------------------------------------------
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="3.5"></a><u><font size=+1>3.5-) Gravando parti&ccedil;&otilde;es
-alteradas para o disco</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp; Para gravar as altera&ccedil;&otilde;es feitas
-na(s) parti&ccedil;&otilde;es para o disco ap&oacute;s fazer o particionamento,
-pressione a tecla &lt;w>, esta op&ccedil;&atilde;o faz a saida do fdisk
-gravando todas as altera&ccedil;&otilde;es que fez durante o uso do programa
-fdisk(parti&ccedil;&otilde;es criadas, alteradas, excluidas).
-<br>&nbsp;&nbsp;&nbsp; Enquando voce trabalha no fdisk criando parti&ccedil;&otilde;es,
-modificando tamanhos, excluindo parti&ccedil;&otilde;es, nada do que faz
-&eacute; gravado para o disco automaticamente (por motivos de seguran&ccedil;a
-contra perda de alguma parti&ccedil;&atilde;o j&aacute; existente).
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="3.6"></a><u><font size=+1>3.6-) Abandonando o particionamento
-de disco sem gravar as altera&ccedil;&otilde;es</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Para sair do fdisk sem gravar as altera&ccedil;&otilde;es
-para o disco pressione &lt;q>. Esta op&ccedil;&atilde;o de sair do fdisk
-sem gravar as altera&ccedil;&otilde;es(abandona o programa), &eacute; bastante
-&uacute;til caso tenha apagado acidentalmente uma parti&ccedil;&atilde;o
-que contenha arquivos e programas importantes armazenados nela.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="3.7"></a><u><font size=+1>3.7-) Alternando entre parti&ccedil;&atilde;o
-inicializ&aacute;vel e n&atilde;o inicializ&aacute;vel</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp; Parti&ccedil;&atilde;o inicializ&aacute;vel
-&eacute; aquela em que o sistema pode dar a partida(boot) no computador.
-Pressione a tecla &lt;a> para alterar o tipo da parti&ccedil;&atilde;o
-entre inicializ&aacute;vel e n&atilde;o inicaliz&aacute;vel.
-<br><b>OBS</b>: O Linux pode iniciar mesmo que a parti&ccedil;&atilde;o
-que esta instalado esteja&nbsp; marcada como n&atilde;o
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; inicializ&aacute;vel,
-utilizando um boot manager(gerenciador de inicializa&ccedil;&atilde;o)
-como o LILO(Linux
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Loader) ou o
-LoadLin no DOS.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="3.8"></a><u><font size=+1>3.8-) Alterando a unidade de medida
-do tamanho ocupado pela parti&ccedil;&atilde;o</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Para alterar de uma unidade de medida para outra,
-pressione a tecla &lt;u>. A unidade de medida da parti&ccedil;&atilde;o,
-&eacute; o valor com que ser&aacute; mostrado o tamanho que a parti&ccedil;&atilde;o
-ocupa no disco toda a vez que se pressiona a tecla &lt;p>, para mostrar
-as parti&ccedil;&otilde;es na tela, durante o particionamento de disco
-ou quando se utilizar a op&ccedil;&atilde;o -l na linha de comando, para
-listar as parti&ccedil;&otilde;es de disco.
-<p>As unidades de medida dispon&iacute;veis s&atilde;o:
-<br><i>Cilindros</i> : Este &eacute; o padr&atilde;o do sistema, corresponde
-ao local onde come&ccedil;a e
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-aonde termina a parti&ccedil;&atilde;o, em cilindros.
-<br><i>Setores</i>&nbsp;&nbsp; : corresponde ao local onde come&ccedil;a
-e aonde termina a parti&ccedil;&atilde;o, em
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Setores.
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<br>&nbsp;
-<center>
-<p><a NAME="4"></a><u><font size=+1>4-) Outros tipos de parti&ccedil;&otilde;es
-dispon&iacute;veis no fdisk(para refer&ecirc;ncia t&eacute;cnica)</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp; Abaixo, segue a listagem dos tipos de parti&ccedil;&otilde;es
-compat&iacute;veis com esta vers&atilde;o do fdisk, que pode servir de
-guia durante o processo de particionamento, e para que conhe&ccedil;a a
-compatibilidade deste programa com os diversos tipos de parti&ccedil;&otilde;es
-que suporte.
-<p><b>OBS1</b>: Recomendo que voce use o programa de particionamento que
-acompanha seu sistema
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-operacional para a cria&ccedil;&atilde;o de seu sistema de arquivos, por
-exemplo:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Para criar uma parti&ccedil;&atilde;o DOS, utilize o Fdisk que acompanha
-o&nbsp; DOS.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-- Para criar uma parti&ccedil;&atilde;o Linux, utilize o Fdisk que acompanha
-o Linux.
-<br>&nbsp;
-<p><b><u>Tipo</u>&nbsp;&nbsp;&nbsp;&nbsp; <u>Descri&ccedil;&atilde;o</u></b>
-<p>0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Vazio
-<br>1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS FAT 12
-<br>2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Xenix root
-<br>3&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Xenix /usr
-<br>4&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS 16-bits&lt;32MB
-<br>5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Extendida DOS
-<br>6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS 16-bits >=32MB
-<br>7&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; OS/2 HPFS
-<br>8&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; AIX
-<br>9&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; AIX inicializ&aacute;vel
-<br>a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; OS/2 Boot Manager
-<br>40&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Venix 80286
-<br>51&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Novell
-<br>52&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Microport
-<br>63&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; GNU hurd
-<br>64&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Novell Netware 286
-<br>65&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Novell Netware 386
-<br>75&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; PC/IX
-<br>80&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; OLD Minix
-<br>81&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Linux Minix
-<br>82&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Linux SWAP
-<br>83&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Linux Native
-<br>85&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Linux Extendida
-<br>93&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Amoeba
-<br>94&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Amoeba BBT
-<br>a5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BSD/386
-<br>a6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Open BSD
-<br>a7&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; NextStep
-<br>b7&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BSDI File System
-<br>b8&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BSDI Swap
-<br>c7&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Syrinx
-<br>db&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CP/M
-<br>e1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS access
-<br>e3&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DOS R/O
-<br>f2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Dos Secund&aacute;ria
-<br>ff&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BBT
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="5"></a><u><font size=+1>5-) Direitos Autorais</font></u></center>
-
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Este documento foi desenvolvido
-com base em minha experi&ecirc;ncia e conhecimento em discos e parti&ccedil;&otilde;es,
-mediante pesquisa em alguns documentos como os How-TO do Linux e verificando
-as principais d&uacute;vidas de usu&aacute;rios durante a utiliza&ccedil;&atilde;o
-de particionadores de disco, tendo como objetivo levar o conhecimento sobre
-discos, parti&ccedil;&otilde;es e utiliza&ccedil;&atilde;o deste programa,
-atendendo tanto usu&aacute;rios iniciantes como avan&ccedil;ados e como
-contribui&ccedil;&atilde;o para a comunidade Linux em geral.
-<br>&nbsp;
-<br>&nbsp;
-<br>
-<br>
-<center>
-<p>Gleydson M. da Silva (<i>gleydson_s@yahoo.com</i> e <i>gleydson@linuxbr.com.br</i>)</center>
-
-<p>&nbsp;&nbsp;&nbsp; Qualquer d&uacute;vida, sugest&atilde;o ou reclama&ccedil;&atilde;o
-podem ser mandadas para um dos E-Mail's Acima. Conto com sua contribui&ccedil;&atilde;o
-para a melhoria deste Manual.
-<center>
-<p><b>&nbsp;&nbsp;&nbsp; Autorizo a reprodu&ccedil;&atilde;o Total ou parcial
-deste texto para que seja utilizado para fins educativos, autoaprendizado,
-coloca&ccedil;&atilde;o em Home pages e qualquer outra forma de distribui&ccedil;&atilde;o
-n&atilde;o comercial do documento desde que sejam mantidos os meus cr&eacute;ditos
-pela pesquisa e elabora&ccedil;&atilde;o deste documento de acordo com
-os termos da GNU (veja abaixo <a href="#6">Licen&ccedil;as e Garantias
-sobre este documento</a>).</b></center>
-&nbsp;
-<div align=right>
-<br><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<center><a NAME="6"></a><font size=+1>6- ) Licen&ccedil;as e garantias
-sobre este documento</font></center>
-
-<p><b>Fdisk-Portugues-HOWTO Copyright (C) 1999 Gleydson M. da Silva</b>
-<p>&nbsp;&nbsp;&nbsp; Este &eacute; um documento de livre distribui&ccedil;&atilde;o,
-que pode ser copiado e distribu&iacute;do sob os termos da Licen&ccedil;a
-P&uacute;blica Geral&nbsp; GNU, conforme publicada pela Free Software Foundation,
-vers&atilde;o 2 da licen&ccedil;a ou (a crit&eacute;rio do autor) qualquer
-vers&atilde;o posterior.
-<br><b>&nbsp;&nbsp; Este documento &eacute; distribu&iacute;do com a iten&ccedil;&atilde;o
-de ser &uacute;til ao seu utilizador, no entanto N&Atilde;O TEM NENHUMA
-GARANTIA,&nbsp; EXPL&Iacute;CITAS OU IMPL&Iacute;CITAS , COMERCIAIS OU
-DE ATENDIMENTO A UMA DETERMINADA FINALIDADE. Consulte a Licen&ccedil;a
-P&uacute;blica Geral&nbsp; GNU para maiores detalhes.</b>
-<p><i>gleydson_s@yahoo.com</i>
-<br><i>gleydson@linuxbr.com.br</i>
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<br>&nbsp;
-<center>
-<p><a NAME="7"></a><font size=+1>7- ) Marcas Registradas</font></center>
-
-<p>Os programas e refer&ecirc;ncias mencionados neste manual s&atilde;o
-de propriedade dos seus respectivos donos:
-<p>MS-DOS, Windows 3.1x, Windows 9x, Windows NT s&atilde;o de propriedade
-da Microsoft.
-<br>OS/2 e OS/2 Warp s&atilde;o de propriedade da IBM
-<div align=right><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-
-<center><a NAME="8"></a><font size=+1>8- ) Agradecimentos</font></center>
-
-<p>Agrade&ccedil;o a todas as pessoas que me mandam corre&ccedil;&otilde;es,
-coment&aacute;rios, cr&iacute;ticas, elogios, d&uacute;vidas sobre este
-documento, pois atrav&eacute;s destas mensagens, est&atilde;o contribuindo
-para a melhoria deste projeto e me icentivando em sua continua&ccedil;&atilde;o.&nbsp;
-<div align=right>
-<br><a href="#Indice">Volta ao &Iacute;ndice</a></div>
-&lt;EOF>
-</body>
-</html>
diff --git a/fdisk/doc/Fdisk-Portuguese.txt b/fdisk/doc/Fdisk-Portuguese.txt
deleted file mode 100644
index fbf0dcf87..000000000
--- a/fdisk/doc/Fdisk-Portuguese.txt
+++ /dev/null
@@ -1,855 +0,0 @@
-          Fdisk-Portuguese Copyright (C) 1999 Gleydson M. da Silva
-
-
-
-
-
-
-
-
-
-             Gleydson M. da Silva - gleydson@linuxbr.com.br
-                               Versão 1.3
-
-
-
-
-
-
-
-
-
-[ Índice ]
-
-1 - Introdução ao Fdisk
-  1.1 - O que é uma Partição de Disco
-  1.2 - A tabela de partição
-  1.3 - Introdução ao Particionamento de discos
-  1.4 - Identificações utilizadas neste documento
-  1.5 - Identificação de discos e partições no Linux
-  1.6 - Tipos de partições de disco
-  1.7-) Observações sobre o formato DOS 6.XX(FAT 16)
-
-2 - Iniciando o programa Fdisk
-  2.1 - Opções de Linha de comando
-  2.2 - Comandos do Fdisk
-
-3 - Manipulando partições no disco rígido
-  3.1 - Listando partições existentes no disco
-  3.2 - Criando partições de disco
-  3.3 - Mudando o tipo da partição
-  3.4 - Excluindo uma partição de disco
-  3.5 - Gravando partições alteradas para o disco
-  3.6 - Abandonando o programa sem gravar alterações para o disco
-  3.7 - Alternando entre partição inicializável/não inicializável
-  3.8 - Escolhendo a unidade  para mostrar o tamanho ocupado pela partição
-
-4 - Tipos de partições reconhecídas pelo Fdisk
-
-5 - Direitos Autorais
-
-6 - Licenças e Garantias sobre este documento
-
-7 - Marcas Registradas
-
-8 - Agradecimentos
- 
-
-
-
-
-
-
-
-
-
-
-
-
-1-) Introdução ao Fdisk
-
-  Fdisk é um programa utilizado para fazer o particionamento de discos rígidos
-IDE e SCSI.
-  A versão do programa Fdisk descrita neste manual é a 2.8
-ATENÇÃO: ESTE MANUAL TEM COMO OBJETIVO A EXPLICAÇÃO DE FUNCIONAMENTO E 
-         UTILIZAÇÃO DO FDISK DO LINUX (NÃO O FDISK DO DOS), MESMO QUE 
-         SEJA UM USUÁRIO DO DOS, EU RECOMENDO QUE LEIA ESTE MANUAL
-         COMO UMA REFERÊNCIA TÉCNICA E PARA SEU APRENDIZADO.
-
-   Este documento é distribuído com a itenção de ser útil ao seu utilizador,
-no entanto NÃO TEM NENHUMA GARANTIA,  EXPLÍCITAS OU IMPLÍCITAS , COMERCIAIS
-OU DE ATENDIMENTO A UMA DETERMINADA FINALIDADE. Consulte a Licença Pública 
-Geral  GNU para maiores detalhes. 
-
-
-
-1.1-) Partição de Disco
-
-    Uma partição de disco é o local onde o sistema operacional armazena seu
-sistema de arquivos(arquivos, diretórios, FAT, boot sector, etc). 
-
-
-
-1.2-) Tabela de partição
-
-A Tabela de partição é o local do disco rígido onde se localizam os dados sobre
-todas as partições existentes no disco como o sistema de arquivos utilizado, se
-ela é inicializável, a cabeça inicial/final, setor inicial/final, cilindro
-inicial/final, número de setores ocupados por ela no disco.
-
-
-
-1.3-) Introdução ao particionamento de discos
-
-Particionar o disco rígido é dividir ele em partes para armazenamento 
-de arquivos e programas. As partições criadas no disco podem ter o tamanho 
-que desejar (desde que esteja dentro da capacidade máxima do disco rígido).
-
-Uma partição não interfere em outras partições do mesmo disco(é como 
-se tivessemos vários discos rígidos dentro de um).
-
-Em um disco rígido, pode ser criada uma partição única, que neste caso 
-todo o disco rígido é usado para armazenar os arquivos(que é o caso mais 
-comum caso voce tenha o DOS), ou várias partições, que podem ser usadas 
-pelo mesmo SO(Sistema Operacional) ou outros sistemas operacionais diferentes
-(um exemplo de várias partições, é se voce for usar o DOS e o Linux no mesmo
-disco, os dois sistemas vão estar no mesmo disco mas um não interfere no 
-outro).
-
-Este manual tem a itenção de explicar o particionamento de discos utilizando
-o programa fdisk (fdisk do Linux não do DOS!).
-
-
-
-1.4-) Algumas identificações utilizadas neste manual para facilitar a 
-      compreensão do texto
-
-Esta parte descreve algumas características de organização deste manual 
-e algumas identificações que adotei para facilitar o seu entendimento, e as
-explicações que serão dadas.
-
-Explicação de nomes e comandos, sera seguida da palavra "onde" e abaixo
-dela as explicações sobre os comandos, exemplo:
-
-onde:
-nome a ser explicado1  : Descrição 
-nome a ser explicado2  : Descrição 
-nome a ser explicado3  : Descrição 
-
-ou
-
-onde:
-nome a ser explicado1  - Descrição 
-nome a ser explicado2  - Descrição 
-nome a ser explicado3  - Descrição 
-
-
-Quando for feita alguma referência com tecla do teclado, por exemplo, 
-pressione p para listar as partições, a letra sera colocada entre <> para
-facilitar a interpretação:
-
-pressione <p> para listar as partições
-após isto pressione <Enter> para confirmar
-pressione <l> para listar os tipos de partições disponíveis
-
-
-As linhas pontilhadas que aparecem na tela, veja abaixo,
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-servem para identificar que o que esta entre as linhas é um exemplo de como 
-será a resposta do comando para a tela de seu computador.
-
-
-
-1.5-) Identificação de discos e partições no Linux
-
-Antes de descrever como se utiliza o programa fdisk, é importante fazer 
-algumas explicações sobre a identificação das partições e unidades de disco 
-no sistema Linux( e outros *nix). Se voce for um usuário que já conhece
-a interpretação de discos e partições neste sistema, voce não precisará ler
-esta parte.
-
-No sistema operacional Linux, os dispositivos existentes no computador
-(como impressoras, unidades de disquetes, discos rígidos, monitor, placa de
-som, etc...) são identificados por um nome referente a este dispositivo e
-colocado no diretório /dev (que é utilizado para identificar dispositivos ou
-periféricos existentes no computador).
-
-A identificação dos discos rígidos segue a seguinte forma:
-
-  /dev/hda1
-  |    | ||
-  |    | ||_Número que identifica a partição do disco rígido(1=Primeira, 2=segunda)
-  |    | |
-  |    | |_Letra que identifica o disco rígido(a=primeiro disco, b=segundo disco, etc..)
-  |    |
-  |    |_Sigla HD - Significa que é um disco rígido IDE(Se tiver um SD significa SCSI)
-  |
-  |_ Identificação do diretório onde os dispositivos do sistema são armazenados
-
-OBS: As unidades de disco rígido SCSI, são identificadas com as letras SD 
-     seguida pela letra da unidade e número da partição e os discos IDE são
-     identificados por HD seguida pela letra da unidade de disco e o número
-     da partição do disco(como visto acima).
-
-Abaixo, algumas identificações de disco do sistema Linux:
-
-/dev/hda1    -   Disco rígido IDE primário principal - Primeira partição
-/dev/hda2    -   Disco rígido IDE primário principal - Segunda partição
-/dev/hda3    -   Disco rígido IDE primário principal - Terceira partição
-/dev/hdb1    -   Disco rígido IDE primário escravo - Primeira partição
-/dev/hdb2    -   Disco rígido IDE primário escravo - Segunda partição
-/dev/hdb3    -   Disco rígido IDE primário escravo - Terceira partição
-/dev/hdc1    -   Disco rígido IDE secundário principal - Primeira partição
-/dev/hdc2    -   Disco rígido IDE secundário principal - Segunda partição
-/dev/hdc3    -   Disco rígido IDE secundário principal - Terceira partição
-/dev/hdd1    -   Disco rígido IDE secundário escravo - Primeira partição
-/dev/hdd2    -   Disco rígido IDE secundário escravo - Segunda partição
-/dev/hdd3    -   Disco rígido IDE secundário escravo - Terceira partição
-/dev/sda1    -   Primeiro disco rígido SCSI - Primeira partição
-/dev/sda2    -   Primeiro disco rígido SCSI - Segunda partição
-/dev/sda3    -   Primeiro disco rígido SCSI - Terceira partição
-/dev/sdb1    -   Segundo disco rígido SCSI - Primeira partição
-/dev/sdb2    -   Segundo disco rígido SCSI - Segunda partição
-/dev/sdb3    -   Segundo disco rígido SCSI - Terceira partição
-
-No exemplo acima foram usadas 3 partições por disco, mas podem existir 
-mais partições no mesmo disco, um exemplo é se o disco rígido possuir 
-partições Lógicas, que são identificadas no sistemas a partir de /dev/hdx5
-em diante.
-
-Abaixo um exemplo de como o Linux identifica as partições em cada disco 
-existente em seu computador:
-
-Vamos supor que eu tenha 2 discos rígidos: 
-o 1ºdisco de 2GB e o 2ºdisco  de 1GB(Giga Byte ou 1.000 Megas!) 
-
-No primeiro disco(de 2GB), a primeira partição é de 800MB do tipo 
-FAT16(DOS), a segunda partição é de 1.2GB do tipo EXT2(Linux)(1.2GB+800MB=2GB
-que é a capacidade total do disco). Então as partições seriam identificadas 
-da seguinte forma no Linux:
-
-/dev/hda - Disco rígido Primário Principal 
-/dev/hda1 - Primeira partição do primeiro disco rígido (de 800MB do tipo DOS)
-/dev/hda2 - Segunda partição do primeiro disco rígido( de 1.2GB do tipo Linux)
-
-Neste caso estariam disponíveis 800MB para serem usados com o DOS e 
-1.2GB para o Linux. 
-Por exemplo, se voce particionar um disco rígido em duas partes e usar 
-as duas partições no DOS, ele reconhecerá as partições como sendo C: e D:.
-
-Lembre-se: Quando um disco é particionado, uma partição não interfere 
-           nas outras, repare que quando voce particiona(divide) um disco,
-           é como se tivesse dois discos rígidos(o único cuidado que 
-           voce deve tomar é com as cópias de segurança, porque se der
-           um problema de parte eletrônica no disco rígido, por exemplo,
-           a sua placa controladora queimar ou o cabeçote dele ir pro 
-           espaço, voce perderá as suas 2 partições que estão armazenadas
-           nele.
-
-
-Voltando ao exemplo das classificações das partições do disco, vamos 
-para o segundo disco: 
-
-No segundo disco(1GB), eu tenho uma partição de 950MB do tipo FAT16(DOS),
-que costumo usar para armazenar arquivos temporários e cópias de segurança 
-de meu sistema, etc..., e outra de 50MB SWAP(Partição de memória virtual 
-como descrevi acima)(950MB+50MB=1GB). Então as partições deste disco seriam
-identificadas da seguinte forma no Linux: 
-
-/dev/hdb - Disco rígido principal escravo 
-/dev/hdb1 - Primeira partição do disco acima ( de 950MB do tipo DOS) 
-/dev/hdb2 - Segunda partição do disco acima ( de 50MB do tipo SWAP) 
-
-No disco acima, 950MB estão disponíveis para serem usados pelo DOS e 50 MB pela
-memória virtual (SWAP) do Linux. 
-
-Note que se voce utiliza o MS-DOS, não será possível ver as partições 
-do Linux e SWAP, porque são imcompatíveis com o formato aceito pelo DOS (ele 
-identificaria a primeira partição do primeiro disco(800MB) como a unidade C:
-e a primeira partição do segundo disco(950MB) como unidade D), mas o 
-contrário não acontece; O Linux tem total compatibilidade com a partição 
-DOS FAT12, FAT16, FAT32, OS/2 HPFS, e muitas outras.
-
-
-
-1.6-) Tipos de partições de discos
-
-As partições de disco são divididas em tres tipos: Primária, Extendida 
-e Lógica. 
-
-Pode se ter no máximo quatro partições primárias e extendidas no mesmo 
-disco. A partição Primária permite o armazenamento de arquivos e diretórios.
-Todos os computadores que possuem somente a unidade C(supondo que voce use o
-DOS), usam este tipo de partição para armazenamento de arquivos e inicialização
-do sistema operacional.
-
-Se for preciso criar mais que 4 partições no mesmo disco, será necessário
-criar uma partição Extendida. A partição Extendida  não pode ser utilizada
-para armazenar arquivos. Ela é usada para a criação de outras partições,
-dentro dela, que são chamadas de partições Lógicas. 
-
-Uma partição extendida podem conter várias partições Lógicas. As partições 
-Lógicas podem armazenar arquivos e diretórios(como as partições primárias).
-
-Um mesmo disco rígido pode armazenar mais de 64 partições independentes
-uma das outras.
-
-OBS: Os arquivos e diretórios podem ser armazenados somente em partições de 
-     disco primárias ou lógicas, a partição extendida não é usada para armazanamento
-     de arquivos e diretórios.
-
-Se possuir duas partições em seu computador (C: e D: no DOS), e não 
-estiver usando a partição D:, a instalação pode ser feita nesta partição 
-desde que ela tenha o espaço necessário para o sistema operacional Linux, 
-os programas que desejar instalar, mais a partição SWAP.
-
-
-
-1.7-) Observações sobre o formato DOS 6.XX(FAT 16)
-
-No formato DOS 6.XX(FAT16), o primeiro setor da área de dados da partição
-é utilizado frequentemente pelo DOS para armazenamento de dados sobre a
-partição de disco, e estes dados são usados pelo sistema para se ter maior
-confiabilidade do que os dados armazenados na tabela de partição. O sistema
-de arquivos DOS, faz o FDISK(do DOS) limpar os primeiros 512 bytes da área
-de dados da partição sempre que uma mudança de tamanho acontecer.
-
-O formatador do DOS(format) verifica este primeiro setor toda vez que
-a upção /U (que é utilizada para não salvar dados para se fazer a desformatação
-do disco) é utilizada.
-
-Isto é considerado uma FALHA no Format(do DOS) e no Fdisk(do DOS).
-A opção abaixo deve ser utilizada caso voce crie uma partição do DOS FAT16
-com o Fdisk, que faz com que os primeiros 512 bytes daquela partição
-sejam "limpos", para manter a compatibilidade com o DOS. Utilize esta opção
-dentro do Linux, após criar a partição com o Fdisk e reiniciar o seu 
-computador. Foi notado que esta opção só funciona corretamente somente quando
-o Sistema Linux estiver instalado em seu computador. Não me responsabilizo 
-caso utiliza-la a partir de um disquete de recuperação.
-
-dd if=/dev/zero of=/dev/hdx1 bs=512 count=1
-
-onde: 
-hdx1 - É a identificação da unidade de disco e a partição que foi criada
-       pelo Fdisk utilizando o sistema de arquivos DOS que terá seu 
-       primeiro setor "limpo".
-
-
-OBS1: Cuidado ao utilizar esta opção, um pequeno descuido pode resultar na
-     perda de dados do seu disco rígido ou outras partição.
-
-OBS2: Não utilize este comando com partições que utilizam o sistema de arquivos
-     FAT32(utilizada nos sistemas operacionais Windows 95 OSR/2 e superiores)
-     se for utilizada em um disco com este sistema, sua FAT será corrompida,
-     se isto acontecer, será necessária a re-formatação da partição.
-
-OBS3: É extremamente recomendado que se utilize o programa de particionamento
-     que acompanha o seu sistema operacional. Por exemplo, se deseja criar
-     uma partição DOS 6.XX, utilize o FDisk qua acompanha o DOS.
-
-
-
-2-) Iniciando o programa Fdisk
-
-Para iniciar o programa fdisk(Linux)digite: 
-fdisk [unidade]
-
-Onde:
-unidade - deve ser a unidade de disco rígido no padrão Linux( /dev/hda, 
-          /dev/hdb, /dev/sda, /dev/sdb, etc... ). Se voce tem apenas 1 
-          disco rígido IDE, use /dev/hda, para fazer o fdisk trabalhar 
-          com este disco. Se possuir 1 disco SCSI, use /dev/sda
-
-Se a unidade não for especificada, o programa fdisk usará /dev/hda como 
-unidade de disco padrão. 
-
-ATENÇÃO : A OPERAÇÃO DE PARTICIONAMENTO DE DISCOS PODE FAZER COM QUE OS DADOS
-          ARMAZENADOS EM SEU DISCO RÍGIDO SEJAM PERDIDOS, SE FOR USADA 
-          INCORRETAMENTE. É SEMPRE RECOMENDADO RETIRAR UMA CÓPIA DE SEGURANÇA
-          DOS SEUS ARQUIVOS EXISTENTES NO MICRO ANTES DE SE EXECUTAR UM
-          PROGRAMA DESTE TIPO, A NÃO SER QUE TENHA CONFIANÇA NO QUE ESTA
-          FAZENDO E QUE ENTENDEU AS EXPLICAÇÕES SOBRE A IDENTIFICAÇÃO DE
-          DISCOS RÍGIDOS E SUAS PARTIÇÕES NO SISTEMA.
-
-
-
-2.1-) Opções de linha de comando
-
-Com a utilização de opções de linha de comando, voce pode fazer com que 
-o programa inicie de uma forma específica, ou personalizada.
-
-fdisk [-b] [-u] [unidade]   - Opções aceitas para o particionamento.
-fdisk [-l] [-b] [-u]        - Opções aceitas para listar as partições atuais.
-fdisk [-s] [unidade]        - Opção aceita para mostrar o Tamanho da partição
-fdisk [-v]                  - Versão do programa
-
-Onde: 
--b  : Faz com que o fdisk mostre na tela a coluna BEGIN quando utilizar
-      a opção <p> durante o particionamento do disco ou com a opção -l
-      quando se for listar as partições na linha de comando.
-      OBS: Esta opção é geralmente desnecessária, porque seu valor equivale
-           ao valor da coluna START.
--u  : Muda a unidade de medida padrão para Setores. Se esta opção for usada 
-      na linha de comando para se fazer o particionamento de disco, após
-      pressionar <p>, o programa mostrará na tela o inicio e o fim da 
-      partição em Setores ao invés de utilizar cilindros para a listagem. 
-      Se for utilizada em conjunto com a opção -l, a unidade de medida do 
-      Inicio e Fim da partição será listada Setores ao invés de cilindros.
--l  : Lista as partições existentes no disco, sem entrar no programa
-      fdisk, ou alterar qualquer partição. Esta opção é equivalente a
-      entrar no programa fdisk e pressionar <p>, mas ela somente lista
-      as partições sem entrar no programa.
--s  : Mostra o tamanho de uma partição de disco. A única diferença desta
-      para as outras opções, é que se deve especificar a unidade mais a
-      partição que deseja ver o tamanho, por exemplo, digitando-se:
-      fdisk -s /dev/hda1
-      voce visualizará o tamanho total da partição de disco hda1.
--v  : Mostra a versão do programa fdisk que esta utilizando.
-      
-   
-
-2.2-) Comandos do fdisk. 
-
-O fdisk do Linux manipula as partições de seu disco através de comandos
-digitados no teclado. Cada letra digitada corresponde a um comando diferente
-no fdisk. Estes comandos serão utilizados após iniciar o programa.
-
-Aqui vai a lista de comandos disponíveis no fdisk, recomendo que anote
-em um papel, ou imprima esta parte do texto( ou todo o documento) para que 
-possa consultar estas opções durante o particionamento do seu disco rígido.
-
-a   - Seleciona entre partição inicializável e não inicializável.
-b   - Edita um volume de disco BSD(não usada em computadores com DOS)
-d   - Apaga uma tabela de partição (Delete) 
-l   - Lista os tipos de partições disponíveis (List) 
-m   - Ajuda
-n   - Cria uma nova tabela de partição (New)
-p   - Mostra a tabela de partição atual (Print) 
-q   - sai do fdisk sem gravar as alterações no disco (quit)
-t   - Muda o tipo da partição (Type)
-u   - Altera as unidades de medidas que são mostradas na tela 
-v   - Verifica a tabela de partição (verify)
-w   - grava as alterações feitas para o disco e sai do fdisk (write)
-x   - Comandos especiais do programa(somente para usuários experientes)
-
-
-  
-3-) Manipulando partições no disco rígido
-
-Agora vamos começar realmente a trabalhar com o fdisk, os textos que 
-foram colocados acima, foi para que voce entendesse o que é o particionamento
-de um disco rígido e para que soubesse a diferença entre partição e um disco
-rígido,(já vi muitas pessoas falarem de partição como se fosse disco rígido...)
-
-Abaixo uma explicação passo-a-passo de como particionar um disco usando
-o fdisk e seus comandos. 
-
-ATENÇÃO: O disco rígido usado no particionamento é um exemplo. Ele não deve 
-         ser usado por voce para fazer o particionamento de seu disco, uma 
-         vez que a capacidade e outros parâmetros do disco rígido variam de 
-         um para o outro. Este exemplo serve apenas para que voce entenda 
-         como o fdisk funciona, o que faz cada um de seus comandos e a 
-         fazer o cálculo do tamanho das partições.
-
-A tradução das mensagens que aparecem em Ingles nos exemplos que vou colocar 
-logo abaixo, e a ajuda do programa, não foram feitas porque aparecem exatamente 
-como estão quando fizer o particionamento de seu disco, e não conheço 
-nenhuma versão do fdisk(Linux) em português (caso alguém conheça uma versão
-deste programa em português, favor entrar em contato comigo para que eu 
-possa atualizar este documento, meu endereço de E-mail esta no final do 
-documento). 
-Somente vou explicar o que significa cada mensagem que aparece no fdisk 
-através de uma comparação. 
-
-No exemplo eu vou usar um disco de 1.08GB. Este disco possui 630 cilindros,
-16 cabeças, e 21 setores por trilha(modo LBA). 
-
-
-
-3.1-) Listando partições existentes no disco
-
-Primeiro digite fdisk /dev/hda (supondo que este disco seja o principal),
-se a unidade de disco não for digitada, o fdisk usará /dev/hda como padrão.
-Após voce digitar este comando, o fdisk procura por partições existentes,
-seus tamanhos e outras características(geometria do disco) que serão 
-utilizadas para se fazer o cálculo de partições.
-
-Quando entrar no programa, digite a letra <p> para que o programa mostre
-as tabelas de partição existentes no disco rígido. 
-
-A tela que aparece é a seguinte: 
-
----------------------------------------------------------------------------- 
-Command (m for help): p 
-Disk /dev/hda: 16 heads, 21 sectors, 630 cylinders 
-Units = cylinders of 630*512 bytes 
-
- Device      Boot    Begin    Start    End   Blocks   Id   System 
- /dev/hda1    *        1        1      117   204800    6   DOS 16-bits >=32M 
-
-Command (m for help): 
------------------------------------------------------------------------------ 
-
-
-Abaixo uma tradução desta tela: 
----------------------------------------------------------------------------- 
-Commando (m para ajuda): <p> 
-Disco /dev/hda: 16 cabeças, 21 setores, 630 cilindros 
-Unidades = cilindros de 630*512 bytes 
-
-Dispositivo  Partida  Começa  Inicio   Fim  Blocos  Identif.  Sistema 
-/dev/hda1      *        1       1      117  204800     6      DOS 16-bits >=32M 
-
-Comando (m para ajuda): 
----------------------------------------------------------------------------- 
-
-Onde: 
-Device : É a identificação da partição de disco. 
-Boot   : Se estiver com "*", se a partição pode ser usada para BOOT.
-Begin  : Cilindro inicial da partição de disco 
-Start  : Cilindro inicial da partição de disco 
-End    : Cilindro Final da partição do disco 
-Blocks : Quantidade de blocos ocupados pela partição de disco. No Linux, um 
-         Bloco equivale a 1024 bytes(1KB) 
-ID     : Tipo da partição (conforme a lista de partições existentes quando é 
-         pressionada a letra <L>. 
-System : Descrição do sistema de arquivos que é usado na partição de disco. 
-
-Como vemos acima, o disco rígido possui uma partição do tipo DOS- FAT16
-ocupando 200MB de espaço em disco (200000 Blocos multiplicados por 1024). 
-
-
-
-3.2-) Criando uma partição de Disco
-
-Para criar uma partição de disco, pressionamos a letra <n>. Neste 
-exemplo vamos criar uma partição do tipo Linux EXT2(Nativa) com o tamanho de
-820MB, esta partição é a que conterá todo o sistema de arquivos Linux e seus 
-programas, veja o exemplo: 
-
----------------------------------------------------------------------------- 
-Command ( m for help): <n> 
-    e  extended 
-    p  primary partition (1-4) 
-<p> 
-Partition number (1-4): <2> 
-First cylinder(118-630): <118> 
-Last cylinder or +size or +sizeK or +sizeM (118-630): <+820M> 
----------------------------------------------------------------------------- 
-O fdisk perguntará se deseja criar uma partição extendida ou primária. 
-Crie uma partição primária para o sistema de arquivos do Linux, ou uma 
-partição extendida caso voce ja tenha 3 partições primárias criadas em seu 
-disco, conforme foi visto acima.
-
-Como pode ter notado no exemplo acima, como já existia a partição 1,
-digitamos o número 2 para que fosse criada uma segunda partição, se
-a partição número 2 já existisse, seria digitado o número 3 para criar
-uma terceira partição, assim por diante.
-
-Após escolher o tipo de partição que será criada, voce deverá especificar
-o cilindro inicial da partição de disco. No exemplo acima, o valor do cilindro
-inicial é de 118. Utilize sempre o valor do cilindro inicial sugerido pelo 
-fdisk, a não ser que se queira deixar um espaço entre uma partição antiga e 
-a nova partição para a criação de uma partição menor ou por outros motivos.
-
-O último passo é especificar onde terminará a partição de disco. É 
-permitida a utilização de Cilindros, bytes, Kbytes e Mbytes para marcar o
-final da partição de disco (veja detalhes abaixo).
-
-LEMBRE-SE: Em um mesmo disco rígido podem existir até 4 partições primárias 
-           (contando com a partição Extendida).
-
-onde:
-   Partition number : Número da partição que vai ser criada, como já temos 
-                      uma partição no disco, digitamos o número 2 para 
-                      dizer ao fdisk que queremos criar uma segunda partição
-                      primária. Neste exemplo, voce acabou de criar a 
-                      partição /dev/hda2. 
-    First cylinder  : Primeiro cilindro disponível após o último cilindro 
-                      usado pela partição 1. Neste caso usamos o cilindro 
-                      118 até o cilindro final(Last Cylinder). O valor
-                      deve ser digitado em cilindros.
-    Last cylinder or +size or +sizeK or +sizeM : Aqui voce pode especificar 
-                      o final da partição de disco. 
-                      Os seguintes valores podem ser usados para marcar o
-                      final da partição de disco:
-
-                      597         - É o valor equivalente a partição de 820MB 
-                                    (em cilindros) 
-                      +820000000  - É o valor equivalente a partição de 
-                                    820MB (em bytes) 
-                      +820000K    - É o valor equivalente a partição de 
-                                    820MB (em Kbytes) 
-                      +820M       - É o valor equivalente a partição de 
-                                    820MB (em Mbytes) 
-
-Recomendo que especifique o valor em MB ou KB por não exigir o 
-cálculo do espaço do disco usado em cada cilindro, e por ser um dos mais 
-utilizados e mais práticos. Especificando o valor em bytes, Kbytes ou 
-Mbytes, o fdisk se encarregará de converter o tamanho digitado para
-um valor de cilindro final. 
-
-Se digitar um número acima do espaço disponível no disco(ou cilindro
-diponível), será mostrada uma mensagem de erro dizendo que a partição não
-pode ser criada.
-
-OBS: Caso seja criada uma partição DOS FAT16, deverá ser utilizado o comando
-     dd if=/dev/zero of=/dev/hdx1 bs=512 count=1
-     para que a partição criada seja compatível com o formato utilizado pelo
-     DOS. Para maiores detalhes veja Observações sobre o formato DOS 6.XX
-  
-
-    Para verificar as partições existentes no disco tecle <p> 
----------------------------------------------------------------------------- 
-Command (m for help): p 
-Disk /dev/hda: 16 heads, 21 sectors, 630 cylinders 
-Units = cylinders of 630*512 bytes 
-
- Device    Boot  Begin  Start  End   Blocks    Id     System 
-/dev/hda1   *      1      1    117   204800     6     DOS 16-bits >=32M 
-/dev/hda2         118    118   597   839680    83     Linux Native 
-
-Command (m for help): 
----------------------------------------------------------------------------- 
-   
-
-
-
-3.3-) Mudando o tipo de uma partição
-
-O tipo da partição é a identificação de qual sistema de arquvios que ela
-pertence e na qual possuem características próprias e diferentes de outros
-sistemas de arquivos.
-
-Tecle <t> para trocar o tipo de partição usado no disco. 
-Pressione a tecla <l> se desejar ver os tipos de partições compatíveis
-com o programa fdisk. 
-
-Veja o exemplo de como trocar o tipo da partição de Linux Native (tipo 
-83) para Linux Swap (tipo 82):
-
----------------------------------------------------------------------------- 
-  Command (m for help): <t> 
-  Partition number (1-4): <3> 
-  Hex code (type L to list codes): <82> 
----------------------------------------------------------------------------- 
-    Agora a partição em /dev/hda3 é do tipo Linux SWAP(tipo 82). 
-
-
-Pressione a tecla <p> para verificar a partição /dev/hda3: 
----------------------------------------------------------------------------- 
-Command (m for help): p 
-Disk /dev/hda: 16 heads, 21 sectors, 630 cylinders 
-Units = cylinders of 630*512 bytes 
-
- Device    Boot  Begin  Start  End  Blocks    Id     System 
-/dev/hda1   *      1      1    117  204800     6    DOS 16-bits >=32M 
-/dev/hda2         118    118   597  839680    83    Linux Native 
-/dev/hda3         598    598   630   61440    83    Linux SWAP 
-Command (m for help): 
----------------------------------------------------------------------------- 
-
-
-
-3.4-) Excluindo uma partição de Disco
-
-Para excluir uma partição, pressione a tecla <d>, será mostrada a seguinte 
-tela: 
-
----------------------------------------------------------------------------- 
-Command (m for help):<d> 
-Partition number(1-4): 3 
-
-Command(m for help): 
----------------------------------------------------------------------------- 
-
-Com o comando acima, a partição número 3 (SWAP) foi excluida,. O espaço
-ocupado pela partição 3 é novamente liberado para que voce possa utilizar
-para criar outra (ou outras) partições de disco. 
-
-ATENÇÃO: TENHA MUITO CUIDADE COM O DA OPÇÃO <D>(Delete) DO FDISK. Caso se 
-         tenha apagado acidentalmente alguma partição que contém dados, 
-         pressione a tecla <q> para sair do fdisk sem gravar o que fez.
-         Neste caso, será necessário refazer todo o particionamento do disco.
-         Não pressione a tecla <w> se voce excluiu alguma partição que 
-         utiliza, porque todo o que foi feito no fdisk será gravado, inclusive
-         a partição excluida acidentalmente, sem a possibilidade de
-         recupera-la. 
-
-para verificar se a partição foi excluida pressionamos <p>: 
----------------------------------------------------------------------------- 
-Command (m for help): p 
-Disk /dev/hda: 16 heads, 21 sectors, 630 cylinders 
-Units = cylinders of 630*512 bytes 
-
- Device    Boot Begin  Start  End  Blocks    Id     System 
-/dev/hda1   *     1      1    117  204800     6     DOS 16-bits >=32M 
-/dev/hda2        118    118   597  839680    83    Linux Native 
-Command (m for help): 
----------------------------------------------------------------------------- 
-
-
-
-3.5-) Gravando partições alteradas para o disco
-
-Para gravar as alterações feitas na(s) partições para o disco após 
-fazer o particionamento, pressione a tecla <w>, esta opção faz a saida do 
-fdisk gravando todas as alterações que fez durante o uso do programa
-fdisk(partições criadas, alteradas, excluidas).
-
-Enquando voce trabalha no fdisk criando partições, modificando tamanhos,
-excluindo partições, nada do que faz é gravado para o disco automaticamente
-(por motivos de segurança contra perda de alguma partição já existente).
-
-
-
-3.6-) Abandonando o particionamento de disco sem gravar as alterações
-
-Para sair do fdisk sem gravar as alterações para o disco pressione <q>. 
-Esta opção de sair do fdisk sem gravar as alterações(abandona o programa), 
-é bastante útil caso tenha apagado acidentalmente uma partição que contenha 
-arquivos e programas importantes armazenados nela.
-
-
-
-3.7-) Alternando entre partição inicializável e não inicializável
-
-Partição inicializável é aquela em que o sistema pode dar a partida(boot).
-Pressione a tecla <a> para alterar o tipo da partição entre inicializável
-e não inicalizável.
-
-OBS: O Linux pode iniciar mesmo que a partição que esta instalado esteja
-     marcada como não inicializável, utilizando um boot manager(gerenciador
-     de inicialização) como o LILO(Linux Loader) ou o LoadLin no DOS.
-
-
-
-3.8-) Alterando a unidade de medida do tamanho ocupado pela partição
-
-Para alterar de uma unidade de medida para outra, pressione a tecla <u>.
-A unidade de medida da partição, é o tipo de valor que mostrará o tamanho
-que a partição ocupa no disco toda a vez que se pressiona a tecla <p>, para 
-mostrar as partições na tela, durante o particionamento de disco ou quando 
-se utilizar a opção -l na linha de comando, para listar as partições de 
-disco.
-
-As unidades de medida disponíveis são:
-Cilindros : Este é o padrão do sistema, corresponde ao local onde começa e
-            aonde termina a partição, em cilindros.
-Setores   : corresponde ao local onde começa e aonde termina a partição, em
-            setores.
-
-
-
-
-4-) Outros tipos de partições disponíveis no fdisk(para referência técnica)
-
-Abaixo, segue a listagem dos tipos de partições compatíveis com esta versão
-do fdisk, que pode servir de guia durante o processo de particionamento, e 
-para que conheça a compatibilidade deste programa com os diversos tipos
-de partições que suporte.
-
-OBS1: Recomendo que voce use o programa de particionamento específico de
-      seu sistema operacional, por exemplo: 
-      Para criar uma partição DOS, utilize o Fdisk do dos.
-      Para criar uma partição Linux, utilize o Fdisk dele.
-
-
-Tipo     Descrição
-
-0         Vazio
-1 DOS FAT 12
-2 Xenix root
-3 Xenix /usr
-4 DOS 16-bits<32MB
-5 Extendida DOS
-6 DOS 16-bits >=32MB
-7 OS/2 HPFS
-8 AIX
-9 AIX inicializável
-a OS/2 Boot Manager
-40 Venix 80286
-51 Novell
-52 Microport
-63 GNU hurd
-64 Novell Netware 286
-65 Novell Netware 386
-75 PC/IX
-80 OLD Minix
-81 Linux Minix
-82 Linux SWAP
-83 Linux Native
-85 Linux Extendida
-93 Amoeba
-94 Amoeba BBT
-a5 BSD/386
-a6 Open BSD
-a7 NextStep
-b7 BSDI File System
-b8 BSDI Swap
-c7 Syrinx
-db CP/M
-e1 DOS access
-e3 DOS R/O
-f2 Dos Secundária
-ff BBT
-
-
-
-5-) Direitos Autorais
-
-Este documento foi desenvolvido com base em minha experiência e conhecimento
-em discos e partições, mediante pesquisa em alguns documentos como os How-TO's
-do Linux, e verificando as principais dúvidas de usuários durante a utilização
-de particionadores de disco, tendo como objetivo levar o conhecimento sobre
-discos, partições e utilização deste programa, atendendo tanto usuários
-iniciantes como avançados e como contribuição para a comunidade Linux em geral.
-
-Gleydson M. da Silva (gleydson_s@yahoo.com e gleydson@linuxbr.com.br)
-
-Qualquer dúvida, sugestão ou reclamação podem ser mandadas para um dos E-Mail's
-Acima. Conto com sua contribuição para a melhoria deste Manual.
-
-Autorizo a reprodução Total ou parcial deste texto para que seja utilizado para
-fins educativos, autoaprendizado, colocação em Home pages e qualquer outra forma
-de distribuição não comercial do documento desde que sejam mantidos os meus
-créditos pela pesquisa e elaboração deste documento de acordo com os termos da
-GNU (veja baixo Licenças e Garantias sobre este documento).
-
-
-6- ) Licenças e garantias sobre este documento
-
-Fdisk-Portuguese Copyright (C) 1999 Gleydson M. da Silva
- 
-Este é um documento de livre distribuição, que pode ser copiado e 
-distribuído sob os termos da Licença Pública Geral  GNU, conforme publicada
-pela Free Software Foundation, versão 2 da licença ou (a critério do autor)
-qualquer versão posterior. 
-
-Este documento é distribuído com a itenção de ser útil ao seu utilizador,
-no entanto NÃO TEM NENHUMA GARANTIA,  EXPLÍCITAS OU IMPLÍCITAS , COMERCIAIS
-OU DE ATENDIMENTO A UMA DETERMINADA FINALIDADE. Consulte a Licença Pública 
-Geral  GNU para maiores detalhes. 
-
-gleydson_s@yahoo.com
-gleydson@linuxbr.com.br
-
-
-
-7- ) Marcas Registradas
-
-Os programas e referências mencionados neste manual são de propriedade dos
-seus respectivos donos:
-
-MS-DOS, Windows 3.1x, Windows 9x, Windows NT são de propriedade da Microsoft.
-OS/2 e OS/2 Warp são de propriedade da IBM
-
-
-8- Agradecimentos
-
-Agradeço a todas as pessoas que me mandam correções, comentários, críticas, 
-elogios, dúvidas sobre este documento, pois através destas mensagens, estão
-contribuindo para a melhoria deste projeto e me icentivando para sua continuação.
-
-<EOF> 
\ No newline at end of file
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 1aafdd286..33cf062f1 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -27,8 +27,10 @@
 #include "fdisksgilabel.h"
 #include "fdiskaixlabel.h"
 
-#include "../defines.h"
-#ifdef HAVE_blkpg_h
+#ifdef HAVE_LINUX_COMPILER_H
+#include <linux/compiler.h>
+#endif
+#ifdef HAVE_LINUX_BLKPG_H
 #include <linux/blkpg.h>
 #endif
 
@@ -2515,7 +2517,7 @@ main(int argc, char **argv) {
 			break;
 		case 'V':
 		case 'v':
-			printf("fdisk v" UTIL_LINUX_VERSION "\n");
+			printf("fdisk v" VERSION "\n");
 			exit(0);
 		default:
 			fatal(usage);
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index eab67c015..603b62c45 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -21,8 +21,7 @@
 #include "nls.h"
 
 #include <endian.h>
-#include "../defines.h"		/* for HAVE_scsi_h */
-#ifdef HAVE_scsi_h
+#ifdef HAVE_SCSI_SCSI_H
 #define u_char	unsigned char
 #include <scsi/scsi.h>		/* SCSI_IOCTL_GET_IDLUN */
 #undef u_char
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 8ac17cd14..0611754d0 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -33,8 +33,6 @@
  */
 
 #define PROGNAME "sfdisk"
-#define VERSION "3.08"
-#define DATE "040824"
 
 #include <stdio.h>
 #include <stdlib.h>		/* atoi, free */
@@ -1725,7 +1723,7 @@ read_stdin(unsigned char **fields, unsigned char *line, int fieldssize, int line
     fno = 0;
 
     /* read a line from stdin */
-    lp = fgets(line+2, linesize, stdin);
+    lp = fgets(line+2, linesize-2, stdin);
     if (lp == NULL) {
 	eof = 1;
 	return RD_EOF;
@@ -2299,9 +2297,7 @@ read_input(char *dev, int interactive, struct disk_desc *z) {
  */
 
 static void version(void) {
-    printf("%s %s %s (aeb@cwi.nl, %s) from util-linux-"
-	   UTIL_LINUX_VERSION "\n",
-	   PROGNAME, _("version"), VERSION, DATE);
+    printf("sfdisk from util-linux-%s", VERSION);
 }
 
 static void
diff --git a/getopt/Makefile b/getopt/Makefile
deleted file mode 100644
index a8a8e9d61..000000000
--- a/getopt/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-.SUFFIXES:
-
-include ../make_include
-include ../MCONFIG
-
-GETOPTDIR=$(USRSHAREMISCDIR)/getopt
-
-# Define this to 0 to use the getopt(3) routines in this package.
-LIBCGETOPT=1
-
-SHELL=/bin/sh
-
-LD=ld
-RM=rm -f
-INSTALL=install
-
-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT)
-ifeq ($(LIBCGETOPT),0)
-CPPFLAGS+=-I./gnu
-endif
-
-# -Wcast-align causes problems with the identifier stderr on alpha's
-# with an old glibc.
-# -Wbad-function-cast and -Wmissing-declarations are unknown for gcc 2.5.8.
-WARNINGS=-Wall \
-         -W -Wshadow -Wpointer-arith -Wcast-qual \
-         -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-         -Wnested-externs -Winline
-# CFLAGS= $(WARNINGS) $(OPT)
-
-SOURCES=getopt.c
-ifeq ($(LIBCGETOPT),0)
-SOURCES+=gnu/getopt.c gnu/getopt1.c
-endif
-
-OBJECTS=$(SOURCES:.c=.o)
-
-BINARIES=getopt
-
-.PHONY: all clean realclean 
-all: $(BINARIES)
-
-clean:
-	-$(RM) $(OBJECTS) $(BINARIES) 
-
-getopt: $(OBJECTS)
-	$(CC) $(LDFLAGS) $< -o $@
-
-install: getopt
-	$(INSTALLDIR) $(USRBINDIR) $(MAN1DIR) $(GETOPTDIR)
-	$(INSTALLBIN) getopt $(USRBINDIR)
-	$(INSTALLMAN) getopt.1 $(MAN1DIR)
-	$(INSTALLBIN) getopt-parse.bash getopt-parse.tcsh \
-	              getopt-test.bash getopt-test.tcsh $(GETOPTDIR)
diff --git a/getopt/Makefile.am b/getopt/Makefile.am
new file mode 100644
index 000000000..02f298976
--- /dev/null
+++ b/getopt/Makefile.am
@@ -0,0 +1,11 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+usrbin_PROGRAMS = getopt
+
+getopt_CFLAGS = -DLIBCGETOPT=1
+
+man_MANS = getopt.1
+
+exampledir = $(prefix)/usr/share/getopt/
+example_DATA = getopt-parse.bash getopt-parse.tcsh \
+	getopt-test.bash getopt-test.tcsh
\ No newline at end of file
diff --git a/getopt/Makefile.in b/getopt/Makefile.in
new file mode 100644
index 000000000..e058aa216
--- /dev/null
+++ b/getopt/Makefile.in
@@ -0,0 +1,643 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am COPYING TODO
+usrbin_PROGRAMS = getopt$(EXEEXT)
+subdir = getopt
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man1dir)" \
+	"$(DESTDIR)$(exampledir)"
+usrbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(usrbin_PROGRAMS)
+getopt_SOURCES = getopt.c
+getopt_OBJECTS = getopt-getopt.$(OBJEXT)
+getopt_LDADD = $(LDADD)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = getopt.c
+DIST_SOURCES = getopt.c
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man_MANS)
+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 = `echo $$p | sed -e 's|^.*/||'`;
+exampleDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(example_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+getopt_CFLAGS = -DLIBCGETOPT=1
+man_MANS = getopt.1
+exampledir = $(prefix)/usr/share/getopt/
+example_DATA = getopt-parse.bash getopt-parse.tcsh \
+	getopt-test.bash getopt-test.tcsh
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  getopt/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  getopt/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
+install-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	done
+
+clean-usrbinPROGRAMS:
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+getopt$(EXEEXT): $(getopt_OBJECTS) $(getopt_DEPENDENCIES) 
+	@rm -f getopt$(EXEEXT)
+	$(LINK) $(getopt_LDFLAGS) $(getopt_OBJECTS) $(getopt_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt-getopt.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+getopt-getopt.o: getopt.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getopt_CFLAGS) $(CFLAGS) -MT getopt-getopt.o -MD -MP -MF "$(DEPDIR)/getopt-getopt.Tpo" -c -o getopt-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getopt-getopt.Tpo" "$(DEPDIR)/getopt-getopt.Po"; else rm -f "$(DEPDIR)/getopt-getopt.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getopt.c' object='getopt-getopt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getopt_CFLAGS) $(CFLAGS) -c -o getopt-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
+
+getopt-getopt.obj: getopt.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getopt_CFLAGS) $(CFLAGS) -MT getopt-getopt.obj -MD -MP -MF "$(DEPDIR)/getopt-getopt.Tpo" -c -o getopt-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getopt-getopt.Tpo" "$(DEPDIR)/getopt-getopt.Po"; else rm -f "$(DEPDIR)/getopt-getopt.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getopt.c' object='getopt-getopt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getopt_CFLAGS) $(CFLAGS) -c -o getopt-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+install-exampleDATA: $(example_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(exampledir)" || $(mkdir_p) "$(DESTDIR)$(exampledir)"
+	@list='$(example_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(exampleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(exampledir)/$$f'"; \
+	  $(exampleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(exampledir)/$$f"; \
+	done
+
+uninstall-exampleDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(example_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(exampledir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(exampledir)/$$f"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(MANS) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(exampledir)"; 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)
+
+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-libtool clean-usrbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-exampleDATA install-man \
+	install-usrbinPROGRAMS
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man: install-man1
+
+installcheck-am: installcheck-usrbinPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-exampleDATA uninstall-info-am uninstall-man \
+	uninstall-usrbinPROGRAMS
+
+uninstall-man: uninstall-man1
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-usrbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-exampleDATA install-exec install-exec-am install-info \
+	install-info-am install-man install-man1 install-strip \
+	install-usrbinPROGRAMS installcheck installcheck-am \
+	installcheck-usrbinPROGRAMS installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-exampleDATA \
+	uninstall-info-am uninstall-man uninstall-man1 \
+	uninstall-usrbinPROGRAMS
+
+# 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 --git a/getopt/getopt.c b/getopt/getopt.c
index a22332ad1..785431f5d 100644
--- a/getopt/getopt.c
+++ b/getopt/getopt.c
@@ -371,7 +371,7 @@ int main(int argc, char *argv[])
 	int opt;
 	int compatible=0;
 
-#if WITHOUT_GETTEXT
+#ifdef WITHOUT_GETTEXT
 #else
 	setlocale(LC_ALL,"");
 	bindtextdomain(PACKAGE, LOCALEDIR);
diff --git a/hwclock/Makefile b/hwclock/Makefile
deleted file mode 100644
index 730a355a8..000000000
--- a/hwclock/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-#
-include ../make_include
-include ../MCONFIG
-
-# Where to put man pages?
-
-MAN8= 		hwclock.8
-
-# Where to put binaries?
-# See the "install" rule for the links. . .
-
-SBIN= 		hwclock
-
-
-all: $(SBIN)
-
-
-hwclock.o: hwclock.c
-hwclock.o cmos.o kd.o: ../defines.h
-hwclock.o cmos.o rtc.o kd.o: clock.h
-hwclock: hwclock.o cmos.o rtc.o kd.o
-
-CWFLAGS := $(subst -Wmissing-prototypes,,$(CFLAGS))
-
-cmos.o: cmos.c
-	$(CC) $(CWFLAGS) -c cmos.c -o $@
-# $< expands to clock.h on some systems
-
-install: all
-	$(INSTALLDIR) $(SBINDIR) $(BINDIR) $(USRBINDIR)
-	$(INSTALLBIN) $(SBIN) $(SBINDIR)
-	$(INSTALLMAN) $(MAN8) $(MAN8DIR)
-
-clean:
-	-rm -f *.o *~ core $(SBIN)
diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am
new file mode 100644
index 000000000..562d294f2
--- /dev/null
+++ b/hwclock/Makefile.am
@@ -0,0 +1,7 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+man_MANS = hwclock.8
+
+sbin_PROGRAMS = hwclock
+
+hwclock_SOURCES = hwclock.c cmos.c rtc.c kd.c
\ No newline at end of file
diff --git a/hwclock/Makefile.in b/hwclock/Makefile.in
new file mode 100644
index 000000000..3cfcf1cdc
--- /dev/null
+++ b/hwclock/Makefile.in
@@ -0,0 +1,599 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+sbin_PROGRAMS = hwclock$(EXEEXT)
+subdir = hwclock
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(sbin_PROGRAMS)
+am_hwclock_OBJECTS = hwclock.$(OBJEXT) cmos.$(OBJEXT) rtc.$(OBJEXT) \
+	kd.$(OBJEXT)
+hwclock_OBJECTS = $(am_hwclock_OBJECTS)
+hwclock_LDADD = $(LDADD)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(hwclock_SOURCES)
+DIST_SOURCES = $(hwclock_SOURCES)
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+man_MANS = hwclock.8
+hwclock_SOURCES = hwclock.c cmos.c rtc.c kd.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hwclock/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  hwclock/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
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+hwclock$(EXEEXT): $(hwclock_OBJECTS) $(hwclock_DEPENDENCIES) 
+	@rm -f hwclock$(EXEEXT)
+	$(LINK) $(hwclock_LDFLAGS) $(hwclock_OBJECTS) $(hwclock_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmos.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hwclock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtc.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+	done
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(sbindir)" "$(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)
+
+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-libtool clean-sbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-exec-am: install-sbinPROGRAMS
+
+install-info: install-info-am
+
+install-man: install-man8
+
+installcheck-am: installcheck-sbinPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS
+
+uninstall-man: uninstall-man8
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-man8 install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installcheck-sbinPROGRAMS installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am uninstall-man uninstall-man8 \
+	uninstall-sbinPROGRAMS
+
+# 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 --git a/hwclock/cmos.c b/hwclock/cmos.c
index 399a912c9..e4e55f772 100644
--- a/hwclock/cmos.c
+++ b/hwclock/cmos.c
@@ -47,11 +47,10 @@
 #include <unistd.h>		/* for geteuid() */
 #include <fcntl.h>		/* for O_RDWR */
 #include <errno.h>
-#include "../defines.h"		/* for HAVE_sys_io_h */
 #include "nls.h"
 
 #if defined(__i386__)
-#ifdef HAVE_sys_io_h
+#ifdef HAVE_SYS_IO_H
 #include <sys/io.h>
 #else
 #include <asm/io.h>		/* for inb, outb */
@@ -334,7 +333,7 @@ unsigned long cmos_write(unsigned long reg, unsigned long val)
   return 0;
 }
 
-unsigned long cmos_set_time(unsigned long arg)
+static unsigned long cmos_set_time(unsigned long arg)
 {
   unsigned char save_control, save_freq_select, pmbit = 0;
   struct tm tm = *(struct tm *) arg;
diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c
index 7b7a4ef3b..ec8681527 100644
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -82,7 +82,6 @@
 #include <getopt.h>
 #include <sysexits.h>
 
-#include "../defines.h"		/* for HAVE_tm_gmtoff */
 #include "clock.h"
 #include "nls.h"
 
@@ -690,7 +689,7 @@ set_system_clock(const bool hclock_valid, const time_t newtime,
     tv.tv_usec = 0;
     
     broken = localtime(&newtime);
-#ifdef HAVE_tm_gmtoff
+#ifdef HAVE_TM_GMTOFF
     minuteswest = -broken->tm_gmtoff/60;		/* GNU extension */
 #else
     minuteswest = timezone/60;
@@ -1165,7 +1164,7 @@ manipulate_epoch(const bool getepoch, const bool setepoch,
 #endif
 }
 
-#if __ia64__
+#ifdef __ia64__
 #define RTC_DEV "/dev/efirtc"
 #else
 #define RTC_DEV "/dev/rtc"
@@ -1173,7 +1172,7 @@ manipulate_epoch(const bool getepoch, const bool setepoch,
 
 static void
 out_version(void) {
-	printf(_("%s from %s\n"), MYNAME, util_linux_version);
+	printf(_("%s from util-linux-%s\n"), MYNAME, PACKAGE_VERSION);
 }
 
 /*
diff --git a/hwclock/kd.c b/hwclock/kd.c
index 2581fa5dd..2c10342fd 100644
--- a/hwclock/kd.c
+++ b/hwclock/kd.c
@@ -1,4 +1,5 @@
 /* kd.c - KDGHWCLK stuff, possibly m68k only - deprecated */
+
 #ifndef __m68k__
 
 #include "clock.h"
@@ -16,7 +17,6 @@ probe_for_kd_clock() {
 #include <sysexits.h>
 #include <sys/ioctl.h>
 
-#include "../defines.h"		/* for HAVE_nanosleep */
 #include "clock.h"
 #include "nls.h"
 
@@ -68,7 +68,7 @@ synchronize_to_clock_tick_kd(void) {
     /* Christian T. Steigies: 1 instead of 1000000 is still sufficient
        to keep the machine from freezing. */
 
-#ifdef HAVE_nanosleep
+#ifdef HAVE_NANOSLEEP
     struct timespec xsleep = { 0, 1 };
     nanosleep( &xsleep, NULL );
 #else
diff --git a/hwclock/rtc.c b/hwclock/rtc.c
index a2aa0b825..3876da93a 100644
--- a/hwclock/rtc.c
+++ b/hwclock/rtc.c
@@ -85,7 +85,7 @@ struct linux_rtc_time {
 
 /* ia64 uses /dev/efirtc (char 10,136) */
 /* devfs uses /dev/misc/rtc */
-#if __ia64__
+#ifdef __ia64__
 #define RTC_DEVN	"efirtc"
 #else
 #define RTC_DEVN	"rtc"
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 000000000..e55ea0786
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,3 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+EXTRA_DIST = carefulputc.h env.h errs.h linux_reboot.h md5.h nls.h pathnames.h setproctitle.h widechar.h xstrncpy.h
diff --git a/lib/carefulputc.c b/include/carefulputc.h
index 932233772..2d857ebb0 100644
--- a/lib/carefulputc.c
+++ b/include/carefulputc.h
@@ -1,15 +1,16 @@
+#ifndef _CAREFUULPUTC_H
+#define _CAREFUULPUTC_H
+
 /* putc() for use in write and wall (that sometimes are sgid tty) */
 /* Avoid control characters in our locale, and also ASCII control characters.
    Note that the locale of the recipient is unknown. */
 #include <stdio.h>
 #include <ctype.h>
-#include "carefulputc.h"
 
 #define iso8859x_iscntrl(c) \
 	(((c) & 0x7f) < 0x20 || (c) == 0x7f)
 
-int
-carefulputc(int c, FILE *fp) {
+static inline int carefulputc(int c, FILE *fp) {
 	int ret;
 
 	if (c == '\007' || c == '\t' || c == '\r' || c == '\n' ||
@@ -24,3 +25,5 @@ carefulputc(int c, FILE *fp) {
 	}
 	return (ret < 0) ? EOF : 0;
 }
+
+#endif  /*  _CAREFUULPUTC_H  */
diff --git a/lib/env.h b/include/env.h
index d69b4f295..d69b4f295 100644
--- a/lib/env.h
+++ b/include/env.h
diff --git a/lib/err.c b/include/errs.h
index dc0ab8a7b..bc0f69448 100644
--- a/lib/err.c
+++ b/include/errs.h
@@ -1,3 +1,6 @@
+#ifndef _ERR_H_
+#define	_ERR_H_
+
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,11 +39,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "errs.h"
 
 
-#include "../defines.h"
-#ifdef HAVE_progname
+#ifdef HAVE___PROGNAME
 extern char *__progname;		/* Program name, from crt0. */
 #else
 char *__progname = "foo";		/* probably libc4 */
@@ -48,22 +49,12 @@ char *__progname = "foo";		/* probably libc4 */
 
 /* Some compilers complain "null format string" upon err(1,NULL) */
 /* Make them happy with a separate routine. */
-void
-err_nomsg(int exitval) {
+static inline void err_nomsg(int exitval) {
 	(void)fprintf(stderr, "%s: %s\n", __progname, strerror(errno));
 	exit(exitval);
 }
 
-void
-err(int exitval, const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	verr(exitval, fmt, ap);
-	va_end(ap);
-}
-
-void
-verr(int exitval, const char *fmt, va_list ap) {
+static inline void verr(int exitval, const char *fmt, va_list ap) {
 	int sverrno;
 
 	sverrno = errno;
@@ -76,16 +67,14 @@ verr(int exitval, const char *fmt, va_list ap) {
 	exit(exitval);
 }
 
-void
-errx(int exitval, const char *fmt, ...) {
+static inline void err(int exitval, const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);
-	verrx(exitval, fmt, ap);
+	verr(exitval, fmt, ap);
 	va_end(ap);
 }
 
-void
-verrx(int exitval, const char *fmt, va_list ap) {
+static inline void verrx(int exitval, const char *fmt, va_list ap) {
 	(void)fprintf(stderr, "%s: ", __progname);
 	if (fmt != NULL)
 		(void)vfprintf(stderr, fmt, ap);
@@ -93,16 +82,14 @@ verrx(int exitval, const char *fmt, va_list ap) {
 	exit(exitval);
 }
 
-void
-warn(const char *fmt, ...) {
+static inline void errx(int exitval, const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);
-	vwarn(fmt, ap);
+	verrx(exitval, fmt, ap);
 	va_end(ap);
 }
 
-void
-vwarn(const char *fmt, va_list ap) {
+static inline void vwarn(const char *fmt, va_list ap) {
 	int sverrno;
 
 	sverrno = errno;
@@ -114,18 +101,25 @@ vwarn(const char *fmt, va_list ap) {
 	(void)fprintf(stderr, "%s\n", strerror(sverrno));
 }
 
-void
-warnx(const char *fmt, ...) {
+static inline void warn(const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);
-	vwarnx(fmt, ap);
+	vwarn(fmt, ap);
 	va_end(ap);
 }
 
-void
-vwarnx(const char *fmt, va_list ap) {
+static inline void vwarnx(const char *fmt, va_list ap) {
 	(void)fprintf(stderr, "%s: ", __progname);
 	if (fmt != NULL)
 		(void)vfprintf(stderr, fmt, ap);
 	(void)fprintf(stderr, "\n");
 }
+
+static inline void warnx(const char *fmt, ...) {
+	va_list ap;
+	va_start(ap, fmt);
+	vwarnx(fmt, ap);
+	va_end(ap);
+}
+
+#endif /* !_ERR_H_ */
diff --git a/include/linux_reboot.h b/include/linux_reboot.h
new file mode 100644
index 000000000..9cebc67e8
--- /dev/null
+++ b/include/linux_reboot.h
@@ -0,0 +1,72 @@
+#ifndef _LINUX_REBOOT_H
+#define _LINUX_REBOOT_H
+
+/*
+ * Magic values required to use _reboot() system call.
+ */
+
+#define	LINUX_REBOOT_MAGIC1	0xfee1dead
+#define	LINUX_REBOOT_MAGIC2	672274793
+#define	LINUX_REBOOT_MAGIC2A	85072278
+#define	LINUX_REBOOT_MAGIC2B	369367448
+
+
+/*
+ * Commands accepted by the _reboot() system call.
+ *
+ * RESTART     Restart system using default command and mode.
+ * HALT        Stop OS and give system control to ROM monitor, if any.
+ * CAD_ON      Ctrl-Alt-Del sequence causes RESTART command.
+ * CAD_OFF     Ctrl-Alt-Del sequence sends SIGINT to init task.
+ * POWER_OFF   Stop OS and remove all power from system, if possible.
+ * RESTART2    Restart system using given command string.
+ */
+
+#define	LINUX_REBOOT_CMD_RESTART	0x01234567
+#define	LINUX_REBOOT_CMD_HALT		0xCDEF0123
+#define	LINUX_REBOOT_CMD_CAD_ON		0x89ABCDEF
+#define	LINUX_REBOOT_CMD_CAD_OFF	0x00000000
+#define	LINUX_REBOOT_CMD_POWER_OFF	0x4321FEDC
+#define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
+
+/* Including <unistd.h> makes sure that on a glibc system
+   <features.h> is included, which again defines __GLIBC__ */
+#include <unistd.h>
+#include "linux_reboot.h"
+
+#define USE_LIBC
+
+#ifdef USE_LIBC
+
+/* libc version */
+#if defined __GLIBC__ && __GLIBC__ >= 2
+#  include <sys/reboot.h>
+#  define REBOOT(cmd) reboot(cmd)
+#else
+extern int reboot(int, int, int);
+#  define REBOOT(cmd) reboot(LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,(cmd))
+#endif
+static inline int my_reboot(int cmd) {
+	return REBOOT(cmd);
+}
+
+#else /* no USE_LIBC */
+
+/* direct syscall version */
+#include <linux/unistd.h>
+
+#ifdef _syscall3
+_syscall3(int,  reboot,  int,  magic, int, magic_too, int, cmd);
+#else
+/* Let us hope we have a 3-argument reboot here */
+extern int reboot(int, int, int);
+#endif
+
+static inline int my_reboot(int cmd) {
+	return reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd);
+}
+
+#endif
+
+
+#endif /*  _LINUX_REBOOT_H  */
diff --git a/lib/md5.h b/include/md5.h
index ec07650c6..d598e81be 100644
--- a/lib/md5.h
+++ b/include/md5.h
@@ -1,8 +1,7 @@
 #ifndef MD5_H
 #define MD5_H
 
-#include "../defines.h"
-#ifdef HAVE_stdint_h
+#if HAVE_STDINT_H
 #include <stdint.h>
 #else
 typedef unsigned int uint32_t;
diff --git a/lib/nls.h b/include/nls.h
index f54f94dfc..858fdb61e 100644
--- a/lib/nls.h
+++ b/include/nls.h
@@ -1,20 +1,10 @@
 int main(int argc, char *argv[]);
 
-#include "../defines.h"		/* for HAVE_locale_h */
-
-#ifndef PACKAGE
-#define PACKAGE	"util-linux"
-#endif
-
 #ifndef LOCALEDIR
 #define LOCALEDIR "/usr/share/locale"
 #endif
 
-#ifdef HAVE_locale_h
-# include <locale.h>
-#endif
-
-#if defined MAY_ENABLE_NLS && !defined DISABLE_NLS
+#ifdef ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
 # ifdef gettext_noop
diff --git a/lib/pathnames.h b/include/pathnames.h
index d9e05b321..d9e05b321 100644
--- a/lib/pathnames.h
+++ b/include/pathnames.h
diff --git a/lib/setproctitle.h b/include/setproctitle.h
index d57abda6b..d57abda6b 100644
--- a/lib/setproctitle.h
+++ b/include/setproctitle.h
diff --git a/lib/widechar.h b/include/widechar.h
index 61021be35..d056aa394 100644
--- a/lib/widechar.h
+++ b/include/widechar.h
@@ -2,8 +2,6 @@
 /* This file must be included last because the redefinition of wchar_t may
    cause conflicts when system include files were included after it. */
 
-#include "../defines.h"  /* for ENABLE_WIDECHAR */
-
 #ifdef ENABLE_WIDECHAR
 
 # include <wchar.h>
diff --git a/lib/xstrncpy.c b/include/xstrncpy.h
index 79754261c..7ed4109d6 100644
--- a/lib/xstrncpy.c
+++ b/include/xstrncpy.h
@@ -1,10 +1,8 @@
 /* NUL-terminated version of strncpy() */
 #include <string.h>
-#include "xstrncpy.h"
 
 /* caller guarantees n > 0 */
-void
-xstrncpy(char *dest, const char *src, size_t n) {
+static inline void xstrncpy(char *dest, const char *src, size_t n) {
 	strncpy(dest, src, n-1);
 	dest[n-1] = 0;
 }
diff --git a/lib/Makefile b/lib/Makefile
deleted file mode 100644
index 1a37f3512..000000000
--- a/lib/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-include ../make_include
-include ../MCONFIG
-
-all: err.o my_reboot.o setproctitle.o env.o carefulputc.o xstrncpy.o md5.o
-
-err.o: err.c
-
-my_reboot.o: my_reboot.c linux_reboot.h
-
-env.o: env.h
-
-setproctitle.o: setproctitle.h
-
-carefulputc.o: carefulputc.h
-
-xstrncpy.o: xstrncpy.h
-
-md5.o: md5.c md5.h
-
-.PHONY: clean
-clean:
-	-rm -f *.o *~ core
-
-install:
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 000000000..35fe8c444
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,10 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+noinst_LTLIBRARIES = libmd5.la
+libmd5_la_SOURCES = md5.c
+
+noinst_LTLIBRARIES += libenv.la
+libenv_la_SOURCES = env.c
+
+noinst_LTLIBRARIES += libsetproctitle.la
+libsetproctitle_la_SOURCES = setproctitle.c
diff --git a/lib/Makefile.in b/lib/Makefile.in
new file mode 100644
index 000000000..05dfbb988
--- /dev/null
+++ b/lib/Makefile.in
@@ -0,0 +1,517 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+subdir = lib
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libenv_la_LIBADD =
+am_libenv_la_OBJECTS = env.lo
+libenv_la_OBJECTS = $(am_libenv_la_OBJECTS)
+libmd5_la_LIBADD =
+am_libmd5_la_OBJECTS = md5.lo
+libmd5_la_OBJECTS = $(am_libmd5_la_OBJECTS)
+libsetproctitle_la_LIBADD =
+am_libsetproctitle_la_OBJECTS = setproctitle.lo
+libsetproctitle_la_OBJECTS = $(am_libsetproctitle_la_OBJECTS)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libenv_la_SOURCES) $(libmd5_la_SOURCES) \
+	$(libsetproctitle_la_SOURCES)
+DIST_SOURCES = $(libenv_la_SOURCES) $(libmd5_la_SOURCES) \
+	$(libsetproctitle_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+noinst_LTLIBRARIES = libmd5.la libenv.la libsetproctitle.la
+libmd5_la_SOURCES = md5.c
+libenv_la_SOURCES = env.c
+libsetproctitle_la_SOURCES = setproctitle.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  lib/Makefile'; \
+	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
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libenv.la: $(libenv_la_OBJECTS) $(libenv_la_DEPENDENCIES) 
+	$(LINK)  $(libenv_la_LDFLAGS) $(libenv_la_OBJECTS) $(libenv_la_LIBADD) $(LIBS)
+libmd5.la: $(libmd5_la_OBJECTS) $(libmd5_la_DEPENDENCIES) 
+	$(LINK)  $(libmd5_la_LDFLAGS) $(libmd5_la_OBJECTS) $(libmd5_la_LIBADD) $(LIBS)
+libsetproctitle.la: $(libsetproctitle_la_OBJECTS) $(libsetproctitle_la_DEPENDENCIES) 
+	$(LINK)  $(libsetproctitle_la_LDFLAGS) $(libsetproctitle_la_OBJECTS) $(libsetproctitle_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setproctitle.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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 $(LTLIBRARIES)
+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)
+
+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-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-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 --git a/lib/README.widechar b/lib/README.widechar
deleted file mode 100644
index 5a8179bb7..000000000
--- a/lib/README.widechar
+++ /dev/null
@@ -1,18 +0,0 @@
-From haible@ilog.fr Mon Sep 20 15:34:21 1999
-
-Hello Andries,
-
-Here is a patch for adding multi-byte locale support to a few programs
-found in util-linux-2.9u. With these patches, the programs
-
-    col colcrt colrm column rev ul
-
-now work correctly in UTF-8 locales. This is done by using the ISO C / SUSV2
-i18n functions, therefore they will become effective when glibc-2.2 comes
-out. For the moment, you can test the patches by
-  1. defining ENABLE_WIDECHAR in defines.h
-  2. Change the #if 0 to #if 1 in lib/widechar.h
-  3. Modify your CFLAGS and LDFLAGS to include the directories where libutf8
-     is installed.
-
-
diff --git a/lib/carefulputc.h b/lib/carefulputc.h
deleted file mode 100644
index 29cc75da0..000000000
--- a/lib/carefulputc.h
+++ /dev/null
@@ -1 +0,0 @@
-extern int carefulputc(int c, FILE *fp);
diff --git a/lib/env.c b/lib/env.c
index dffb371f0..82fadf524 100644
--- a/lib/env.c
+++ b/lib/env.c
@@ -1,5 +1,5 @@
 /*
- * Security checks of enviroment
+ * Security checks of environment
  * Added from shadow-utils package
  * by Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  *
diff --git a/lib/errs.h b/lib/errs.h
deleted file mode 100644
index 7961880dc..000000000
--- a/lib/errs.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ERR_H_
-#define	_ERR_H_
-
-#include <stdarg.h>
-
-void	err_nomsg (int);
-void	err (int, const char *, ...);
-void	verr (int, const char *, va_list);
-void	errx (int, const char *, ...);
-void	verrx (int, const char *, va_list);
-void	warn (const char *, ...);
-void	vwarn (const char *, va_list);
-void	warnx (const char *, ...);
-void	vwarnx (const char *, va_list);
-
-#endif /* !_ERR_H_ */
diff --git a/lib/linux_reboot.h b/lib/linux_reboot.h
deleted file mode 100644
index 780d75093..000000000
--- a/lib/linux_reboot.h
+++ /dev/null
@@ -1,30 +0,0 @@
-extern int my_reboot(int);
-
-/*
- * Magic values required to use _reboot() system call.
- */
-
-#define	LINUX_REBOOT_MAGIC1	0xfee1dead
-#define	LINUX_REBOOT_MAGIC2	672274793
-#define	LINUX_REBOOT_MAGIC2A	85072278
-#define	LINUX_REBOOT_MAGIC2B	369367448
-
-
-/*
- * Commands accepted by the _reboot() system call.
- *
- * RESTART     Restart system using default command and mode.
- * HALT        Stop OS and give system control to ROM monitor, if any.
- * CAD_ON      Ctrl-Alt-Del sequence causes RESTART command.
- * CAD_OFF     Ctrl-Alt-Del sequence sends SIGINT to init task.
- * POWER_OFF   Stop OS and remove all power from system, if possible.
- * RESTART2    Restart system using given command string.
- */
-
-#define	LINUX_REBOOT_CMD_RESTART	0x01234567
-#define	LINUX_REBOOT_CMD_HALT		0xCDEF0123
-#define	LINUX_REBOOT_CMD_CAD_ON		0x89ABCDEF
-#define	LINUX_REBOOT_CMD_CAD_OFF	0x00000000
-#define	LINUX_REBOOT_CMD_POWER_OFF	0x4321FEDC
-#define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
-
diff --git a/lib/my_reboot.c b/lib/my_reboot.c
deleted file mode 100644
index 12ea4c926..000000000
--- a/lib/my_reboot.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Including <unistd.h> makes sure that on a glibc system
-   <features.h> is included, which again defines __GLIBC__ */
-#include <unistd.h>
-#include "linux_reboot.h"
-
-#define USE_LIBC
-
-#ifdef USE_LIBC
-
-/* libc version */
-#if defined __GLIBC__ && __GLIBC__ >= 2
-#  include <sys/reboot.h>
-#  define REBOOT(cmd) reboot(cmd)
-#else
-extern int reboot(int, int, int);
-#  define REBOOT(cmd) reboot(LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,(cmd))
-#endif
-int
-my_reboot(int cmd) {
-	return REBOOT(cmd);
-}
-
-#else /* no USE_LIBC */
-
-/* direct syscall version */
-#include <linux/unistd.h>
-
-#ifdef _syscall3
-_syscall3(int,  reboot,  int,  magic, int, magic_too, int, cmd);
-#else
-/* Let us hope we have a 3-argument reboot here */
-extern int reboot(int, int, int);
-#endif
-
-int
-my_reboot(int cmd) {
-	return reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd);
-}
-
-#endif
diff --git a/lib/sysmacros.h b/lib/sysmacros.h
deleted file mode 100644
index 171b33d43..000000000
--- a/lib/sysmacros.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* versions to be used with > 16-bit dev_t - leave unused for now */
-
-#ifndef major
-#define major(dev)	((dev) >> 8)
-#endif
-
-#ifndef minor
-#define minor(dev)	((dev) & 0xff)
-#endif
diff --git a/lib/xstrncpy.h b/lib/xstrncpy.h
deleted file mode 100644
index 05c8fa26f..000000000
--- a/lib/xstrncpy.h
+++ /dev/null
@@ -1 +0,0 @@
-extern void xstrncpy(char *dest, const char *src, size_t n);
diff --git a/login-utils/Makefile b/login-utils/Makefile
deleted file mode 100644
index e6e6a0d33..000000000
--- a/login-utils/Makefile
+++ /dev/null
@@ -1,230 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-# Created: Sat Dec 26 20:09:40 1992
-# Revised: Sun Nov 10 20:28:43 1996 by faith@cs.unc.edu
-# Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu)
-#
-# Suggested changes from Bauke Jan Douma <bjdouma@xs4all.nl> have been
-# implemented to handle shadow and sysvinit systems 
-
-include ../make_include
-include ../MCONFIG
-
-# Where to put man pages?
-
-MAN1.MISC=	last.1 mesg.1 wall.1
-
-MAN1.PUTILS= 	chfn.1 chsh.1 login.1 newgrp.1
-MAN1.PASSWD=    passwd.1
-
-MAN8.GETTY=	agetty.8
-
-MAN8.INIT=	fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \
-		initctl.8
-
-MAN8.PUTILS=	vipw.8 vigr.8
-
-# Where to put binaries?
-# See the "install" rule for the links. . .
-
-SBIN.GETTY=	agetty
-
-SBIN.INIT=	simpleinit shutdown initctl
-
-BIN.PUTILS=	login
-
-USRBIN.MISC=	last mesg wall
-
-USRBIN.PUTILS=	chfn chsh newgrp
-USRBIN.PASSWD=	passwd
-
-USRSBIN.PUTILS=	vipw
-
-ifeq "$(NEED_LIBCRYPT)" "yes"
-CRYPT=-lcrypt
-endif
-
-ifeq "$(HAVE_PAM)" "yes"
-PAM=-lpam -ldl -lpam_misc
-PAMFL=-DUSE_PAM=1
-endif
-
-ifeq "$(HAVE_SELINUX)" "yes"
-CFLAGS += -DWITH_SELINUX=1 -g
-SELINUXLLIB=-lselinux 
-SELINUXOBJS=selinux_utils.o
-endif
-
-ifeq "$(HAVE_SHADOW)" "no"
-WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-putils
-WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-putils
-ifeq "$(HAVE_PAM)" "no"
-ifeq "$(HAVE_PASSWD)" "no"
-WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-passwd
-WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-passwd
-endif
-endif
-endif
-
-ifeq "$(HAVE_SYSVINIT)" "no"
-WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-init
-WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-init
-endif
-
-ifeq "$(HAVE_SYSVINIT_UTILS)" "no"
-WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-misc
-WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-misc
-endif
-
-ifeq "$(HAVE_GETTY)" "no"
-WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-getty
-WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-getty
-endif
-
-all: $(WHAT_TO_BUILD)
-all-passwd: $(USRBIN.PASSWD)
-all-putils: $(BIN.PUTILS) $(USRBIN.PUTILS) $(USRSBIN.PUTILS)
-all-init: $(SBIN.INIT)
-all-getty: $(SBIN.GETTY)
-all-misc: $(USRBIN.MISC)
-
-# Rules for everything else
-login.o: ../MCONFIG
-checktty.o login.o: login.h
-cryptocard.o login.o: cryptocard.h
-chfn.o chsh.o islocal.o passwd.o: islocal.h
-chfn.o chsh.o passwd.o setpwnam.o vipw.o: setpwnam.h
-chfn.o chsh.o login.o newgrp.o passwd.o simpleinit.o: my_crypt.h
-initctl.o simpleinit.o: simpleinit.h
-agetty.o islocal.o last.o setpwnam.o shutdown.o simpleinit.o \
-	vipw.o: $(LIB)/pathnames.h
-shutdown.o simpleinit.o: $(LIB)/linux_reboot.h
-wall.o: ttymsg.h $(LIB)/carefulputc.h
-
-agetty: agetty.o $(LIB)/xstrncpy.o
-chfn: chfn.o islocal.o setpwnam.o $(SELINUXOBJS) $(LIB)/env.o $(LIB)/xstrncpy.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM) $(SELINUXLLIB)
-chsh: chsh.o islocal.o setpwnam.o $(SELINUXOBJS) $(LIB)/env.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM) $(SELINUXLLIB)
-last: last.o
-
-ifeq "$(HAVE_PAM)" "yes"
-login: login.o $(LIB)/setproctitle.o $(LIB)/xstrncpy.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM) $(SELINUXLLIB)
-else
-login: login.o $(LIB)/xstrncpy.o $(LIB)/setproctitle.o checktty.o 
-	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(SELINUXLLIB)
-endif
-
-mesg: mesg.o $(ERR_O)
-
-newgrp: newgrp.o 
-	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM)
-
-shutdown: shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o
-
-simpleinit: simpleinit.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT)
-
-initctl: initctl.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-vipw: vipw.o $(LIB)/xstrncpy.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(SELINUXLLIB)
-
-newgrp.o: $(LIB)/pathnames.h
-	$(CC) -c $(CFLAGS) $(PAMFL) newgrp.c 
-
-wall: wall.o ttymsg.o $(LIB)/carefulputc.o $(LIB)/xstrncpy.o
-
-LOGINFLAGS=
-ifeq "$(USE_TTY_GROUP)" "yes"
-	LOGINFLAGS += -DUSE_TTY_GROUP
-endif
-ifeq "$(ALLOW_VCS_USE)" "yes"
-	LOGINFLAGS += -DCHOWNVCS
-endif
-ifeq "$(DO_STAT_MAIL)" "yes"
-	LOGINFLAGS += -DDO_STAT_MAIL
-endif
-
-login.o: login.c $(LIB)/pathnames.h $(LIB)/setproctitle.c $(LIB)/setproctitle.h
-	$(CC) -c $(CFLAGS) $(PAMFL) $(LOGINFLAGS) login.c
-
-# LOGINFLAGS here only for -DUSE_TTY_GROUP
-mesg.o: mesg.c $(LIB)/errs.h
-	$(CC) -c $(CFLAGS) $(LOGINFLAGS) mesg.c
-
-passwd: passwd.o islocal.o setpwnam.o $(LIB)/env.o $(LIB)/xstrncpy.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT)
-
-ifeq "$(REQUIRE_PASSWORD)" "yes"
-CHSH_FLAGS:=$(CHSH_FLAGS) -DREQUIRE_PASSWORD
-endif
-
-ifeq "$(ONLY_LISTED_SHELLS)" "yes"
-CHSH_FLAGS:=$(CHSH_FLAGS) -DONLY_LISTED_SHELLS
-endif
-
-chsh.o: chsh.c
-	$(CC) -c $(CFLAGS) $(PAMFL) $(CHSH_FLAGS) chsh.c
-
-chfn.o: chfn.c
-	$(CC) -c $(CFLAGS) $(PAMFL) $(CHSH_FLAGS) chfn.c
-
-install: all $(WHAT_TO_INSTALL)
-
-install-putils: $(BIN.PUTILS) $(USRBIN.PUTILS) $(USRSBIN.PUTILS)
-	$(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(USRSBINDIR)
-	$(INSTALLBIN) $(BIN.PUTILS) $(BINDIR)
-	$(INSTALLSUID) $(USRBIN.PUTILS) $(USRBINDIR)
-	$(INSTALLBIN) $(USRSBIN.PUTILS) $(USRSBINDIR)
-	(cd $(USRSBINDIR); ln -sf vipw vigr)
-	$(INSTALLDIR) $(MAN1DIR) $(MAN8DIR)
-	$(INSTALLMAN) $(MAN1.PUTILS) $(MAN1DIR)
-	$(INSTALLMAN) $(MAN8.PUTILS) $(MAN8DIR)
-
-install-passwd: $(USRBIN.PASSWD)
-	$(INSTALLDIR) $(USRBINDIR)
-	$(INSTALLSUID) $(USRBIN.PASSWD) $(USRBINDIR)
-	$(INSTALLDIR) $(MAN1DIR)
-	$(INSTALLMAN) $(MAN1.PASSWD) $(MAN1DIR)
-
-install-init: $(SBIN.INIT)
-	$(INSTALLDIR) $(SBINDIR)
-	$(INSTALLBIN) $(SBIN.INIT) $(SBINDIR)
-	$(INSTALLDIR) $(MAN8DIR)
-	$(INSTALLMAN) $(MAN8.INIT) $(MAN8DIR)
-	# Make *relative* links for these
-	(cd $(SHUTDOWNDIR); ln -sf shutdown reboot)
-	(cd $(SHUTDOWNDIR); ln -sf shutdown fastboot)
-	(cd $(SHUTDOWNDIR); ln -sf shutdown halt)
-	(cd $(SHUTDOWNDIR); ln -sf shutdown fasthalt)
-	(cd $(SHUTDOWNDIR); ln -sf initctl need)
-	(cd $(SHUTDOWNDIR); ln -sf initctl display-services)
-	(cd $(SHUTDOWNDIR); ln -sf initctl provide)
-	(cd $(MAN8DIR);     ln -sf initctl.8 need.8)
-	(cd $(MAN8DIR);     ln -sf initctl.8 display-services.8)
-	(cd $(MAN8DIR);     ln -sf initctl.8 provide.8)
-
-
-install-getty: $(SBIN.GETTY)
-	$(INSTALLDIR) $(SBINDIR)
-	$(INSTALLBIN) $(SBIN.GETTY) $(SBINDIR)
-	$(INSTALLDIR) $(MAN8DIR)
-	$(INSTALLMAN) $(MAN8.GETTY) $(MAN8DIR)
-
-install-misc: $(USRBIN.MISC)
-	$(INSTALLDIR) $(USRBINDIR)
-	$(INSTALLBIN) $(USRBIN.MISC) $(USRBINDIR)
-	$(INSTALLDIR) $(MAN1DIR)
-	$(INSTALLMAN) $(MAN1.MISC) $(MAN1DIR)
-ifeq "$(USE_TTY_GROUP)" "yes"
-	chgrp tty $(USRBINDIR)/wall
-	chmod g+s $(USRBINDIR)/wall
-endif
-
-.PHONY: clean distclean
-clean distclean:
-	-rm -f *.o *~ core $(BIN.PASSWD) $(SBIN.GETTY) $(SBIN.INIT) \
-		$(USRBIN.MISC) $(USRBIN.PASSWD) $(USRBIN.PUTILS) \
-		$(USRSBIN.PUTILS) $(BIN.PUTILS)
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
new file mode 100644
index 000000000..45bac667d
--- /dev/null
+++ b/login-utils/Makefile.am
@@ -0,0 +1,112 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+bin_PROGRAMS =
+usrbin_PROGRAMS =
+sbin_PROGRAMS =
+usrsbin_PROGRAMS =
+man_MANS =
+
+if BUILD_AGETTY
+sbin_PROGRAMS += agetty
+man_MANS += agetty
+endif
+
+if BUILD_INIT
+
+sbin_PROGRAMS += simpleinit shutdown initctl
+man_MANS += fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \
+	initctl.8
+
+
+if NEED_LIBCRYPT
+simpleinit_LDADD = -lcrypt
+endif
+
+endif
+
+if BUILD_LAST
+usrbin_PROGRAMS += last
+man_MANS += last.1
+endif
+
+if BUILD_LOGIN_UTILS
+
+bin_PROGRAMS += login
+usrbin_PROGRAMS += chfn chsh
+usrsbin_PROGRAMS += vipw
+man_MANS += chfn.1 chsh.1 login.1 vipw.8 vigr.8
+
+chfn_SOURCES = chfn.c islocal.c setpwnam.c
+chsh_SOURCES = chsh.c islocal.c setpwnam.c
+
+chfn_LDADD = ../lib/libenv.la
+chsh_LDADD = ../lib/libenv.la
+login_LDADD = ../lib/libsetproctitle.la
+newgrp_LDADD =
+vipw_LDADD =
+
+if NEED_LIBCRYPT
+usrbin_PROGRAMS += newgrp
+man_MANS += newgrp.1
+chfn_LDADD += -lcrypt
+chsh_LDADD += -lcrypt
+login_LDADD += -lcrypt
+newgrp_LDADD += -lcrypt
+endif
+
+if HAVE_PAM
+chfn_LDADD += -lpam -lpam_misc
+chsh_LDADD += -lpam -lpam_misc
+login_LDADD += -lpam -lpam_misc
+login_SOURCES = login.c
+else
+login_SOURCES = login.c checktty.c
+endif
+
+
+if HAVE_SELINUX
+chfn_SOURCES += selinux_utils.c
+chfn_LDADD += -lselinux
+chsh_SOURCES += selinux_utils.c
+chsh_LDADD += -lselinux
+vipw_LDADD += -lselinux
+endif
+
+
+install-data-hook::
+	cd $(DESTDIR)$(usrsbindir) && ln -sf vipw vigr
+
+endif
+
+if BUILD_MESG
+usrbin_PROGRAMS += mesg
+man_MANS += mesg.1
+endif
+
+if BUILD_WALL
+
+usrbin_PROGRAMS += wall
+wall_SOURCES = wall.c ttymsg.c
+man_MANS += wall.1
+
+if USE_TTY_GROUP
+install-data-hook::
+	chgrp tty $(DESTDIR)$(usrbindir)/wall
+	chmod g+s $(DESTDIR)$(usrbindir)/wall
+endif
+
+endif
+
+
+install-exec-hook::
+	cd $(DESTDIR)$(sbindir) && ln -sf shutdown reboot
+	cd $(DESTDIR)$(sbindir) && ln -sf shutdown fastboot
+	cd $(DESTDIR)$(sbindir) && ln -sf shutdown halt
+	cd $(DESTDIR)$(sbindir) && ln -sf shutdown fasthalt
+	cd $(DESTDIR)$(sbindir) && ln -sf initctl need
+	cd $(DESTDIR)$(sbindir) && ln -sf initctl display-services
+	cd $(DESTDIR)$(sbindir) && ln -sf initctl provide
+	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 need.8
+	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 display-services.8
+	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 provide.8
+
diff --git a/login-utils/Makefile.in b/login-utils/Makefile.in
new file mode 100644
index 000000000..4a3a6c137
--- /dev/null
+++ b/login-utils/Makefile.in
@@ -0,0 +1,987 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+bin_PROGRAMS = $(am__EXEEXT_1)
+usrbin_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+	$(am__EXEEXT_7) $(am__EXEEXT_8)
+sbin_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
+usrsbin_PROGRAMS = $(am__EXEEXT_9)
+@BUILD_AGETTY_TRUE@am__append_1 = agetty
+@BUILD_AGETTY_TRUE@am__append_2 = agetty
+@BUILD_INIT_TRUE@am__append_3 = simpleinit shutdown initctl
+@BUILD_INIT_TRUE@am__append_4 = fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \
+@BUILD_INIT_TRUE@	initctl.8
+
+@BUILD_LAST_TRUE@am__append_5 = last
+@BUILD_LAST_TRUE@am__append_6 = last.1
+@BUILD_LOGIN_UTILS_TRUE@am__append_7 = login
+@BUILD_LOGIN_UTILS_TRUE@am__append_8 = chfn chsh
+@BUILD_LOGIN_UTILS_TRUE@am__append_9 = vipw
+@BUILD_LOGIN_UTILS_TRUE@am__append_10 = chfn.1 chsh.1 login.1 vipw.8 vigr.8
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_11 = newgrp
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_12 = newgrp.1
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_13 = -lcrypt
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_14 = -lcrypt
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_15 = -lcrypt
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_16 = -lcrypt
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am__append_17 = -lpam -lpam_misc
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am__append_18 = -lpam -lpam_misc
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am__append_19 = -lpam -lpam_misc
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_20 = selinux_utils.c
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_21 = -lselinux
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_22 = selinux_utils.c
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_23 = -lselinux
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_24 = -lselinux
+@BUILD_MESG_TRUE@am__append_25 = mesg
+@BUILD_MESG_TRUE@am__append_26 = mesg.1
+@BUILD_WALL_TRUE@am__append_27 = wall
+@BUILD_WALL_TRUE@am__append_28 = wall.1
+subdir = login-utils
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+@BUILD_LOGIN_UTILS_TRUE@am__EXEEXT_1 = login$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
+	"$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(usrsbindir)" \
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@BUILD_AGETTY_TRUE@am__EXEEXT_2 = agetty$(EXEEXT)
+@BUILD_INIT_TRUE@am__EXEEXT_3 = simpleinit$(EXEEXT) shutdown$(EXEEXT) \
+@BUILD_INIT_TRUE@	initctl$(EXEEXT)
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@BUILD_LAST_TRUE@am__EXEEXT_4 = last$(EXEEXT)
+@BUILD_LOGIN_UTILS_TRUE@am__EXEEXT_5 = chfn$(EXEEXT) chsh$(EXEEXT)
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__EXEEXT_6 =  \
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@	newgrp$(EXEEXT)
+@BUILD_MESG_TRUE@am__EXEEXT_7 = mesg$(EXEEXT)
+@BUILD_WALL_TRUE@am__EXEEXT_8 = wall$(EXEEXT)
+usrbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@BUILD_LOGIN_UTILS_TRUE@am__EXEEXT_9 = vipw$(EXEEXT)
+usrsbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) $(usrbin_PROGRAMS) \
+	$(usrsbin_PROGRAMS)
+agetty_SOURCES = agetty.c
+agetty_OBJECTS = agetty.$(OBJEXT)
+agetty_LDADD = $(LDADD)
+am__chfn_SOURCES_DIST = chfn.c islocal.c setpwnam.c selinux_utils.c
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__objects_1 = selinux_utils.$(OBJEXT)
+@BUILD_LOGIN_UTILS_TRUE@am_chfn_OBJECTS = chfn.$(OBJEXT) \
+@BUILD_LOGIN_UTILS_TRUE@	islocal.$(OBJEXT) setpwnam.$(OBJEXT) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__objects_1)
+chfn_OBJECTS = $(am_chfn_OBJECTS)
+am__DEPENDENCIES_1 =
+@BUILD_LOGIN_UTILS_TRUE@chfn_DEPENDENCIES = ../lib/libenv.la \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__DEPENDENCIES_1)
+am__chsh_SOURCES_DIST = chsh.c islocal.c setpwnam.c selinux_utils.c
+@BUILD_LOGIN_UTILS_TRUE@am_chsh_OBJECTS = chsh.$(OBJEXT) \
+@BUILD_LOGIN_UTILS_TRUE@	islocal.$(OBJEXT) setpwnam.$(OBJEXT) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__objects_1)
+chsh_OBJECTS = $(am_chsh_OBJECTS)
+@BUILD_LOGIN_UTILS_TRUE@chsh_DEPENDENCIES = ../lib/libenv.la \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__DEPENDENCIES_1)
+initctl_SOURCES = initctl.c
+initctl_OBJECTS = initctl.$(OBJEXT)
+initctl_LDADD = $(LDADD)
+last_SOURCES = last.c
+last_OBJECTS = last.$(OBJEXT)
+last_LDADD = $(LDADD)
+am__login_SOURCES_DIST = login.c checktty.c
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_FALSE@am_login_OBJECTS =  \
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_FALSE@	login.$(OBJEXT) \
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_FALSE@	checktty.$(OBJEXT)
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am_login_OBJECTS =  \
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@	login.$(OBJEXT)
+login_OBJECTS = $(am_login_OBJECTS)
+@BUILD_LOGIN_UTILS_TRUE@login_DEPENDENCIES =  \
+@BUILD_LOGIN_UTILS_TRUE@	../lib/libsetproctitle.la \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__DEPENDENCIES_1)
+mesg_SOURCES = mesg.c
+mesg_OBJECTS = mesg.$(OBJEXT)
+mesg_LDADD = $(LDADD)
+newgrp_SOURCES = newgrp.c
+newgrp_OBJECTS = newgrp.$(OBJEXT)
+@BUILD_LOGIN_UTILS_TRUE@newgrp_DEPENDENCIES = $(am__DEPENDENCIES_1)
+shutdown_SOURCES = shutdown.c
+shutdown_OBJECTS = shutdown.$(OBJEXT)
+shutdown_LDADD = $(LDADD)
+simpleinit_SOURCES = simpleinit.c
+simpleinit_OBJECTS = simpleinit.$(OBJEXT)
+simpleinit_DEPENDENCIES =
+vipw_SOURCES = vipw.c
+vipw_OBJECTS = vipw.$(OBJEXT)
+@BUILD_LOGIN_UTILS_TRUE@vipw_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__wall_SOURCES_DIST = wall.c ttymsg.c
+@BUILD_WALL_TRUE@am_wall_OBJECTS = wall.$(OBJEXT) ttymsg.$(OBJEXT)
+wall_OBJECTS = $(am_wall_OBJECTS)
+wall_LDADD = $(LDADD)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = agetty.c $(chfn_SOURCES) $(chsh_SOURCES) initctl.c last.c \
+	$(login_SOURCES) mesg.c newgrp.c shutdown.c simpleinit.c \
+	vipw.c $(wall_SOURCES)
+DIST_SOURCES = agetty.c $(am__chfn_SOURCES_DIST) \
+	$(am__chsh_SOURCES_DIST) initctl.c last.c \
+	$(am__login_SOURCES_DIST) mesg.c newgrp.c shutdown.c \
+	simpleinit.c vipw.c $(am__wall_SOURCES_DIST)
+man1dir = $(mandir)/man1
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+man_MANS = $(am__append_2) $(am__append_4) $(am__append_6) \
+	$(am__append_10) $(am__append_12) $(am__append_26) \
+	$(am__append_28)
+@BUILD_INIT_TRUE@@NEED_LIBCRYPT_TRUE@simpleinit_LDADD = -lcrypt
+@BUILD_LOGIN_UTILS_TRUE@chfn_SOURCES = chfn.c islocal.c setpwnam.c \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_20)
+@BUILD_LOGIN_UTILS_TRUE@chsh_SOURCES = chsh.c islocal.c setpwnam.c \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_22)
+@BUILD_LOGIN_UTILS_TRUE@chfn_LDADD = ../lib/libenv.la $(am__append_13) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_17) $(am__append_21)
+@BUILD_LOGIN_UTILS_TRUE@chsh_LDADD = ../lib/libenv.la $(am__append_14) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_18) $(am__append_23)
+@BUILD_LOGIN_UTILS_TRUE@login_LDADD = ../lib/libsetproctitle.la \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_15) $(am__append_19)
+@BUILD_LOGIN_UTILS_TRUE@newgrp_LDADD = $(am__append_16)
+@BUILD_LOGIN_UTILS_TRUE@vipw_LDADD = $(am__append_24)
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_FALSE@login_SOURCES = login.c checktty.c
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@login_SOURCES = login.c
+@BUILD_WALL_TRUE@wall_SOURCES = wall.c ttymsg.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  login-utils/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  login-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
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-binPROGRAMS: $(bin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	done
+
+clean-usrbinPROGRAMS:
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-usrsbinPROGRAMS: $(usrsbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrsbindir)" || $(mkdir_p) "$(DESTDIR)$(usrsbindir)"
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrsbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrsbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrsbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrsbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrsbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrsbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrsbindir)/$$f"; \
+	done
+
+clean-usrsbinPROGRAMS:
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrsbinPROGRAMS: $(usrsbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrsbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrsbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+agetty$(EXEEXT): $(agetty_OBJECTS) $(agetty_DEPENDENCIES) 
+	@rm -f agetty$(EXEEXT)
+	$(LINK) $(agetty_LDFLAGS) $(agetty_OBJECTS) $(agetty_LDADD) $(LIBS)
+chfn$(EXEEXT): $(chfn_OBJECTS) $(chfn_DEPENDENCIES) 
+	@rm -f chfn$(EXEEXT)
+	$(LINK) $(chfn_LDFLAGS) $(chfn_OBJECTS) $(chfn_LDADD) $(LIBS)
+chsh$(EXEEXT): $(chsh_OBJECTS) $(chsh_DEPENDENCIES) 
+	@rm -f chsh$(EXEEXT)
+	$(LINK) $(chsh_LDFLAGS) $(chsh_OBJECTS) $(chsh_LDADD) $(LIBS)
+initctl$(EXEEXT): $(initctl_OBJECTS) $(initctl_DEPENDENCIES) 
+	@rm -f initctl$(EXEEXT)
+	$(LINK) $(initctl_LDFLAGS) $(initctl_OBJECTS) $(initctl_LDADD) $(LIBS)
+last$(EXEEXT): $(last_OBJECTS) $(last_DEPENDENCIES) 
+	@rm -f last$(EXEEXT)
+	$(LINK) $(last_LDFLAGS) $(last_OBJECTS) $(last_LDADD) $(LIBS)
+login$(EXEEXT): $(login_OBJECTS) $(login_DEPENDENCIES) 
+	@rm -f login$(EXEEXT)
+	$(LINK) $(login_LDFLAGS) $(login_OBJECTS) $(login_LDADD) $(LIBS)
+mesg$(EXEEXT): $(mesg_OBJECTS) $(mesg_DEPENDENCIES) 
+	@rm -f mesg$(EXEEXT)
+	$(LINK) $(mesg_LDFLAGS) $(mesg_OBJECTS) $(mesg_LDADD) $(LIBS)
+newgrp$(EXEEXT): $(newgrp_OBJECTS) $(newgrp_DEPENDENCIES) 
+	@rm -f newgrp$(EXEEXT)
+	$(LINK) $(newgrp_LDFLAGS) $(newgrp_OBJECTS) $(newgrp_LDADD) $(LIBS)
+shutdown$(EXEEXT): $(shutdown_OBJECTS) $(shutdown_DEPENDENCIES) 
+	@rm -f shutdown$(EXEEXT)
+	$(LINK) $(shutdown_LDFLAGS) $(shutdown_OBJECTS) $(shutdown_LDADD) $(LIBS)
+simpleinit$(EXEEXT): $(simpleinit_OBJECTS) $(simpleinit_DEPENDENCIES) 
+	@rm -f simpleinit$(EXEEXT)
+	$(LINK) $(simpleinit_LDFLAGS) $(simpleinit_OBJECTS) $(simpleinit_LDADD) $(LIBS)
+vipw$(EXEEXT): $(vipw_OBJECTS) $(vipw_DEPENDENCIES) 
+	@rm -f vipw$(EXEEXT)
+	$(LINK) $(vipw_LDFLAGS) $(vipw_OBJECTS) $(vipw_LDADD) $(LIBS)
+wall$(EXEEXT): $(wall_OBJECTS) $(wall_DEPENDENCIES) 
+	@rm -f wall$(EXEEXT)
+	$(LINK) $(wall_LDFLAGS) $(wall_OBJECTS) $(wall_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/agetty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checktty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chfn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chsh.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/initctl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/islocal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/last.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mesg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newgrp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selinux_utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setpwnam.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shutdown.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simpleinit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttymsg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vipw.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wall.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+	done
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(usrsbindir)" "$(DESTDIR)$(man1dir)" "$(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)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+@BUILD_LOGIN_UTILS_FALSE@@BUILD_WALL_FALSE@install-data-hook:
+@BUILD_LOGIN_UTILS_FALSE@@USE_TTY_GROUP_FALSE@install-data-hook:
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-sbinPROGRAMS clean-usrbinPROGRAMS clean-usrsbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man install-usrbinPROGRAMS \
+	install-usrsbinPROGRAMS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
+install-info: install-info-am
+
+install-man: install-man1 install-man8
+
+installcheck-am: installcheck-binPROGRAMS installcheck-sbinPROGRAMS \
+	installcheck-usrbinPROGRAMS installcheck-usrsbinPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+	uninstall-sbinPROGRAMS uninstall-usrbinPROGRAMS \
+	uninstall-usrsbinPROGRAMS
+
+uninstall-man: uninstall-man1 uninstall-man8
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-sbinPROGRAMS \
+	clean-usrbinPROGRAMS clean-usrsbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-data-hook install-exec install-exec-am \
+	install-exec-hook install-info install-info-am install-man \
+	install-man1 install-man8 install-sbinPROGRAMS install-strip \
+	install-usrbinPROGRAMS install-usrsbinPROGRAMS installcheck \
+	installcheck-am installcheck-binPROGRAMS \
+	installcheck-sbinPROGRAMS installcheck-usrbinPROGRAMS \
+	installcheck-usrsbinPROGRAMS installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-info-am uninstall-man uninstall-man1 uninstall-man8 \
+	uninstall-sbinPROGRAMS uninstall-usrbinPROGRAMS \
+	uninstall-usrsbinPROGRAMS
+
+
+@BUILD_LOGIN_UTILS_TRUE@install-data-hook::
+@BUILD_LOGIN_UTILS_TRUE@	cd $(DESTDIR)$(usrsbindir) && ln -sf vipw vigr
+
+@BUILD_WALL_TRUE@@USE_TTY_GROUP_TRUE@install-data-hook::
+@BUILD_WALL_TRUE@@USE_TTY_GROUP_TRUE@	chgrp tty $(DESTDIR)$(usrbindir)/wall
+@BUILD_WALL_TRUE@@USE_TTY_GROUP_TRUE@	chmod g+s $(DESTDIR)$(usrbindir)/wall
+
+install-exec-hook::
+	cd $(DESTDIR)$(sbindir) && ln -sf shutdown reboot
+	cd $(DESTDIR)$(sbindir) && ln -sf shutdown fastboot
+	cd $(DESTDIR)$(sbindir) && ln -sf shutdown halt
+	cd $(DESTDIR)$(sbindir) && ln -sf shutdown fasthalt
+	cd $(DESTDIR)$(sbindir) && ln -sf initctl need
+	cd $(DESTDIR)$(sbindir) && ln -sf initctl display-services
+	cd $(DESTDIR)$(sbindir) && ln -sf initctl provide
+	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 need.8
+	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 display-services.8
+	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 provide.8
+# 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 --git a/login-utils/agetty.c b/login-utils/agetty.c
index f9f33b535..d159d573c 100644
--- a/login-utils/agetty.c
+++ b/login-utils/agetty.c
@@ -604,7 +604,7 @@ update_utmp(line)
     endutent();
 
     {
-#ifdef HAVE_updwtmp
+#ifdef HAVE_UPDWTMP
 	updwtmp(_PATH_WTMP, &ut);
 #else
 	int ut_fd;
@@ -869,7 +869,7 @@ do_prompt(op, tp)
 		  case 'o':
 		   {
 		     char domainname[256];
-#ifdef HAVE_getdomainname
+#ifdef HAVE_GETDOMAINNAME
 		     getdomainname(domainname, sizeof(domainname));
 #else
 		     strcpy(domainname, "unknown_domain");
diff --git a/login-utils/checktty.c b/login-utils/checktty.c
index 8171f44d2..9c3ce46d0 100644
--- a/login-utils/checktty.c
+++ b/login-utils/checktty.c
@@ -23,33 +23,13 @@
 #include <sys/syslog.h>
 #include "nls.h"
 
-#ifdef __linux__
-#  include <sys/sysmacros.h>
-#  include <linux/major.h>
-#endif
+#include <sys/sysmacros.h>
+#include <linux/major.h>
 
 #include "pathnames.h"
 #include "login.h"
 #include "xstrncpy.h"
 
-#ifdef TESTING
-char hostaddress[4];
-char *hostname;
-
-void 
-badlogin(const char *s)
-{
-    printf("badlogin: %s\n", s);
-}
-
-void
-sleepexit(int x)
-{
-    printf("sleepexit %d\n", x);
-    exit(1);
-}
-#endif
-
 static gid_t mygroups[NGROUPS];
 static int   num_groups;
 
@@ -145,7 +125,6 @@ isapty(const char *tty)
 	    return 0;
     sprintf(devname, "/dev/%s", tty);
 
-#if defined(__linux__)
     if((stat(devname, &stb) >= 0) && S_ISCHR(stb.st_mode)) {
 	    int majordev = major(stb.st_rdev);
 
@@ -167,7 +146,6 @@ isapty(const char *tty)
 #endif
 
     }
-#endif
     return 0;
 }
 
@@ -349,11 +327,7 @@ checktty(const char *user, const char *tty, struct passwd *pwd)
     int found_match = 0;
 
     /* no /etc/usertty, default to allow access */
-#ifdef TESTING
-    if (!(f = fopen("usertty", "r"))) return;
-#else
     if (!(f = fopen(_PATH_USERTTY, "r"))) return;
-#endif
 
     if (pwd == NULL) {
 	fclose(f);
@@ -439,13 +413,3 @@ checktty(const char *user, const char *tty, struct passwd *pwd)
        on all tty's */
     free_all(); /* JDS */
 }
-
-#ifdef TESTING
-main(int argc, char *argv[]) 
-{
-    struct passwd *pw;
-
-    pw = getpwnam(argv[1]);
-    checktty(argv[1], argv[2], pw);
-}
-#endif
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 834dedfd4..638af06a7 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -40,13 +40,13 @@
 #include "nls.h"
 #include "env.h"
 
-#ifdef WITH_SELINUX
+#ifdef HAVE_LIBSELINUX
 #include <selinux/selinux.h>
 #include <selinux/av_permissions.h>
 #include "selinux_utils.h"
 #endif
 
-#if REQUIRE_PASSWORD && USE_PAM
+#if defined(REQUIRE_PASSWORD) && defined(HAVE_SECURITY_PAM_MISC_H)
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 #endif
@@ -90,7 +90,7 @@ int main (int argc, char **argv) {
     struct finfo oldf, newf;
     boolean interactive;
     int status;
-#if REQUIRE_PASSWORD && USE_PAM
+#if defined(REQUIRE_PASSWORD) && defined(HAVE_SECURITY_PAM_MISC_H)
     pam_handle_t *pamh = NULL;
     int retcode;
     struct pam_conv conv = { misc_conv, NULL };
@@ -142,7 +142,7 @@ int main (int argc, char **argv) {
        exit(1);
     }
 
-#ifdef WITH_SELINUX
+#ifdef HAVE_LIBSELINUX
     if (is_selinux_enabled()) {
       if(uid == 0) {
 	if (checkAccess(oldf.username,PASSWD__CHFN)!=0) {
@@ -172,8 +172,8 @@ int main (int argc, char **argv) {
 
     printf (_("Changing finger information for %s.\n"), oldf.username);
 
-#if REQUIRE_PASSWORD
-# if USE_PAM
+#ifdef REQUIRE_PASSWORD
+#ifdef HAVE_SECURITY_PAM_MISC_H
     if(uid != 0) {
         if (pam_start("chfn", oldf.username, &conv, &pamh)) {
 	    puts(_("Password error."));
@@ -197,7 +197,7 @@ int main (int argc, char **argv) {
         /* no need to establish a session; this isn't a session-oriented
          * activity... */
     }
-# else /* USE_PAM */
+# else /* HAVE_SECURITY_PAM_MISC_H */
     /* require password, unless root */
     if(uid != 0 && oldf.pw->pw_passwd && oldf.pw->pw_passwd[0]) {
 	char *pwdstr = getpass(_("Password: "));
@@ -207,7 +207,7 @@ int main (int argc, char **argv) {
 	    exit(1);
 	}
     }
-# endif /* USE_PAM */
+# endif /* HAVE_SECURITY_PAM_MISC_H */
 #endif /* REQUIRE_PASSWORD */
 
 
@@ -251,7 +251,7 @@ static boolean parse_argv (argc, argv, pinfo)
 	if (c == -1) break;
 	/* version?  output version and exit. */
 	if (c == 'v') {
-	    printf ("%s\n", util_linux_version);
+	    printf ("%s\n", PACKAGE_STRING);
 	    exit (0);
 	}
 	if (c == 'u') {
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index aa8e10dcd..8bd2d0bda 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -42,12 +42,12 @@
 #include "nls.h"
 #include "env.h"
 
-#if REQUIRE_PASSWORD && USE_PAM
+#if defined(REQUIRE_PASSWORD) && defined(HAVE_SECURITY_PAM_MISC_H)
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 #endif
 
-#ifdef WITH_SELINUX
+#ifdef HAVE_LIBSELINUX
 #include <selinux/selinux.h>
 #include <selinux/av_permissions.h>
 #include "selinux_utils.h"
@@ -85,7 +85,7 @@ main (int argc, char *argv[]) {
     uid_t uid;
     struct sinfo info;
     struct passwd *pw;
-#if REQUIRE_PASSWORD && USE_PAM
+#if defined(REQUIRE_PASSWORD) && defined(HAVE_SECURITY_PAM_MISC_H)
     pam_handle_t *pamh = NULL;
     int retcode;
     struct pam_conv conv = { misc_conv, NULL };
@@ -127,7 +127,7 @@ main (int argc, char *argv[]) {
        exit(1);
     }
 
-#ifdef WITH_SELINUX
+#ifdef HAVE_LIBSELINUX
     if (is_selinux_enabled()) {
       if(uid == 0) {
 	if (checkAccess(pw->pw_name,PASSWD__CHSH)!=0) {
@@ -169,8 +169,8 @@ main (int argc, char *argv[]) {
 
     printf( _("Changing shell for %s.\n"), pw->pw_name );
 
-#if REQUIRE_PASSWORD
-# if USE_PAM
+#ifdef REQUIRE_PASSWORD
+#ifdef HAVE_SECURITY_PAM_MISC_H
     if(uid != 0) {
         if (pam_start("chsh", pw->pw_name, &conv, &pamh)) {
 	    puts(_("Password error."));
@@ -194,7 +194,7 @@ main (int argc, char *argv[]) {
         /* no need to establish a session; this isn't a session-oriented
          * activity... */
     }
-# else /* USE_PAM */
+#else /* HAVE_SECURITY_PAM_MISC_H */
     /* require password, unless root */
     if(uid != 0 && pw->pw_passwd && pw->pw_passwd[0]) {
 	char *pwdstr = getpass(_("Password: "));
@@ -204,7 +204,7 @@ main (int argc, char *argv[]) {
 	    exit(1);
 	}
     }
-# endif /* USE_PAM */
+#endif /* HAVE_SECURITY_PAM_MISC_H */
 #endif /* REQUIRE_PASSWORD */
 
     if (! shell) {
@@ -253,7 +253,7 @@ parse_argv (int argc, char *argv[], struct sinfo *pinfo) {
 	case -1:
 	    break;
 	case 'v':
-	    printf ("%s\n", util_linux_version);
+	    printf ("%s\n", PACKAGE_STRING);
 	    exit (0);
 	case 'u':
 	    usage (stdout);
@@ -356,7 +356,7 @@ check_shell (char *shell) {
 	    return (-1);
 	}
     }
-#if ONLY_LISTED_SHELLS
+#ifdef ONLY_LISTED_SHELLS
     if (! get_shell_list (shell)) {
        if (!getuid())
 	  printf (_("Warning: \"%s\" is not listed in /etc/shells\n"), shell);
diff --git a/login-utils/cryptocard.c b/login-utils/cryptocard.c
deleted file mode 100644
index 44cfb55d5..000000000
--- a/login-utils/cryptocard.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* cryptocard.c - support for the CRYPTOCard
-   RB-1 Challenge-Response Token, initial code by 
-   bentson@grieg.seaslug.org (Randolph Bentson) on 3-Dec-96,
-   Hacked severely by poe@daimi.aau.dk.
-   This relies on an implementation of DES in a library, currently
-   it interfaces with the koontz-des.tar.gz implementation which
-   can be found in:
-
-      ftp://ftp.funet.fi/pub/crypt/cryptography/symmetric/des/
-
-      (Link with the fdes.o file from that distribution)
-
-   and with Eric A. Young's libdes implementation used in SSLeay. Also
-   available from the above ftp site. Link with the libdes.a library.
-
-   The sources for this code are maintained in
-
-      ftp://ftp.daimi.aau.dk/pub/linux/poe/poeigl-X.XX.tar.gz
-
-      1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
-      - added Native Language Support
-
-*/
-#ifdef CRYPTOCARD
-
-/******************** CONFIGURATION section *****************************/
-/*--------------- select ONE DES implementation ------------------------*/
-/*#define KOONTZ_DES */
-#define EAY_LIBDES
-/*--------------- define if on little endian machine (Intel x86) -------*/
-#define LITTLE_ENDIAN
-/******************** end of CONFIGURATION section **********************/
-
-#define _BSD_SOURCE 
-#define _GNU_SOURCE
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <syslog.h>
-#include <pwd.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include "nls.h"
-
-#ifdef KOONTZ_DES
-#include "../koontz-des/des.h"
-#endif /* KOONTZ_DES */
-
-#ifdef EAY_LIBDES
-#include "../libdes/des.h"
-#endif /* EAY_LIBDES */
-
-#include "cryptocard.h"
-
-static char *
-generate_challenge(void)
-{
-    static char challenge_str[30];
-    int rfd;
-    unsigned long clong;
-
-    /* create and present a challenge string */
-    if ((rfd = open("/dev/urandom", O_RDONLY)) < 0) {
-	syslog(LOG_NOTICE, _("couldn't open /dev/urandom"));
-	return NULL;
-    }
-    if (read(rfd, &clong, 4) < 4) {
-	close(rfd);
-	syslog(LOG_NOTICE, _("couldn't read random data from /dev/urandom"));
-	return NULL;
-    }
-    close(rfd);
-
-    sprintf(challenge_str,"%08lu", clong);
-    return challenge_str;
-}
-
-static char *
-get_key()
-{
-    int success = 0;
-    char keyfile[MAXPATHLEN];
-    static char key[10];
-    int rfd;
-    struct stat statbuf;
-
-    if (strlen(pwd->pw_dir) + 13 > sizeof(keyfile))
-	goto bail_out;
-    sprintf(keyfile, "%s/.cryptocard", pwd->pw_dir);
-
-    if ((rfd = open(keyfile, O_RDONLY)) < 0) {
-	syslog(LOG_NOTICE, _("can't open %s for reading"), keyfile);
-	goto bail_out;
-    }
-    if (fstat(rfd, &statbuf) < 0) {
-	syslog(LOG_NOTICE, _("can't stat(%s)"), keyfile);
-	goto close_and_bail_out;
-    }
-    if ((statbuf.st_uid != pwd->pw_uid)
-	|| ((statbuf.st_mode & S_IFMT) != S_IFREG)
-	|| (statbuf.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO))) {
-	syslog(LOG_NOTICE, _("%s doesn't have the correct filemodes"), keyfile);
-	goto close_and_bail_out;
-    }
-    
-    if (read(rfd, key, 8) < 8) {
-	syslog(LOG_NOTICE, _("can't read data from %s"), keyfile);
-	goto close_and_bail_out;
-    }
-
-    key[8] = 0;
-    success = 1;
-    
-close_and_bail_out:
-    close(rfd);
-
-bail_out:
-    if (success)
-	return key;
-    else 
-	return NULL;
-}
-
-static int
-check_response(char *challenge, char *response, char *key)
-{
-    char buf[20];
-
-#ifdef KOONTZ_DES
-    extern void des (union LR_block *);
-    extern void loadkey(char *,int);
-    extern void set_des_mode(int);
-
-    union LR_block data;
-
-    strncpy((char *)data.string, (char *)challenge, 8);
-    set_des_mode(ENCRYPT);
-    loadkey(key, NOSHIFT);
-    des(&data);
-
-    memset(key, 0, 8); /* no need for the secret key anymore, scratch it */
-
-    sprintf(buf, "%2.2X%2.2X%2.2X%2.2X",
-	    (int)(data.LR[0]) & 0xff,
-	    (int)(data.LR[0]>>8) & 0xff,
-	    (int)(data.LR[0]>>16) & 0xff,
-	    (int)(data.LR[0]>>24) & 0xff);
-#endif /* KOONTZ_DES */
-#ifdef EAY_LIBDES
-    des_cblock       res;
-    des_key_schedule ks;
-    
-    des_set_key((des_cblock *)key, ks);
-    memset(key, 0, 8);
-    des_ecb_encrypt((des_cblock *)challenge, &res, ks, DES_ENCRYPT);
-
-#ifdef LITTLE_ENDIAN
-    /* use this on Intel x86 boxes */
-    sprintf(buf, "%2.2X%2.2X%2.2X%2.2X",
-	    res[0], res[1], res[2], res[3]);
-#else /* ie. BIG_ENDIAN */
-    /* use this on big endian RISC boxes */
-    sprintf(buf, "%2.2X%2.2X%2.2X%2.2X",
-	    res[3], res[2], res[1], res[0]);
-#endif /* LITTLE_ENDIAN */
-#endif /* EAY_LIBDES */
-
-    /* return success only if ALL requirements have been met */
-    if (strncmp(buf, response, 8) == 0)
-	return 1;
-
-    return 0;
-}
-
-int
-cryptocard(void)
-{
-    char prompt[80];
-    char *challenge;
-    char *key;
-    char *response;
-
-    challenge = generate_challenge();
-    if (challenge == NULL) return 0;
-
-    if (strlen(challenge) + 13 > sizeof(prompt)) return 0;
-    sprintf(prompt, "%s Password: ", challenge);
-
-    alarm((unsigned int)timeout);  /* give user time to fiddle with card */
-    response = getpass(prompt);  /* presents challenge and gets response */
-
-    if (response == NULL) return 0;
-
-    /* This requires some explanation: As root we may not be able to
-       read the directory of the user if it is on an NFS mounted
-       filesystem. We temporarily set our effective uid to the user-uid
-       making sure that we keep root privs. in the real uid. 
-
-       A portable solution would require a fork(), but we rely on Linux
-       having the BSD setreuid() */
-
-    {
-	uid_t ruid = getuid();
-	gid_t egid = getegid();
-
-	setregid(-1, pwd->pw_gid);
-	setreuid(0, pwd->pw_uid);
-
-	/* now we can access the file */
-	/* get the (properly qualified) key */
-	key = get_key();
-
-	/* reset to root privs */
-	setuid(0); /* setreuid doesn't do it alone! */
-	setreuid(ruid, 0);
-	setregid(-1, egid);
-
-	if (key == NULL) return 0;
-    }
-
-    return check_response(challenge, response, key);
-}
-
-#endif /* CRYPTOCARD */
diff --git a/login-utils/cryptocard.h b/login-utils/cryptocard.h
deleted file mode 100644
index a967137f9..000000000
--- a/login-utils/cryptocard.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* defined in cryptocard.c */
-extern int cryptocard (void);
-
-/* defined in login.c */
-extern struct passwd *pwd;
-extern int timeout;
-
diff --git a/login-utils/last.c b/login-utils/last.c
index 6d0ce2ff6..13a3b2449 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -202,15 +202,10 @@ wtmp(void) {
 	long	delta;				/* time difference */
 	char *crmsg = NULL;
 	char *ct = NULL;
-#if USE_GETUTENT
-	struct utmp **utmplist = NULL;
-	int listlen = 0;
-#else
 	int fd;
 	struct utmp *utl;
 	struct stat st;
 	int utl_len;
-#endif
 	int listnr = 0;
 	int i;
 	
@@ -220,20 +215,6 @@ wtmp(void) {
 	(void)signal(SIGINT, onintr);
 	(void)signal(SIGQUIT, onintr);
 
-#if USE_GETUTENT
-	setutent();
-	while((bp = getutent())) {
-		if(listnr >= listlen) {
-			listlen += 10;
-			listlen *= 2; 	/* avoid quadratic behaviour */
-			utmplist = realloc(utmplist, sizeof(bp) * listlen);
-		}
-
-		utmplist[listnr] = malloc(sizeof(*bp));
-		memcpy(utmplist[listnr++], bp, sizeof(*bp));
-	}
-	endutent();
-#else
 	if ((fd = open(file,O_RDONLY)) < 0)
 		exit(1);
 	fstat(fd, &st);
@@ -243,21 +224,12 @@ wtmp(void) {
 	if (utl == NULL)
 		exit(1);
 	listnr = utl_len/sizeof(struct utmp);
-#endif
 
 	if(listnr) 
-#if USE_GETUTENT
-		ct = ctime(&utmplist[0]->ut_time);
-#else
 		ct = ctime(&utl[0].ut_time);
-#endif
 
 	for(i = listnr - 1; i >= 0; i--) {
-#if USE_GETUTENT
-		bp = utmplist[i];
-#else
 		bp = utl+i;
-#endif
 		/*
 		 * if the terminal line is '~', the machine stopped.
 		 * see utmp(5) for more info.
@@ -328,15 +300,9 @@ wtmp(void) {
 		}
 		T->logout = bp->ut_time;
 		utmpbuf.ut_time = bp->ut_time;
-#if USE_GETUTENT
-		free(bp);
-	}
-	if(utmplist) free(utmplist);
-#else
 	}
 	munmap(utl,utl_len);
 	close(fd);
-#endif
 	if(ct) printf(_("\nwtmp begins %s"), ct); 	/* ct already ends in \n */
 }
 
diff --git a/login-utils/login.c b/login-utils/login.c
index 666121240..fb3847d08 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -77,13 +77,7 @@
  * login -f name	(for pre-authenticated login: datakit, xterm, etc.)
  */
 
-/* #define TESTING */
-
-#ifdef TESTING
-#include "param.h"
-#else
 #include <sys/param.h>
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
@@ -118,22 +112,12 @@
 #include "xstrncpy.h"
 #include "nls.h"
 
-#ifdef __linux__
-#  include <sys/sysmacros.h>
-#  include <linux/major.h>
-#endif
-
-#ifdef TESTING
-#  include "utmp.h"
-#else
-#  include <utmp.h>
-#endif
+#include <sys/sysmacros.h>
+#include <linux/major.h>
 
-#ifdef SHADOW_PWD
-#  include <shadow.h>
-#endif
+#include <utmp.h>
 
-#ifdef USE_PAM
+#ifdef HAVE_SECURITY_PAM_MISC_H
 #  include <security/pam_appl.h>
 #  include <security/pam_misc.h>
 #  define PAM_MAX_LOGIN_TRIES	3
@@ -149,31 +133,13 @@
 }
 #endif
 
-#ifndef __linux__
-#  include <tzfile.h>
-#endif
 #include <lastlog.h>
 
 #define SLEEP_EXIT_TIMEOUT 5
 
-#ifdef __linux__
-#define DO_PS_FIDDLING
-#endif
-
-#ifdef DO_PS_FIDDLING
 #include "setproctitle.h"
-#endif
-
-#if 0
-/* from before we had a lastlog.h file in linux */
-struct  lastlog
-{ long ll_time;
-  char ll_line[12];
-  char ll_host[16];
-};
-#endif
 
-#ifndef USE_PAM
+#ifndef HAVE_SECURITY_PAM_MISC_H
 static void getloginname (void);
 static void checknologin (void);
 static int rootterm (char *ttyn);
@@ -183,17 +149,6 @@ static void sigint (int);
 static void motd (void);
 static void dolastlog (int quiet);
 
-#ifdef CRYPTOCARD
-#include "cryptocard.h"
-#endif
-
-#ifdef	KERBEROS
-#include <kerberos/krb.h>
-#include <sys/termios.h>
-char	realm[REALM_SZ];
-int	kerror = KSUCCESS, notickets = 1;
-#endif
-
 #ifdef USE_TTY_GROUP
 #  define TTY_MODE 0620
 #else
@@ -210,14 +165,11 @@ int	kerror = KSUCCESS, notickets = 1;
  * This bounds the time given to login.  Not a define so it can
  * be patched on machines where it's too small.
  */
-#ifndef __linux__
-int	timeout = 300;
-#else
-int     timeout = 60;		/* used in cryptocard.c */
-#endif
+int     timeout = 60;
 
-struct	passwd *pwd;		/* used in cryptocard.c */
-#if USE_PAM
+struct passwd *pwd;
+
+#ifdef HAVE_SECURITY_PAM_MISC_H
 static struct passwd pwdcopy;
 #endif
 char    hostaddress[4];		/* used in checktty.c */
@@ -227,16 +179,6 @@ static char	thishost[100];
 static int	failures = 1;
 static pid_t	pid;
 
-#ifndef __linux__
-struct	sgttyb sgttyb;
-struct	tchars tc = {
-	CINTR, CQUIT, CSTART, CSTOP, CEOT, CBRK
-};
-struct	ltchars ltc = {
-	CSUSP, CDSUSP, CRPRNT, CFLUSH, CWERASE, CLNEXT
-};
-#endif
-
 /* Nice and simple code provided by Linus Torvalds 16-Feb-93 */
 /* Nonblocking stuff by Maciej W. Rozycki, macro@ds2.pg.gda.pl, 1999.
    He writes: "Login performs open() on a tty in a blocking mode.
@@ -288,10 +230,10 @@ check_ttyname(char *ttyn) {
 	}
 }
 
+#ifdef LOGIN_CHOWN_VCS
 /* true if the filedescriptor fd is a console tty, very Linux specific */
 static int
 consoletty(int fd) {
-#ifdef __linux__
     struct stat stb;
 
     if ((fstat(fd, &stb) >= 0) 
@@ -299,11 +241,11 @@ consoletty(int fd) {
 	&& (minor(stb.st_rdev) < 64)) {
 	return 1;
     }
-#endif
     return 0;
 }
+#endif
 
-#if USE_PAM
+#ifdef HAVE_SECURITY_PAM_MISC_H
 /*
  * Log failed login attempts in _PATH_BTMP if that exists.
  * Must be called only with username the name of an actual user.
@@ -339,11 +281,11 @@ logbtmp(const char *line, const char *username, const char *hostname) {
 		if (hostaddress[0])
 			memcpy(&ut.ut_addr, hostaddress, sizeof(ut.ut_addr));
 	}
-#ifdef HAVE_updwtmp		/* bad luck for ancient systems */
+#if HAVE_UPDWTMP		/* bad luck for ancient systems */
 	updwtmp(_PATH_BTMP, &ut);
 #endif
 }
-#endif	/* USE_PAM */
+#endif	/* HAVE_SECURITY_PAM_MISC_H */
 
 int
 main(int argc, char **argv)
@@ -361,7 +303,7 @@ main(int argc, char **argv)
     char *childArgv[10];
     char *buff;
     int childArgc = 0;
-#ifdef USE_PAM
+#ifdef HAVE_SECURITY_PAM_MISC_H
     int retcode;
     pam_handle_t *pamh = NULL;
     struct pam_conv conv = { misc_conv, NULL };
@@ -369,7 +311,7 @@ main(int argc, char **argv)
 #else
     char *salt, *pp;
 #endif
-#ifdef CHOWNVCS
+#ifdef LOGIN_CHOWN_VCS
     char vcsn[20], vcsan[20];
 #endif
 
@@ -385,12 +327,7 @@ main(int argc, char **argv)
     textdomain(PACKAGE);
     
     setpriority(PRIO_PROCESS, 0, 0);
-#ifdef HAVE_QUOTA
-    quota(Q_SETUID, 0, 0, 0);
-#endif
-#ifdef DO_PS_FIDDLING
     initproctitle(argc, argv);
-#endif
     
     /*
      * -p is used by getty to tell login not to destroy the environment
@@ -484,7 +421,7 @@ main(int argc, char **argv)
 	tty_number = p;
     }
 
-#ifdef CHOWNVCS
+#ifdef LOGIN_CHOWN_VCS
     /* find names of Virtual Console devices, for later mode change */
     snprintf(vcsn, sizeof(vcsn), "/dev/vcs%s", tty_number);
     snprintf(vcsan, sizeof(vcsan), "/dev/vcsa%s", tty_number);
@@ -526,7 +463,7 @@ main(int argc, char **argv)
     fprintf(stderr,"\033(K");
 #endif
 
-#ifdef USE_PAM
+#ifdef HAVE_SECURITY_PAM_MISC_H
     /*
      * username is initialized to NULL
      * and if specified on the command line it is set.
@@ -689,7 +626,7 @@ main(int argc, char **argv)
     retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED);
     PAM_FAIL_CHECK;
 
-#else /* ! USE_PAM */
+#else /* ! HAVE_SECURITY_PAM_MISC_H */
 
     for (cnt = 0;; ask = 1) {
 
@@ -823,33 +760,11 @@ main(int argc, char **argv)
 	    sleep((unsigned int)((cnt - 3) * 5));
 	}
     }
-#endif /* !USE_PAM */
+#endif /* !HAVE_SECURITY_PAM_MISC_H */
     
     /* committed to login -- turn off timeout */
     alarm((unsigned int)0);
     
-#ifdef HAVE_QUOTA
-    if (quota(Q_SETUID, pwd->pw_uid, 0, 0) < 0 && errno != EINVAL) {
-	switch(errno) {
-	  case EUSERS:
-	    fprintf(stderr,
-		    _("Too many users logged on already.\nTry again later.\n"));
-	    break;
-	  case EPROCLIM:
-	    fprintf(stderr,
-		    _("You have too many processes running.\n"));
-	    break;
-	  default:
-	    perror("quota (Q_SETUID)");
-	}
-	sleepexit(0);		/* %% */
-    }
-#endif
-    
-    /* paranoia... */
-#ifdef SHADOW_PWD
-    endspent();
-#endif
     endpwent();
     
     /* This requires some explanation: As root we may not be able to
@@ -943,7 +858,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
 	pututline(&ut);
 	endutent();
 
-#ifdef HAVE_updwtmp
+#if HAVE_UPDWTMP
 	updwtmp(_PATH_WTMP, &ut);
 #else
 #if 0
@@ -982,7 +897,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
 	  (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid);
     chmod(ttyn, TTY_MODE);
 
-#ifdef CHOWNVCS
+#ifdef LOGIN_CHOWN_VCS
     /* if tty is one of the VC's then change owner and mode of the 
        special /dev/vcs devices as well */
     if (consoletty(0)) {
@@ -995,10 +910,6 @@ Michael Riepe <michael@stud.uni-hannover.de>
 
     setgid(pwd->pw_gid);
     
-#ifdef HAVE_QUOTA
-    quota(Q_DOWARN, pwd->pw_uid, (dev_t)-1, 0);
-#endif
-    
     if (*pwd->pw_shell == '\0')
       pwd->pw_shell = _PATH_BSHELL;
     
@@ -1041,7 +952,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
        */
     setenv("LOGNAME", pwd->pw_name, 1);
 
-#ifdef USE_PAM
+#ifdef HAVE_SECURITY_PAM_MISC_H
     {
 	int i;
 	char ** env = pam_getenvlist(pamh);
@@ -1055,9 +966,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
     }
 #endif
 
-#ifdef DO_PS_FIDDLING
     setproctitle("login", username);
-#endif
     
     if (!strncmp(tty_name, "ttyS", 4))
       syslog(LOG_INFO, _("DIALUP AT %s BY %s"), tty_name, pwd->pw_name);
@@ -1083,7 +992,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
     if (!quietlog) {
 	motd();
 
-#ifdef DO_STAT_MAIL
+#ifdef LOGIN_STAT_MAIL
 	/*
 	 * This turns out to be a bad idea: when the mail spool
 	 * is NFS mounted, and the NFS connection hangs, the
@@ -1109,7 +1018,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
     signal(SIGQUIT, SIG_DFL);
     signal(SIGTSTP, SIG_IGN);
 
-#ifdef USE_PAM
+#ifdef HAVE_SECURITY_PAM_MISC_H
     /*
      * We must fork before setuid() because we need to call
      * pam_close_session() as root.
@@ -1215,7 +1124,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
     exit(0);
 }
 
-#ifndef USE_PAM
+#ifndef HAVE_SECURITY_PAM_MISC_H
 static void
 getloginname(void) {
     int ch, cnt, cnt2;
@@ -1293,7 +1202,7 @@ timedout(int sig) {
 	timedout2(0);
 }
 
-#ifndef USE_PAM
+#ifndef HAVE_SECURITY_PAM_MISC_H
 int
 rootterm(char * ttyn)
 { 
@@ -1323,7 +1232,7 @@ rootterm(char * ttyn)
   	}
     }
 }
-#endif /* !USE_PAM */
+#endif /* !HAVE_SECURITY_PAM_MISC_H */
 
 jmp_buf motdinterrupt;
 
@@ -1348,7 +1257,7 @@ sigint(int sig) {
     longjmp(motdinterrupt, 1);
 }
 
-#ifndef USE_PAM				/* PAM takes care of this */
+#ifndef HAVE_SECURITY_PAM_MISC_H			/* PAM takes care of this */
 void
 checknologin(void) {
     int fd, nchars;
diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c
index 89db17548..a46f9ee53 100644
--- a/login-utils/newgrp.c
+++ b/login-utils/newgrp.c
@@ -33,6 +33,7 @@ allow_setgid(struct passwd *pe, struct group *ge)
     int notfound = 1;
 	
     if (getuid() == 0) return TRUE;	/* root may do anything */
+    if (ge->gr_gid == pe->pw_gid) return TRUE; /* You can switch back to your default group */
 
     look = ge->gr_mem;
     while (*look && (notfound = strcmp(*look++,pe->pw_name)));
diff --git a/login-utils/passwd.1 b/login-utils/passwd.1
deleted file mode 100644
index b6a25a3f6..000000000
--- a/login-utils/passwd.1
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu)
-.\" May be distributed under the GNU General Public License
-.TH PASSWD 1 "11 November 1996" "Util-linux 2.6" "Linux Programmer's Manual"
-.SH NAME
-passwd \- change password
-.SH SYNOPSIS
-.BR "passwd"
-.RB [ " \-o " ]
-.RB [ " \-q " ]
-.RB [ " \-v " ]
-.RI [ " name " [ " password " ]]
-.br
-.BR "passwd \-f "
-.RI [ " arguments to chfn " ]
-.br
-.BR "passwd \-s "
-.RI [ " arguments to chsh " ]
-
-.SH DESCRIPTION
-Without arguments
-.B passwd
-will change the password for the current user. First the user is asked for
-the old password, then prompted twice for the new password in order to
-catch typing errors.
-
-The one and two argument forms may only be used by the superuser. Using the
-one argument form, the superuser may change the password for that
-.IR user .
-The superuser is not asked for the users old password, but the rules 
-for proper passwords are also applied unless the
-.B "\-o"
-option is used. The superuser may have legitimate
-reasons to choose a non-conformant password.
-
-The two argument form gives the 
-.IR user " the " password
-stated as the second argument. Note that this password will
-be visible to people doing `ps' or so.  Avoid this form.
-
-Giving an empty string as the second argument erases the password for the
-user, but only in combination with the
-.B "\-o"
-option.
-
-Password changes may get logged using the 
-.BR syslog (3)
-facility, depending on compile-time defines (on by default).
-If so, every change will
-be logged at a low level as auth.notice, except for changing the root
-password with will be logged with auth.warning.
-
-.SH OPTIONS
-.TP
-.B "\-f, \-\-fullname"
-Change the user's full name (the GECOS field of the passwd entry).
-Invokes /usr/bin/chfn with the non-option command line arguments.
-.TP
-.B "\-o, \-\-force"
-Turn off simplicity checks on the new password. This option may only
-be used by the super user. This is intend to allow simple initial
-passwords given by the superuser.
-.TP
-.B "\-s, \-\-shell"
-Change the user's shell by invoking /usr/bin/chsh with the non-option
-command line arguments.
-.TP
-.B "\-q, \-\-quiet, \-\-silent"
-In this mode passwd won't tell that the passwd get's changed.
-.TP
-.B "\-v, \-V, \-\-version"
-Prints version information and exits.
-
-.SH PASSWORD RULES
-The new password must fulfill these rules:
-.TP
-o
-be at least six characters long;
-
-.TP
-o
-must not be equal to the old password;
-
-.TP
-o
-must contain characters out of at least two of the following classes:
-upper and lower case letters, digits and non alphanumeric characters;
-
-.TP
-o
-must not match neither the username nor any word of the realname,
-neither in normal nor in reverse order, neither at the beginning nor
-at the end.
-.SH BUGS
-If you change your mind there is no escaping from this program.
-It will insist on a new password until killed from another terminal.
-(This is caused by a bug in getpass(3): it ignores signals.)
-.SH FILES
-.TP
-.I /etc/passwd
-The password file.
-.SH "SEE ALSO"
-.BR chsh (1),
-.BR chfn (1),
-.BR syslog (3),
-.BR syslog.conf (5),
-.BR passwd (8).
-.SH AUTHOR
-Peter Orbaek (poe@daimi.aau.dk).
-.br
-Martin Schulze (joey@infodrom.north.de) with extensive rewriting and
-improving done.
diff --git a/login-utils/passwd.c b/login-utils/passwd.c
deleted file mode 100644
index eb3303899..000000000
--- a/login-utils/passwd.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/* 
- * passwd.c - change password on an account
- *
- * Initially written for Linux by Peter Orbaek <poe@daimi.aau.dk>
- * Currently maintained at ftp://ftp.daimi.aau.dk/pub/linux/poe/
- *
- * Hacked by Alvaro Martinez Echevarria, alvaro@enano.etsit.upm.es,
- * to allow peaceful coexistence with yp. Nov 94.
- *
- * Hacked to allow root to set passwd from command line.
- * by Arpad Magossanyi (mag@tas.vein.hu)
- */
-
-/*
- * Sun Oct 15 13:18:34 1995  Martin Schulze  <joey@finlandia.infodrom.north.de>
- *
- *	I have completely rewritten the whole argument handling (what?)
- *	to support two things. First I wanted "passwd $user $pw" to
-
-        (a very bad idea; command lines are visible to people doing ps
-	or running a background job that just collects all command lines)
-
- *	work and second I wanted simplicity checks to be done for
- *	root, too. Only root can turn this off using the -f
- *	switch. Okay, I started with this to support -V version
- *	information, but one thing comes to the next. *sigh*
- *	In a later step perhaps we'll be able to support shadow
- *	passwords. (?)
- *
- *	I have also included a DEBUG mode (-DDEBUG) to test the
- *	argument handling _without_ any write attempt to
- *	/etc/passwd.
- *
- *	If you're paranoid about security on your system, you may want
- *	to add -DLOGALL to CFLAGS. This will turn on additional syslog
- *	logging of every password change. (user changes are logged as
- *	auth.notice, but changing root's password is logged as
- *	auth.warning. (Of course, the password itself is not logged.)
- */
-
- /* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
-  * - added Native Language Support
-  * Sun Mar 21 1999 - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-  * - fixed strerr(errno) in gettext calls
-  */
-
-/*
- * Usage: passwd [username [password]]
- * Only root may use the one and two argument forms. 
- */
- 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <termios.h>
-#include <getopt.h>
-#include <malloc.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <time.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/resource.h>
-#include <stdlib.h>
-#include "my_crypt.h"
-#include "setpwnam.h"
-#include "islocal.h"
-#include "xstrncpy.h"
-#include "nls.h"
-#include "env.h"
-
-#ifndef _PATH_CHFN
-# define _PATH_CHFN "/usr/bin/chfn"
-# define _PATH_CHSH "/usr/bin/chsh"
-#endif
-
-#define LOGALL
-
-#ifdef LOGALL
-#include <syslog.h>
-#endif /* LOGALL */
-
-#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
-#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
-
-static void
-pexit(char *str, ...)
-{
-    va_list vlst;
-
-    va_start(vlst, str);
-    vfprintf(stderr, str, vlst);
-    fprintf(stderr, ": ");
-    perror("");
-    va_end(vlst);
-    exit(1);
-}
-
-/* 
- * Do various checks for stupid passwords here... 
- *
- * This would probably be the best place for checking against 
- * dictionaries. :-)
- */
-static int
-check_passwd_string(char *passwd, char *string) {
-    int r;
-    char *p, *q;
-
-    r = 0;
-    /* test for string at the beginning of passwd */
-    for (p = passwd, q = string; *q && *p; q++, p++) {
-	if(tolower(*p) != tolower(*q)) {
-	    r++;
-	    break;
-	}
-    }
-	
-    /* test for reverse string at the beginning of passwd */
-    for (p = passwd, q = string + strlen(string)-1;
-	*p && q >= string; p++, q--) {
-	if(tolower(*p) != tolower(*q)) {
-	    r++;
-	    break;
-	}
-    }
-
-    /* test for string at the end of passwd */
-    for (p = passwd + strlen(passwd)-1, q = string + strlen(string)-1;
-	 q >= string && p >= passwd; q--, p--) {
-	if(tolower(*p) != tolower(*q)) {
-	    r++;
-	    break;
-	}
-    }
-	
-    /* test for reverse string at the beginning of passwd */
-    for (p = passwd + strlen(passwd)-1, q = string;
-	p >= passwd && *q; p--, q++) {
-	if(tolower(*p) != tolower(*q)) {
-	    r++;
-	    break;
-	}
-    }
-
-    if (r != 4) {
-	return 0;
-    }
-    return 1;
-}
-	
-static int
-check_passwd(char *passwd, char *oldpasswd, char *user, char *gecos) {
-    int ucase, lcase, digit, other;
-    char *c, *g, *p;
-
-    if ( (strlen(passwd) < 6) ) {
-	printf(_("The password must have at least 6 characters, try again.\n"));
-	return 0;
-    }
-	
-    other = digit = ucase = lcase = 0;
-    for (p = passwd; *p; p++) {
-	ucase = ucase || isupper(*p);
-	lcase = lcase || islower(*p);
-	digit = digit || isdigit(*p);
-	other = other || !isalnum(*p);
-    }
-	
-    if ( (other + digit + ucase + lcase) < 2) {
-	printf(_("The password must contain characters out of two of "
-		 "the following\n"
-		 "classes:  upper and lower case letters, digits and "
-		 "non alphanumeric\n"
-		 "characters. See passwd(1) for more information.\n"));
-	return 0;
-    }
-	
-    if ( oldpasswd[0] && !strncmp(oldpasswd, crypt(passwd, oldpasswd), 13) ) {
-	printf(_("You cannot reuse the old password.\n"));
-	return 0;
-    }
-	
-    if ( !check_passwd_string(passwd, user) ) {
-	printf(_("Please don't use something like your username as password!\n"));
-	return 0;
-    }
-
-    /* check against realname */
-    if ( (c = index(gecos, ',')) ) {
-	if ( c-gecos && (g = (char *)malloc (c-gecos+1)) ) {
-	    strncpy (g, gecos, c-gecos);
-	    g[c-gecos] = 0;
-	    while ( (c=rindex(g, ' ')) ) {
-		if ( !check_passwd_string(passwd, c+1) ) {
-		    printf(_("Please don't use something like your realname as password!\n"));
-		    free (g);
-		    return 0;
-		}
-		*c = '\0';
-	    } /* while */
-	    if ( !check_passwd_string(passwd, g) ) {
-		printf(_("Please don't use something like your realname as password!\n"));
-		free (g);
-		return 0;
-	    }
-	    free (g);
-	} /* if malloc */
-    }
-
-    /*
-     * if ( !check_password_dict(passwd) ) ...
-     */
-
-    return 1; /* fine */
-}
-
-#if 0
-static void
-usage(void) {
-    printf (_("Usage: passwd [username [password]]\n"));
-    printf(_("Only root may use the one and two argument forms.\n"));
-}
-#endif
-
-int
-main(int argc, char *argv[]) {
-    struct passwd *pe;
-    uid_t gotuid = getuid();
-    char *pwdstr = NULL, *cryptstr, *oldstr;
-    char pwdstr1[10];
-    char *user;
-    time_t tm;
-    char salt[2];
-    int force_passwd = 0;
-    int silent = 0;
-    int c;
-    int opt_index;
-    int fullname = 0, shell = 0;
-    static const struct option long_options[] =
-      {
-	{"fullname", no_argument, 0, 'f'},
-	{"shell", no_argument, 0, 's'},
-	{"force", no_argument, 0, 'o'},
-	{"quiet", no_argument, 0, 'q'},
-	{"silent", no_argument, 0, 'q'},
-	{"version", no_argument, 0, 'v'},
-	{0, 0, 0, 0}
-	};
-
-    sanitize_env();
-    setlocale(LC_ALL, "");
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    textdomain(PACKAGE);
-
-    optind = 0;
-    while ((c = getopt_long(argc, argv, "foqsvV",
-			    long_options, &opt_index)) != -1) {
-	switch (c) {
-	case 'f':
-	    fullname = 1;
-	    break;
-	case 's':
-	    shell = 1;
-	    break;
-	case 'o':
-	    force_passwd = 1;
-	    break;
-	case 'q':
-	    silent = 1;
-	    break;
-	case 'V':
-	case 'v':
-	    printf("%s\n", util_linux_version);
-	    exit(0);
-	default:
-	    fprintf(stderr, _("Usage: passwd [-foqsvV] [user [password]]\n"));
-	    exit(1);
-	} /* switch (c) */
-    } /* while */
-
-    if (fullname || shell) {
-	char *args[100];
-	int i, j, errsv;
-
-	setuid(getuid()); /* drop special privs. */
-	if (fullname)
-	  args[0] = _PATH_CHFN;
-	else
-	  args[0] = _PATH_CHSH;
-
-	for (i = optind, j = 1; (i < argc) && (j < 99); i++, j++)
-	  args[j] = argv[i];
-
-	args[j] = NULL;
-	execv(args[0], args);
-	errsv = errno;
-	fprintf(stderr, _("Can't exec %s: %s\n"), args[0], strerror(errsv));
-	exit(1);
-    }
-    
-    switch (argc - optind) {
-    case 0:
-	/* Why use getlogin()? Some systems allow having several
-	   usernames with the same uid, especially several root accounts.
-	   One changes the password for the username, not the uid. */
-	if ( !(user = getlogin()) || !*user ) {
-	    if ( !(pe = getpwuid( getuid() )) ) {
-		pexit(_("Cannot find login name"));
-	    } else
-		user = pe->pw_name;
-	}
-	break;
-    case 1:
-	if(gotuid) {
-	    printf(_("Only root can change the password for others.\n"));
-	    exit (1);
-	} else
-	    user = argv[optind];
-	break;
-    case 2:
-	if(gotuid) {
-	    printf(_("Only root can change the password for others.\n"));
-	    exit(1);
-	} else {
-	    user = argv[optind];
-	    pwdstr = argv[optind+1];
-	}
-	break;
-    default:
-	printf(_("Too many arguments.\n"));
-	exit (1);
-    } /* switch */
-
-    if(!(pe = getpwnam(user))) {
-	pexit(_("Can't find username anywhere. Is `%s' really a user?"), user);
-    }
-    
-    if (!(is_local(user))) {
-	puts(_("Sorry, I can only change local passwords. Use yppasswd instead."));
-	exit(1);
-    }
-    
-    /* if somebody got into changing utmp... */
-    if(gotuid && gotuid != pe->pw_uid) {
-	puts(_("UID and username does not match, imposter!"));
-	exit(1);
-    }
-    
-    if ( !silent )
-	printf( _("Changing password for %s\n"), user );
-    
-    if ( (gotuid && pe->pw_passwd && pe->pw_passwd[0]) 
-	|| (!gotuid && !strcmp(user,"root")) ) {
-	oldstr = getpass(_("Enter old password: "));
-	if(strncmp(pe->pw_passwd, crypt(oldstr, pe->pw_passwd), 13)) {
-	    puts(_("Illegal password, imposter."));
-	    exit(1);
-	}
-    }
-
-    if ( pwdstr ) {   /* already set on command line */
-	if ( !force_passwd && !check_passwd(pwdstr, pe->pw_passwd, user, pe->pw_gecos) )
-	    exit (1);
-    } else {
-	/* password not set on command line by root, ask for it ... */
-	
-      redo_it:
-	pwdstr = getpass(_("Enter new password: "));
-	if (pwdstr[0] == '\0') {
-	    puts(_("Password not changed."));
-	    exit(1);
-	}
-
-	if ( (gotuid || (!gotuid && !force_passwd))
-	     && !check_passwd(pwdstr, pe->pw_passwd, user, pe->pw_gecos) ) 
-	    goto redo_it;
-	
-	xstrncpy(pwdstr1, pwdstr, sizeof(pwdstr1));
-	pwdstr = getpass(_("Re-type new password: "));
-	
-	if(strncmp(pwdstr, pwdstr1, 8)) {
-	    puts(_("You misspelled it. Password not changed."));
-	    exit(1);
-	}
-    } /* pwdstr i.e. password set on command line */
-    
-    time(&tm); tm ^= getpid();
-    salt[0] = bin_to_ascii(tm & 0x3f);
-    salt[1] = bin_to_ascii((tm >> 6) & 0x3f);
-    cryptstr = crypt(pwdstr, salt);
-
-    if (pwdstr[0] == 0) cryptstr = "";
-
-#ifdef LOGALL
-    openlog("passwd", 0, LOG_AUTH);
-    if (gotuid)
-	syslog(LOG_NOTICE,_("password changed, user %s"),user);
-    else {
-	if ( !strcmp(user, "root") )
-	    syslog(LOG_WARNING,_("ROOT PASSWORD CHANGED"));
-	else
-	    syslog(LOG_NOTICE,_("password changed by root, user %s"),user);
-    }
-    closelog();
-#endif /* LOGALL */
-
-    pe->pw_passwd = cryptstr;
-#ifdef DEBUG
-    printf (_("calling setpwnam to set password.\n"));
-#else
-    if (setpwnam( pe ) < 0) {
-       perror( "setpwnam" );
-       printf( _("Password *NOT* changed.  Try again later.\n" ));
-       exit( 1 );
-    }
-#endif
-
-    if ( !silent )
-	printf(_("Password changed.\n"));	
-    exit(0);
-}
diff --git a/login-utils/selinux_utils.c b/login-utils/selinux_utils.c
index 3711a632c..e21b8e1df 100644
--- a/login-utils/selinux_utils.c
+++ b/login-utils/selinux_utils.c
@@ -1,6 +1,6 @@
-#ifdef WITH_SELINUX
 #include <sys/types.h>
 #include <stdio.h>
+#include <string.h>
 #include <selinux/selinux.h>
 #include <selinux/flask.h>
 #include <selinux/av_permissions.h>
@@ -52,4 +52,3 @@ int setupDefaultContext(char *orig_file) {
   }
   return 0;
 }
-#endif
diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index 22f87428e..cc41b86b1 100644
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -67,7 +67,7 @@ static char version_string[] = "vipw 1.4";
 #include "xstrncpy.h"
 #include "nls.h"
 
-#ifdef WITH_SELINUX
+#ifdef HAVE_LIBSELINUX
 #include <selinux/selinux.h>
 #endif
 
@@ -194,7 +194,7 @@ pw_unlock(void) {
 	unlink(tmp);
 	link(orig_file, tmp);
 
-#ifdef WITH_SELINUX
+#ifdef HAVE_LIBSELINUX
 	if (is_selinux_enabled()) {
 	  security_context_t passwd_context=NULL;
 	  int ret=0;
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 000000000..ec18e0475
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1,3 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+EXTRA_DIST = glibc2.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4
diff --git a/m4/codeset.m4 b/m4/codeset.m4
new file mode 100644
index 000000000..a6e67ec49
--- /dev/null
+++ b/m4/codeset.m4
@@ -0,0 +1,21 @@
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-2002 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_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
new file mode 100644
index 000000000..624a80785
--- /dev/null
+++ b/m4/gettext.m4
@@ -0,0 +1,549 @@
+# gettext.m4 serial 37 (gettext-0.14.4)
+dnl Copyright (C) 1995-2005 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.
+
+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([$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], [no], [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+
+  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 test "$gt_cv_func_gnugettext_libc" != "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.
+  AM_NLS
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  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.
+
+        dnl Add a version number to the cache macros.
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
+        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
+        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
+
+        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+         [AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#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
+], [])[extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            gt_cv_func_gnugettext_libc=yes,
+            gt_cv_func_gnugettext_libc=no)])
+
+        if test "$gt_cv_func_gnugettext_libc" != "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_cv_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>
+]ifelse([$2], [need-formatstring-macros],
+[#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
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              gt_cv_func_gnugettext_libintl=yes,
+              gt_cv_func_gnugettext_libintl=no)
+            dnl Now see whether libintl exists and depends on libiconv.
+            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#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
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+                [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                gt_cv_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 test "$gt_cv_func_gnugettext_libc" = "yes" \
+           || { test "$gt_cv_func_gnugettext_libintl" = "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"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+        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 test "$gt_cv_func_gnugettext_libintl" = "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 test "$gt_cv_func_gnugettext_libintl" = "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 Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([gt_GLIBC2])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([AC_ISC_POSIX])dnl
+  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([AC_C_CONST])dnl
+  AC_REQUIRE([bh_C_SIGNED])dnl
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_OFF_T])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([gl_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+  AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
+  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+__fsetlocking])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
+
+  AM_ICONV
+  AM_LANGINFO_CODESET
+  if test $ac_cv_header_locale_h = yes; then
+    gt_LC_MESSAGES
+  fi
+
+  if test -n "$INTL_MACOSX_LIBS"; then
+    CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+  fi
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
+])
+
+
+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_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     AC_TRY_LINK([#include <CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     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_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     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])
+])
+
+
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
new file mode 100644
index 000000000..e8f5bfe6e
--- /dev/null
+++ b/m4/glibc2.m4
@@ -0,0 +1,30 @@
+# glibc2.m4 serial 1
+dnl Copyright (C) 2000-2002, 2004 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.
+
+# Test for the GNU C Library, version 2.0 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gt_GLIBC2],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
+      ac_cv_gnu_library_2,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2=yes,
+	ac_cv_gnu_library_2=no)
+      ]
+    )
+    AC_SUBST(GLIBC2)
+    GLIBC2="$ac_cv_gnu_library_2"
+  ]
+)
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
new file mode 100644
index 000000000..d95fd9861
--- /dev/null
+++ b/m4/glibc21.m4
@@ -0,0 +1,30 @@
+# glibc21.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004 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.
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gl_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff --git a/m4/iconv.m4 b/m4/iconv.m4
new file mode 100644
index 000000000..654c41589
--- /dev/null
+++ b/m4/iconv.m4
@@ -0,0 +1,101 @@
+# iconv.m4 serial AM4 (gettext-0.11.3)
+dnl Copyright (C) 2000-2002 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).
+
+  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_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+  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([$]{ac_t:-
+         }[$]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 --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
new file mode 100644
index 000000000..b8d78176a
--- /dev/null
+++ b/m4/intdiv0.m4
@@ -0,0 +1,70 @@
+# intdiv0.m4 serial 1 (gettext-0.11.3)
+dnl Copyright (C) 2002 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([gt_INTDIV0],
+[
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+    gt_cv_int_divbyzero_sigfpe,
+    [
+      AC_TRY_RUN([
+#include <stdlib.h>
+#include <signal.h>
+
+static void
+#ifdef __cplusplus
+sigfpe_handler (int sig)
+#else
+sigfpe_handler (sig) int sig;
+#endif
+{
+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
+  exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+  signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+  signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL.  */
+#if defined (__sparc__) && defined (__linux__)
+  signal (SIGILL, sigfpe_handler);
+#endif
+
+  z = x / y;
+  nan = y / y;
+  exit (1);
+}
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
+        [
+          # Guess based on the CPU.
+          case "$host_cpu" in
+            alpha* | i[34567]86 | m68k | s390*)
+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
+            *)
+              gt_cv_int_divbyzero_sigfpe="guessing no";;
+          esac
+        ])
+    ])
+  case "$gt_cv_int_divbyzero_sigfpe" in
+    *yes) value=1;;
+    *) value=0;;
+  esac
+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+    [Define if integer division by zero raises signal SIGFPE.])
+])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
new file mode 100644
index 000000000..d99c999fd
--- /dev/null
+++ b/m4/intmax.m4
@@ -0,0 +1,30 @@
+# intmax.m4 serial 2 (gettext-0.14.2)
+dnl Copyright (C) 2002-2005 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 Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
+    [AC_TRY_COMPILE([
+#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+  if test $gt_cv_c_intmax_t = yes; then
+    AC_DEFINE(HAVE_INTMAX_T, 1,
+      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
new file mode 100644
index 000000000..4d56a9ad3
--- /dev/null
+++ b/m4/inttypes-pri.m4
@@ -0,0 +1,30 @@
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 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.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values.  This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+      gt_cv_inttypes_pri_broken,
+      [
+        AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+      ])
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+  fi
+])
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
new file mode 100644
index 000000000..779bcea05
--- /dev/null
+++ b/m4/inttypes.m4
@@ -0,0 +1,25 @@
+# inttypes.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 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 Paul Eggert.
+
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+  [
+    AC_TRY_COMPILE(
+      [#include <sys/types.h>
+#include <inttypes.h>],
+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+  ])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+  fi
+])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
new file mode 100644
index 000000000..a5d075d96
--- /dev/null
+++ b/m4/inttypes_h.m4
@@ -0,0 +1,26 @@
+# inttypes_h.m4 serial 6
+dnl Copyright (C) 1997-2004 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 Paul Eggert.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    gl_cv_header_inttypes_h=yes,
+    gl_cv_header_inttypes_h=no)])
+  if test $gl_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
+      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
diff --git a/m4/isc-posix.m4 b/m4/isc-posix.m4
new file mode 100644
index 000000000..74dc8f26d
--- /dev/null
+++ b/m4/isc-posix.m4
@@ -0,0 +1,24 @@
+# isc-posix.m4 serial 2 (gettext-0.11.2)
+dnl Copyright (C) 1995-2002 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.
+
+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
+
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+  [
+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+  ]
+)
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
new file mode 100644
index 000000000..19aa77e4f
--- /dev/null
+++ b/m4/lcmessage.m4
@@ -0,0 +1,30 @@
+# lcmessage.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1995-2002, 2004-2005 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.
+
+# Check whether LC_MESSAGES is available in <locale.h>.
+
+AC_DEFUN([gt_LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
+  if test $gt_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
new file mode 100644
index 000000000..96c4e2c33
--- /dev/null
+++ b/m4/lib-ld.m4
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 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 --git a/m4/lib-link.m4 b/m4/lib-link.m4
new file mode 100644
index 000000000..ea0b0c4ea
--- /dev/null
+++ b/m4/lib-link.m4
@@ -0,0 +1,553 @@
+# lib-link.m4 serial 6 (gettext-0.14.3)
+dnl Copyright (C) 2001-2005 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.50)
+
+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.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([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"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  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
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+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. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl 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.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([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"
+    LIBS="$LIBS $LIB[]NAME"
+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    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 $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=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, 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"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  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_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.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  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$1-prefix],
+[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib$1-prefix     don't search for lib$1 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/lib"
+      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=
+  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=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+              found_dir="$additional_libdir"
+              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              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//'`
+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                    found_dir="$dir"
+                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    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/lib"; 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 "$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 "$hardcode_libdir_flag_spec" && test "$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 "$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 $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
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+                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/lib"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/lib"; 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 "$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:+$hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$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=\"$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
+])
+
+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
+])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
new file mode 100644
index 000000000..0d895ca63
--- /dev/null
+++ b/m4/lib-prefix.m4
@@ -0,0 +1,153 @@
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 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_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/lib"
+      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/lib"; 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/lib"; 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"
+])
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
new file mode 100644
index 000000000..40cd7ce02
--- /dev/null
+++ b/m4/longdouble.m4
@@ -0,0 +1,28 @@
+# longdouble.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 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 Test whether the compiler supports the 'long double' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
+[
+  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+    [if test "$GCC" = yes; then
+       gt_cv_c_long_double=yes
+     else
+       AC_TRY_COMPILE([
+         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+         long double foo = 0.0;
+         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+         ], ,
+         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+     fi])
+  if test $gt_cv_c_long_double = yes; then
+    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+  fi
+])
diff --git a/m4/longlong.m4 b/m4/longlong.m4
new file mode 100644
index 000000000..7b399e012
--- /dev/null
+++ b/m4/longlong.m4
@@ -0,0 +1,23 @@
+# longlong.m4 serial 5
+dnl Copyright (C) 1999-2004 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 Paul Eggert.
+
+# Define HAVE_LONG_LONG if 'long long' works.
+
+AC_DEFUN([gl_AC_TYPE_LONG_LONG],
+[
+  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+    [long long llmax = (long long) -1;
+     return ll << i | ll >> i | llmax / ll | llmax % ll;],
+    ac_cv_type_long_long=yes,
+    ac_cv_type_long_long=no)])
+  if test $ac_cv_type_long_long = yes; then
+    AC_DEFINE(HAVE_LONG_LONG, 1,
+      [Define if you have the 'long long' type.])
+  fi
+])
diff --git a/m4/nls.m4 b/m4/nls.m4
new file mode 100644
index 000000000..2082c3b24
--- /dev/null
+++ b/m4/nls.m4
@@ -0,0 +1,51 @@
+# nls.m4 serial 2 (gettext-0.14.3)
+dnl Copyright (C) 1995-2003, 2005 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)
+
+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)
+])
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+  dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+  dnl Try to locate it.
+  MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+  AC_SUBST(MKINSTALLDIRS)
+])
diff --git a/m4/po.m4 b/m4/po.m4
new file mode 100644
index 000000000..f2795eea0
--- /dev/null
+++ b/m4/po.m4
@@ -0,0 +1,429 @@
+# po.m4 serial 7 (gettext-0.14.3)
+dnl Copyright (C) 1995-2005 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_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AM_NLS])dnl
+
+  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 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 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 This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU msgfmt.
+  if test "$GMSGFMT" != ":"; then
+    dnl If it is no GNU msgfmt we define it as : so that the
+    dnl Makefiles still can work.
+    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+      AC_MSG_RESULT(
+        [found $GMSGFMT program is not GNU msgfmt; ignore it])
+      GMSGFMT=":"
+    fi
+  fi
+
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU xgettext.
+  if test "$XGETTEXT" != ":"; then
+    dnl If it is no GNU xgettext we define it as : so that the
+    dnl Makefiles still can work.
+    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+       (if $XGETTEXT --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
+      : ;
+    else
+      AC_MSG_RESULT(
+        [found xgettext program is not GNU xgettext; ignore it])
+      XGETTEXT=":"
+    fi
+    dnl Remove leftover from FreeBSD xgettext call.
+    rm -f messages.po
+  fi
+
+  AC_OUTPUT_COMMANDS([
+    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.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            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.
+    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.
+  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"
+])
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
new file mode 100644
index 000000000..af10170af
--- /dev/null
+++ b/m4/printf-posix.m4
@@ -0,0 +1,44 @@
+# printf-posix.m4 serial 2 (gettext-0.13.1)
+dnl Copyright (C) 2003 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 Test whether the printf() function supports POSIX/XSI format strings with
+dnl positions.
+
+AC_DEFUN([gt_PRINTF_POSIX],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+    gt_cv_func_printf_posix,
+    [
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <string.h>
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
+   dollar expansion (possibly an autoconf bug).  */
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+static char buf[100];
+int main ()
+{
+  sprintf (buf, format, 33, 55);
+  return (strcmp (buf, "55 33") != 0);
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+      [
+        AC_EGREP_CPP(notposix, [
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+  notposix
+#endif
+        ], gt_cv_func_printf_posix="guessing no",
+           gt_cv_func_printf_posix="guessing yes")
+      ])
+    ])
+  case $gt_cv_func_printf_posix in
+    *yes)
+      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+        [Define if your printf() function supports format strings with positions.])
+      ;;
+  esac
+])
diff --git a/m4/progtest.m4 b/m4/progtest.m4
new file mode 100644
index 000000000..a56365cd3
--- /dev/null
+++ b/m4/progtest.m4
@@ -0,0 +1,92 @@
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 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 --git a/m4/signed.m4 b/m4/signed.m4
new file mode 100644
index 000000000..048f59369
--- /dev/null
+++ b/m4/signed.m4
@@ -0,0 +1,17 @@
+# signed.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 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([bh_C_SIGNED],
+[
+  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
+   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+  if test $bh_cv_c_signed = no; then
+    AC_DEFINE(signed, ,
+              [Define to empty if the C compiler doesn't support this keyword.])
+  fi
+])
diff --git a/m4/size_max.m4 b/m4/size_max.m4
new file mode 100644
index 000000000..4fe81c7b0
--- /dev/null
+++ b/m4/size_max.m4
@@ -0,0 +1,59 @@
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 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([gl_SIZE_MAX],
+[
+  AC_CHECK_HEADERS(stdint.h)
+  dnl First test whether the system already has SIZE_MAX.
+  AC_MSG_CHECKING([for SIZE_MAX])
+  result=
+  AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], result=yes)
+  if test -z "$result"; then
+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+    dnl than the type 'unsigned long'.
+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+      [#include <stddef.h>], result=?)
+    if test "$fits_in_uint" = 1; then
+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+      AC_TRY_COMPILE([#include <stddef.h>
+        extern size_t foo;
+        extern unsigned long foo;
+        ], [], fits_in_uint=0)
+    fi
+    if test -z "$result"; then
+      if test "$fits_in_uint" = 1; then
+        result="$res_hi$res_lo"U
+      else
+        result="$res_hi$res_lo"UL
+      fi
+    else
+      dnl Shouldn't happen, but who knows...
+      result='~(size_t)0'
+    fi
+  fi
+  AC_MSG_RESULT([$result])
+  if test "$result" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+  fi
+])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
new file mode 100644
index 000000000..3355f35aa
--- /dev/null
+++ b/m4/stdint_h.m4
@@ -0,0 +1,26 @@
+# stdint_h.m4 serial 5
+dnl Copyright (C) 1997-2004 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 Paul Eggert.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([gl_AC_HEADER_STDINT_H],
+[
+  AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    gl_cv_header_stdint_h=yes,
+    gl_cv_header_stdint_h=no)])
+  if test $gl_cv_header_stdint_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
+      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
new file mode 100644
index 000000000..bf83ed746
--- /dev/null
+++ b/m4/uintmax_t.m4
@@ -0,0 +1,30 @@
+# uintmax_t.m4 serial 9
+dnl Copyright (C) 1997-2004 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 Paul Eggert.
+
+AC_PREREQ(2.13)
+
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
+
+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
+    test $ac_cv_type_unsigned_long_long = yes \
+      && ac_type='unsigned long long' \
+      || ac_type='unsigned long'
+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+      [Define to unsigned long or unsigned long long
+       if <stdint.h> and <inttypes.h> don't define.])
+  else
+    AC_DEFINE(HAVE_UINTMAX_T, 1,
+      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
new file mode 100644
index 000000000..dee10ccc3
--- /dev/null
+++ b/m4/ulonglong.m4
@@ -0,0 +1,23 @@
+# ulonglong.m4 serial 4
+dnl Copyright (C) 1999-2004 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 Paul Eggert.
+
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+
+AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
+  if test $ac_cv_type_unsigned_long_long = yes; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+      [Define if you have the 'unsigned long long' type.])
+  fi
+])
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
new file mode 100644
index 000000000..cde2129a9
--- /dev/null
+++ b/m4/wchar_t.m4
@@ -0,0 +1,20 @@
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 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 Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+    [AC_TRY_COMPILE([#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+  fi
+])
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
new file mode 100644
index 000000000..b8fff9c86
--- /dev/null
+++ b/m4/wint_t.m4
@@ -0,0 +1,20 @@
+# wint_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2003 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 Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+    [AC_TRY_COMPILE([#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+  fi
+])
diff --git a/m4/xsize.m4 b/m4/xsize.m4
new file mode 100644
index 000000000..85bb721e4
--- /dev/null
+++ b/m4/xsize.m4
@@ -0,0 +1,13 @@
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 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.
+
+AC_DEFUN([gl_XSIZE],
+[
+  dnl Prerequisites of lib/xsize.h.
+  AC_REQUIRE([gl_SIZE_MAX])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CHECK_HEADERS(stdint.h)
+])
diff --git a/misc-utils/Makefile b/misc-utils/Makefile
deleted file mode 100644
index cc1d5cd54..000000000
--- a/misc-utils/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-# Created: Sat Dec 26 20:09:40 1992
-# Revised: Mon Nov 11 10:12:16 1996 by faith@cs.unc.edu
-# Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu)
-# May be distirbuted under the GPL
-#
-include ../make_include
-include ../MCONFIG
-
-# scriptreplay not added yet
-
-# Where to put man pages?
-
-MAN1= 		cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
-		namei.1 rename.1 script.1 whereis.1
-
-# Where to put binaries?
-# See the "install" rule for the links. . .
-
-BIN=
-
-USRBIN=		cal chkdupexe ddate logger look mcookie \
-		namei rename script whereis
-
-MAYBE=		reset setterm
-
-ifeq "$(HAVE_RESET)" "no"
-USRBIN:=$(USRBIN) reset
-MAN1:=$(MAN1) reset.1
-endif
-
-ifeq "$(HAVE_WRITE)" "no"
-USRBIN:=$(USRBIN) write
-MAN1:=$(MAN1) write.1
-endif
-
-ifeq "$(HAVE_KILL)" "no"
-BIN:=$(BIN) kill
-MAN1:=$(MAN1) kill.1
-endif
-
-ifeq "$(HAVE_NCURSES)" "yes"
-USRBIN:=$(USRBIN) setterm
-MAN1:=$(MAN1) setterm.1
-endif
-
-# For script only
-LIBPTY=
-ifeq "$(HAVE_OPENPTY)" "yes"
-LIBPTY:=$(LIBPTY) -lutil
-endif
-
-# Programs requiring special compilation
-NEEDS_CURSES=  setterm
-NEEDS_OPENPTY= script
-
-all: $(BIN) $(USRBIN) $(USRBIN.NONSHADOW)
-
-$(NEEDS_CURSES):
-ifeq "$(HAVE_NCURSES)" "yes"
-	$(CC) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
-else
-	@echo $@ not made since it requires ncurses
-endif
-
-ifeq "$(HAVE_NCURSES)" "yes"
-cal:
-	$(CC) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
-else
-ifeq "$(HAVE_TERMCAP)" "yes"
-cal:
-	$(CC) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP)
-endif
-endif
-
-$(NEEDS_OPENPTY):
-	$(CC) $(LDFLAGS) $^ -o $@ $(LIBPTY)
-
-%: %.sh
-	cp $@.sh $@
-	chmod 755 $@
-
-%: %.pl
-	cp $@.pl $@
-	chmod 755 $@
-
-# Rules for everything else
-
-cal.o: $(LIB)/errs.h
-cal: cal.o $(ERR_O)
-chkdupexe: chkdupexe.pl
-ddate: ddate.o
-kill: kill.o procs.o
-logger: logger.o
-mcookie: mcookie.o $(LIB)/md5.o
-mcookie.o: mcookie.c $(LIB)/md5.h
-reset: reset.sh
-script: script.o
-write.o: $(LIB)/carefulputc.h
-write: write.o $(LIB)/carefulputc.o
-
-ifeq "$(HAVE_NCURSES)" "yes"
-setterm: setterm.o
-endif
-
-install: all
-	$(INSTALLDIR) $(BINDIR) $(USRBINDIR)
-ifneq "$(BIN)" ""
-	$(INSTALLBIN) $(BIN) $(BINDIR)
-endif
-	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
-	$(INSTALLDIR) $(MAN1DIR)
-	$(INSTALLMAN) $(MAN1) $(MAN1DIR)
-ifeq "$(HAVE_WRITE)" "no"
-ifeq "$(USE_TTY_GROUP)" "yes"
-	chgrp tty $(USRBINDIR)/write
-	chmod g+s $(USRBINDIR)/write
-endif
-endif
-
-.PHONY:	clean
-clean:
-	-rm -f *.o *~ core $(BIN) $(USRBIN) $(MAYBE)
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
new file mode 100644
index 000000000..b9d30e331
--- /dev/null
+++ b/misc-utils/Makefile.am
@@ -0,0 +1,68 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+bin_PROGRAMS =
+
+usrbin_PROGRAMS = cal ddate logger look mcookie \
+	namei script whereis
+
+mcookie_LDADD = $(top_srcdir)/lib/libmd5.la
+
+usrbin_SCRIPTS = chkdupexe scriptreplay
+
+chkdupexe: chkdupexe.pl
+	sed -e 's,[@]PERL[@],$(PERL),g' < chkdupexe.pl > chkdupexe
+
+scriptreplay: scriptreplay.pl
+	sed -e 's,[@]PERL[@],$(PERL),g' < scriptreplay.pl > scriptreplay
+
+CLEANFILES = chkdupexe scriptreplay
+
+man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
+	namei.1 script.1 whereis.1
+
+if HAVE_NCURSES
+cal_LDADD = -lncurses
+else
+if HAVE_TERMCAP
+cal_LDADD = -ltermcap
+endif
+endif
+
+if HAVE_LIBUTIL
+script_LDADD = -lutil
+endif
+
+if HAVE_NCURSES
+usrbin_PROGRAMS += setterm
+man_MANS += setterm.1
+setterm_LDADD = -lncurses
+endif
+
+if BUILD_KILL
+bin_PROGRAMS += kill
+kill_SOURCES = kill.c procs.c
+man_MANS += kill.1
+endif
+
+if BUILD_RENAME
+usrbin_PROGRAMS += rename
+man_MANS += rename.1
+endif
+
+if BUILD_RESET
+usrbin_SCRIPTS += reset
+man_MANS += reset.1
+endif
+
+if BUILD_WRITE
+
+usrbin_PROGRAMS += write
+man_MANS += write.1
+
+if USE_TTY_GROUP
+install-data-hook::
+	chgrp tty $(DESTDIR)$(usrbindir)/write
+	chmod g+s $(DESTDIR)$(usrbindir)/write
+endif
+
+endif
diff --git a/misc-utils/Makefile.in b/misc-utils/Makefile.in
new file mode 100644
index 000000000..47811d461
--- /dev/null
+++ b/misc-utils/Makefile.in
@@ -0,0 +1,808 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+bin_PROGRAMS = $(am__EXEEXT_1)
+usrbin_PROGRAMS = cal$(EXEEXT) ddate$(EXEEXT) logger$(EXEEXT) \
+	look$(EXEEXT) mcookie$(EXEEXT) namei$(EXEEXT) script$(EXEEXT) \
+	whereis$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+	$(am__EXEEXT_4)
+@HAVE_NCURSES_TRUE@am__append_1 = setterm
+@HAVE_NCURSES_TRUE@am__append_2 = setterm.1
+@BUILD_KILL_TRUE@am__append_3 = kill
+@BUILD_KILL_TRUE@am__append_4 = kill.1
+@BUILD_RENAME_TRUE@am__append_5 = rename
+@BUILD_RENAME_TRUE@am__append_6 = rename.1
+@BUILD_RESET_TRUE@am__append_7 = reset
+@BUILD_RESET_TRUE@am__append_8 = reset.1
+@BUILD_WRITE_TRUE@am__append_9 = write
+@BUILD_WRITE_TRUE@am__append_10 = write.1
+subdir = misc-utils
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+@BUILD_KILL_TRUE@am__EXEEXT_1 = kill$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(usrbindir)" \
+	"$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man1dir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@HAVE_NCURSES_TRUE@am__EXEEXT_2 = setterm$(EXEEXT)
+@BUILD_RENAME_TRUE@am__EXEEXT_3 = rename$(EXEEXT)
+@BUILD_WRITE_TRUE@am__EXEEXT_4 = write$(EXEEXT)
+usrbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(usrbin_PROGRAMS)
+cal_SOURCES = cal.c
+cal_OBJECTS = cal.$(OBJEXT)
+cal_DEPENDENCIES =
+ddate_SOURCES = ddate.c
+ddate_OBJECTS = ddate.$(OBJEXT)
+ddate_LDADD = $(LDADD)
+am__kill_SOURCES_DIST = kill.c procs.c
+@BUILD_KILL_TRUE@am_kill_OBJECTS = kill.$(OBJEXT) procs.$(OBJEXT)
+kill_OBJECTS = $(am_kill_OBJECTS)
+kill_LDADD = $(LDADD)
+logger_SOURCES = logger.c
+logger_OBJECTS = logger.$(OBJEXT)
+logger_LDADD = $(LDADD)
+look_SOURCES = look.c
+look_OBJECTS = look.$(OBJEXT)
+look_LDADD = $(LDADD)
+mcookie_SOURCES = mcookie.c
+mcookie_OBJECTS = mcookie.$(OBJEXT)
+mcookie_DEPENDENCIES = $(top_srcdir)/lib/libmd5.la
+namei_SOURCES = namei.c
+namei_OBJECTS = namei.$(OBJEXT)
+namei_LDADD = $(LDADD)
+rename_SOURCES = rename.c
+rename_OBJECTS = rename.$(OBJEXT)
+rename_LDADD = $(LDADD)
+script_SOURCES = script.c
+script_OBJECTS = script.$(OBJEXT)
+script_DEPENDENCIES =
+setterm_SOURCES = setterm.c
+setterm_OBJECTS = setterm.$(OBJEXT)
+setterm_DEPENDENCIES =
+whereis_SOURCES = whereis.c
+whereis_OBJECTS = whereis.$(OBJEXT)
+whereis_LDADD = $(LDADD)
+write_SOURCES = write.c
+write_OBJECTS = write.$(OBJEXT)
+write_LDADD = $(LDADD)
+usrbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(usrbin_SCRIPTS)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = cal.c ddate.c $(kill_SOURCES) logger.c look.c mcookie.c \
+	namei.c rename.c script.c setterm.c whereis.c write.c
+DIST_SOURCES = cal.c ddate.c $(am__kill_SOURCES_DIST) logger.c look.c \
+	mcookie.c namei.c rename.c script.c setterm.c whereis.c \
+	write.c
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+mcookie_LDADD = $(top_srcdir)/lib/libmd5.la
+usrbin_SCRIPTS = chkdupexe scriptreplay $(am__append_7)
+CLEANFILES = chkdupexe scriptreplay
+man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 namei.1 \
+	script.1 whereis.1 $(am__append_2) $(am__append_4) \
+	$(am__append_6) $(am__append_8) $(am__append_10)
+@HAVE_NCURSES_FALSE@@HAVE_TERMCAP_TRUE@cal_LDADD = -ltermcap
+@HAVE_NCURSES_TRUE@cal_LDADD = -lncurses
+@HAVE_LIBUTIL_TRUE@script_LDADD = -lutil
+@HAVE_NCURSES_TRUE@setterm_LDADD = -lncurses
+@BUILD_KILL_TRUE@kill_SOURCES = kill.c procs.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  misc-utils/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  misc-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
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-binPROGRAMS: $(bin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	done
+
+clean-usrbinPROGRAMS:
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+cal$(EXEEXT): $(cal_OBJECTS) $(cal_DEPENDENCIES) 
+	@rm -f cal$(EXEEXT)
+	$(LINK) $(cal_LDFLAGS) $(cal_OBJECTS) $(cal_LDADD) $(LIBS)
+ddate$(EXEEXT): $(ddate_OBJECTS) $(ddate_DEPENDENCIES) 
+	@rm -f ddate$(EXEEXT)
+	$(LINK) $(ddate_LDFLAGS) $(ddate_OBJECTS) $(ddate_LDADD) $(LIBS)
+kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES) 
+	@rm -f kill$(EXEEXT)
+	$(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
+logger$(EXEEXT): $(logger_OBJECTS) $(logger_DEPENDENCIES) 
+	@rm -f logger$(EXEEXT)
+	$(LINK) $(logger_LDFLAGS) $(logger_OBJECTS) $(logger_LDADD) $(LIBS)
+look$(EXEEXT): $(look_OBJECTS) $(look_DEPENDENCIES) 
+	@rm -f look$(EXEEXT)
+	$(LINK) $(look_LDFLAGS) $(look_OBJECTS) $(look_LDADD) $(LIBS)
+mcookie$(EXEEXT): $(mcookie_OBJECTS) $(mcookie_DEPENDENCIES) 
+	@rm -f mcookie$(EXEEXT)
+	$(LINK) $(mcookie_LDFLAGS) $(mcookie_OBJECTS) $(mcookie_LDADD) $(LIBS)
+namei$(EXEEXT): $(namei_OBJECTS) $(namei_DEPENDENCIES) 
+	@rm -f namei$(EXEEXT)
+	$(LINK) $(namei_LDFLAGS) $(namei_OBJECTS) $(namei_LDADD) $(LIBS)
+rename$(EXEEXT): $(rename_OBJECTS) $(rename_DEPENDENCIES) 
+	@rm -f rename$(EXEEXT)
+	$(LINK) $(rename_LDFLAGS) $(rename_OBJECTS) $(rename_LDADD) $(LIBS)
+script$(EXEEXT): $(script_OBJECTS) $(script_DEPENDENCIES) 
+	@rm -f script$(EXEEXT)
+	$(LINK) $(script_LDFLAGS) $(script_OBJECTS) $(script_LDADD) $(LIBS)
+setterm$(EXEEXT): $(setterm_OBJECTS) $(setterm_DEPENDENCIES) 
+	@rm -f setterm$(EXEEXT)
+	$(LINK) $(setterm_LDFLAGS) $(setterm_OBJECTS) $(setterm_LDADD) $(LIBS)
+whereis$(EXEEXT): $(whereis_OBJECTS) $(whereis_DEPENDENCIES) 
+	@rm -f whereis$(EXEEXT)
+	$(LINK) $(whereis_LDFLAGS) $(whereis_OBJECTS) $(whereis_LDADD) $(LIBS)
+write$(EXEEXT): $(write_OBJECTS) $(write_DEPENDENCIES) 
+	@rm -f write$(EXEEXT)
+	$(LINK) $(write_LDFLAGS) $(write_OBJECTS) $(write_LDADD) $(LIBS)
+install-usrbinSCRIPTS: $(usrbin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
+	@list='$(usrbin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(usrbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
+	    $(usrbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(usrbindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-usrbinSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrbin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	done
+
+installcheck-usrbinSCRIPTS: $(usrbin_SCRIPTS)
+	bad=0; pid=$$$$; list="$(usrbin_SCRIPTS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/look.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mcookie.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namei.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rename.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setterm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whereis.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(SCRIPTS) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man1dir)"; 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:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+@BUILD_WRITE_FALSE@install-data-hook:
+@USE_TTY_GROUP_FALSE@install-data-hook:
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-usrbinPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man install-usrbinPROGRAMS \
+	install-usrbinSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man: install-man1
+
+installcheck-am: installcheck-binPROGRAMS installcheck-usrbinPROGRAMS \
+	installcheck-usrbinSCRIPTS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+	uninstall-usrbinPROGRAMS uninstall-usrbinSCRIPTS
+
+uninstall-man: uninstall-man1
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-usrbinPROGRAMS ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-data-hook install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-man1 install-strip install-usrbinPROGRAMS \
+	install-usrbinSCRIPTS installcheck installcheck-am \
+	installcheck-binPROGRAMS installcheck-usrbinPROGRAMS \
+	installcheck-usrbinSCRIPTS installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-info-am uninstall-man uninstall-man1 \
+	uninstall-usrbinPROGRAMS uninstall-usrbinSCRIPTS
+
+
+chkdupexe: chkdupexe.pl
+	sed -e 's,[@]PERL[@],$(PERL),g' < chkdupexe.pl > chkdupexe
+
+scriptreplay: scriptreplay.pl
+	sed -e 's,[@]PERL[@],$(PERL),g' < scriptreplay.pl > scriptreplay
+
+@BUILD_WRITE_TRUE@@USE_TTY_GROUP_TRUE@install-data-hook::
+@BUILD_WRITE_TRUE@@USE_TTY_GROUP_TRUE@	chgrp tty $(DESTDIR)$(usrbindir)/write
+@BUILD_WRITE_TRUE@@USE_TTY_GROUP_TRUE@	chmod g+s $(DESTDIR)$(usrbindir)/write
+# 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 --git a/misc-utils/cal.c b/misc-utils/cal.c
index 83015ea96..c55777a73 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -66,15 +66,15 @@
 #include <locale.h>
 #include "errs.h"
 #include "nls.h"
-#include "../defines.h"
 
-#if defined(HAVE_ncurses)
+#if defined(HAVE_NCURSES)
 
-#if NCH
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
-#else
-#include <curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
 #endif
+
 #include <term.h>                       /* include after <curses.h> */
 
 static void
@@ -92,7 +92,7 @@ my_tgetstr(char *s, char *ss) {
      return tigetstr(ss);
 }
 
-#elif defined(HAVE_termcap)
+#elif defined(HAVE_LIBTERMCAP)
 
 #include <termcap.h>
 
@@ -119,7 +119,7 @@ my_tgetstr(char *s, char *ss) {
 const char	*term="";
 const char	*Senter="", *Sexit="";/* enter and exit standout mode */
 
-#ifdef HAVE_langinfo_h
+#ifdef HAVE_LANGINFO_H
 # include <langinfo.h>
 #else
 # include <localeinfo.h>	/* libc4 only */
@@ -255,7 +255,7 @@ main(int argc, char **argv) {
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-#if defined(HAVE_ncurses) || defined(HAVE_termcap)
+#if defined(HAVE_NCURSES) || defined(HAVE_LIBTERMCAP)
 	if ((term = getenv("TERM"))) {
 		int ret;
 		my_setupterm(term, 1, &ret);
@@ -283,7 +283,7 @@ main(int argc, char **argv) {
  * At some future time this may become -s for Sunday, -m for Monday,
  * no option for glibc-determined locale-dependent version.
  */
-#ifdef HAVE_langinfo_h
+#ifdef HAVE_LANGINFO_H
 	week1stday = (int)(nl_langinfo(_NL_TIME_FIRST_WEEKDAY))[0];
 #endif
 #endif
@@ -310,8 +310,8 @@ main(int argc, char **argv) {
 			yflag = 1;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-			       progname, util_linux_version);
+			printf(_("%s from %s%s\n"),
+			       progname, "util-linux-", VERSION);
 			return 0;
 		case '?':
 		default:
@@ -378,7 +378,7 @@ void headers_init(void)
   wcscpy(j_day_headings_wc,L"");
 #endif
 
-#ifdef HAVE_langinfo_h
+#ifdef HAVE_LANGINFO_H
 # define weekday(wd)	nl_langinfo(ABDAY_1+wd)
 #else
 # define weekday(wd)	_time_info->abbrev_wkday[wd]
@@ -414,7 +414,7 @@ void headers_init(void)
 #undef weekday
 
   for (i = 0; i < 12; i++) {
-#ifdef HAVE_langinfo_h
+#ifdef HAVE_LANGINFO_H
      full_month[i] = nl_langinfo(MON_1+i);
 #else
      full_month[i] = _time_info->full_month[i];
@@ -457,7 +457,7 @@ monthly(int day, int month, int year) {
 
 	do_monthly(day, month, year, &out);
 	for (i = 0; i < FMT_ST_LINES; i++) {
-#if defined(HAVE_ncurses) || defined(HAVE_termcap)
+#if defined(HAVE_NCURSES) || defined(HAVE_LIBTERMCAP)
 		my_putstring(out.s[i]);putchar('\n');
 #else
 		puts(out.s[i]);
@@ -502,7 +502,7 @@ monthly3(int day, int month, int year) {
 		       width, out_prev.s[i],
 		       width, out_curm.s[i],
 		       width, out_next.s[i]);
-#if defined(HAVE_ncurses) || defined(HAVE_termcap)
+#if defined(HAVE_NCURSES) || defined(HAVE_LIBTERMCAP)
 		my_putstring(lineout);
 #else
 		fputs(lineout,stdout);
@@ -539,7 +539,7 @@ j_yearly(int day, int year) {
 			}
 			*p = '\0';
 			trim_trailing_spaces(lineout);
-#if defined(HAVE_ncurses) || defined(HAVE_termcap)
+#if defined(HAVE_NCURSES) || defined(HAVE_LIBTERMCAP)
 			my_putstring(lineout);putchar('\n');
 #else
 			puts(lineout);
@@ -579,7 +579,7 @@ yearly(int day, int year) {
 			}
 			*p = '\0';
 			trim_trailing_spaces(lineout);
-#if defined(HAVE_ncurses) || defined(HAVE_termcap)
+#if defined(HAVE_NCURSES) || defined(HAVE_LIBTERMCAP)
                         my_putstring(lineout);putchar('\n');
 #else
                         puts(lineout);
diff --git a/misc-utils/chkdupexe.pl b/misc-utils/chkdupexe.pl
index e5fae6847..c2c238497 100755
--- a/misc-utils/chkdupexe.pl
+++ b/misc-utils/chkdupexe.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 #
 # chkdupexe version 2.1.1
 #
diff --git a/misc-utils/ddate.c b/misc-utils/ddate.c
index 4a201a31b..94f1655fe 100644
--- a/misc-utils/ddate.c
+++ b/misc-utils/ddate.c
@@ -62,7 +62,6 @@
 #include <time.h>
 #include <stdio.h>
 #include "nls.h"
-#include "../defines.h"		/* for util-linux-version */
 
 #ifndef __GNUC__
 #define inline /* foo */
@@ -177,7 +176,7 @@ main (int argc, char *argv[]) {
 	case '-': 
 	    switch(argv[pi][1]) {
 	    case 'V':
-		printf(_("%s from %s\n"), progname, util_linux_version);
+		printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
 	    default: goto usage;
 	    }
 	default: goto thud;
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 46c2f66a1..824735b4a 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -186,7 +186,7 @@ int main (int argc, char *argv[])
 	}
 	if (! strcmp (arg, "-v") || ! strcmp (arg, "-V") ||
 	    ! strcmp (arg, "--version")) {
-	    printf(_("%s from %s\n"), progname, util_linux_version);
+	    printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
 	    return 0;
 	}
 	if (! strcmp (arg, "-a")) {
diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index e550bec6a..dee26c560 100644
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include "md5.h"
-#if HAVE_GETTIMEOFDAY
+#ifdef HAVE_GETTIMEOFDAY
 #include <sys/time.h>
 #include <unistd.h>
 #endif
@@ -79,7 +79,7 @@ int main( int argc, char **argv )
    pid_t             pid;
    char              *file = NULL;
    int               r;
-#if HAVE_GETTIMEOFDAY
+#ifdef HAVE_GETTIMEOFDAY
    struct timeval    tv;
    struct timezone   tz;
 #else
@@ -98,7 +98,7 @@ int main( int argc, char **argv )
 
    MD5Init( &ctx );
    
-#if HAVE_GETTIMEOFDAY
+#ifdef HAVE_GETTIMEOFDAY
    gettimeofday( &tv, &tz );
    MD5Update( &ctx, (unsigned char *)&tv, sizeof( tv ) );
 #else
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index 05f8f19b2..5f96510d9 100644
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -76,8 +76,8 @@ main(int argc, char **argv) {
 
 	if (argc == 2) {
 		if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-			printf(_("%s from %s\n"),
-			       progname, util_linux_version);
+			printf(_("%s from %s%s\n"),
+			       progname, "util-linux-", VERSION);
 			return 0;
 		}
 	}
diff --git a/misc-utils/reset.sh b/misc-utils/reset
index 92d253907..92d253907 100644
--- a/misc-utils/reset.sh
+++ b/misc-utils/reset
diff --git a/misc-utils/script.1 b/misc-utils/script.1
index cdd6af0ec..6a9a5bad4 100644
--- a/misc-utils/script.1
+++ b/misc-utils/script.1
@@ -81,7 +81,7 @@ supervise real-time what is being done using `cat foo'.
 .It Fl q
 Be quiet.
 .It Fl t
-Output timeing data to standard error. This data contains two fields,
+Output timing data to standard error. This data contains two fields,
 separated by a space. The first field indicates how much time elapsed since
 the previous output. The second field indicates how many characters were
 output this time. This information can be used to replay typescripts with
diff --git a/misc-utils/script.c b/misc-utils/script.c
index 81747a619..f5e01f676 100644
--- a/misc-utils/script.c
+++ b/misc-utils/script.c
@@ -59,8 +59,7 @@
 #include <string.h>
 #endif
 
-#include "../defines.h"
-#ifdef HAVE_openpty
+#ifdef HAVE_LIBUTIL
 #include <pty.h>
 #endif
 
@@ -87,7 +86,7 @@ struct	termios tt;
 struct	winsize win;
 int	lb;
 int	l;
-#ifndef HAVE_openpty
+#ifndef HAVE_LIBUTIL
 char	line[] = "/dev/ptyXX";
 #endif
 int	aflg = 0;
@@ -140,8 +139,8 @@ main(int argc, char **argv) {
 	
 	if (argc == 2) {
 		if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-			printf(_("%s from %s\n"),
-			       progname, util_linux_version);
+			printf(_("%s from %s%s\n"),
+			       progname, "util-linux-", VERSION);
 			return 0;
 		}
 	}
@@ -270,7 +269,7 @@ dooutput() {
 	double oldtime=time(NULL), newtime;
 
 	(void) close(0);
-#ifdef HAVE_openpty
+#ifdef HAVE_LIBUTIL
 	(void) close(slave);
 #endif
 	tvec = time((time_t *)NULL);
@@ -373,7 +372,7 @@ done() {
 
 void
 getmaster() {
-#ifdef HAVE_openpty
+#ifdef HAVE_LIBUTIL
 	(void) tcgetattr(0, &tt);
 	(void) ioctl(0, TIOCGWINSZ, (char *)&win);
 	if (openpty(&master, &slave, NULL, &tt, &win) < 0) {
@@ -413,12 +412,12 @@ getmaster() {
 	}
 	fprintf(stderr, _("Out of pty's\n"));
 	fail();
-#endif /* not HAVE_openpty */
+#endif /* not HAVE_LIBUTIL */
 }
 
 void
 getslave() {
-#ifndef HAVE_openpty
+#ifndef HAVE_LIBUTIL
 	line[strlen("/dev/")] = 't';
 	slave = open(line, O_RDWR);
 	if (slave < 0) {
diff --git a/misc-utils/scriptreplay.pl b/misc-utils/scriptreplay.pl
index ea72b1f3e..b445f6d61 100755
--- a/misc-utils/scriptreplay.pl
+++ b/misc-utils/scriptreplay.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 
 # "script -t" will output a typescript with timings
 # this script "scriptreplay" replays it
diff --git a/misc-utils/setterm.c b/misc-utils/setterm.c
index f83adf036..0a2f44c2d 100644
--- a/misc-utils/setterm.c
+++ b/misc-utils/setterm.c
@@ -102,11 +102,13 @@
 #define NCURSES_CONST const	/* define before including term.h */
 #endif
 #include <term.h>
-#if NCH
+ 
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
-#else
-#include <curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H) 
+#include <ncurses/ncurses.h>
 #endif
+
 #include <sys/param.h>		/* for MAXPATHLEN */
 #include <sys/ioctl.h>
 #include <sys/time.h>
diff --git a/misc-utils/sparc-solaris-hostid.sh b/misc-utils/sparc-solaris-hostid.sh
deleted file mode 100755
index 7ce28ac5e..000000000
--- a/misc-utils/sparc-solaris-hostid.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# This script reproduces the output of the Solaris hostid program.
-# It might be put in /usr/bin/hostid or so.
-# Note that the hostid program does not have any known uses
-# and does not exist on other architectures.
-# Copyright 1999 Peter Jones, <pjones@redhat.com> .  
-# GPL and all that good stuff apply.
-(
-idprom=`cat /proc/openprom/idprom`
-echo $idprom|dd bs=1 skip=2 count=2
-echo $idprom|dd bs=1 skip=27 count=6
-echo
-) 2>/dev/null
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index a01481be4..000000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.10 1996/05/03 07:37:52 friedman Exp $
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/mkminix-0.1/README b/mkminix-0.1/README
deleted file mode 100644
index d93c38e95..000000000
--- a/mkminix-0.1/README
+++ /dev/null
@@ -1,47 +0,0 @@
-Mkminix-0.1 by W. Black
-
-Description
------------
-This directory contains a hacked version of mkfs.minix from util-linux 2.8.
-The hack in question was primarily a bit of #ifndef-ing to make it compile
-successfully under DJGPP.  Due to DOS's brain-damaged 8.3 filename limitation,
-the executable has been renamed from mkfs.minix to mkminix.exe.
-[Executable deleted in the util-linux distribution.]
-
-Distribution
-------------
-This distribution should have come with both sources and executable.  If
-you're missing either, feel free to visit my site at 
-http://www.geocities.com/SiliconValley/Network/5508 to get a fresh one if
-you need it.
-
-This program and its source program in util-linux are protected by the GNU
-General Public License.  See the file COPYING for details.
-
-Why
----
-Exactly why would anyone want to create a Minix filesystem under DOS?  The
-answer, as far as I am concerned, is in the interest of creating initial 
-ramdisks for Linux.  By being able to configure an initrd from DOS (or Win
-'95, etc.), you can make the transition to Linux that much easier (think
-Win '95 autoplay Linux distributions, for example).
-
-Phase II of this project would logically be to be able to populate this initrd
-with files.  That is my goal for mkminix-0.2.
-
-Installation
-------------
-At this point, everything is pretty much already installed.  Just run MKMINIX
-from the DOS prompt.  The source will compile under DJGPP if and only if you
-have a copy of linux/minix_fs.h.  I included the one from Linux kernel 2.0.30,
-but these files have a way of changing in annoying ways, so it's probably best
-to use one that matches whatever version of Linux you are going to be running
-concurrently.  This is if you have to be ABSOLUTELY sure that everything
-matches...  BTW, compile line is as follows for DJGPP:  
-
-  gcc -o mkminix.exe mkminix.c
-
-Desperate Plea for Attention
-----------------------------
-If you find this program useful (or silly, or a complete waste of time), please
-drop me a line at wjblack@yahoo.com.  Thanks!
diff --git a/mkminix-0.1/linux/minix_fs.h b/mkminix-0.1/linux/minix_fs.h
deleted file mode 100644
index 3bc020fcd..000000000
--- a/mkminix-0.1/linux/minix_fs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-#ifndef _LINUX_MINIX_FS_H
-#define _LINUX_MINIX_FS_H
-
-/*
- * The minix filesystem constants/structures
- */
-
-/*
- * Thanks to Kees J Bot for sending me the definitions of the new
- * minix filesystem (aka V2) with bigger inodes and 32-bit block
- * pointers.
- */
-
-#define MINIX_ROOT_INO 1
-
-/* Not the same as the bogus LINK_MAX in <linux/limits.h>. Oh well. */
-#define MINIX_LINK_MAX	250
-
-#define MINIX_I_MAP_SLOTS	8
-#define MINIX_Z_MAP_SLOTS	64
-#define MINIX_SUPER_MAGIC	0x137F		/* original minix fs */
-#define MINIX_SUPER_MAGIC2	0x138F		/* minix fs, 30 char names */
-#define MINIX2_SUPER_MAGIC	0x2468		/* minix V2 fs */
-#define MINIX2_SUPER_MAGIC2	0x2478		/* minix V2 fs, 30 char names */
-#define MINIX_VALID_FS		0x0001		/* Clean fs. */
-#define MINIX_ERROR_FS		0x0002		/* fs has errors. */
-
-#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
-#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode)))
-
-#define MINIX_V1		0x0001		/* original minix fs */
-#define MINIX_V2		0x0002		/* minix V2 fs */
-
-#define INODE_VERSION(inode)	inode->i_sb->u.minix_sb.s_version
-
-/*
- * This is the original minix inode layout on disk.
- * Note the 8-bit gid and atime and ctime.
- */
-struct minix_inode {
-	__u16 i_mode;
-	__u16 i_uid;
-	__u32 i_size;
-	__u32 i_time;
-	__u8  i_gid;
-	__u8  i_nlinks;
-	__u16 i_zone[9];
-};
-
-/*
- * The new minix inode has all the time entries, as well as
- * long block numbers and a third indirect block (7+1+1+1
- * instead of 7+1+1). Also, some previously 8-bit values are
- * now 16-bit. The inode is now 64 bytes instead of 32.
- */
-struct minix2_inode {
-	__u16 i_mode;
-	__u16 i_nlinks;
-	__u16 i_uid;
-	__u16 i_gid;
-	__u32 i_size;
-	__u32 i_atime;
-	__u32 i_mtime;
-	__u32 i_ctime;
-	__u32 i_zone[10];
-};
-
-/*
- * minix super-block data on disk
- */
-struct minix_super_block {
-	__u16 s_ninodes;
-	__u16 s_nzones;
-	__u16 s_imap_blocks;
-	__u16 s_zmap_blocks;
-	__u16 s_firstdatazone;
-	__u16 s_log_zone_size;
-	__u32 s_max_size;
-	__u16 s_magic;
-	__u16 s_state;
-	__u32 s_zones;
-};
-
-struct minix_dir_entry {
-	__u16 inode;
-	char name[0];
-};
-
-#ifdef __KERNEL__
-
-extern int minix_lookup(struct inode * dir,const char * name, int len,
-                        struct inode ** result);
-extern int minix_create(struct inode * dir,const char * name, int len, int mode,
-	struct inode ** result);
-extern int minix_mkdir(struct inode * dir, const char * name, int len, int mode);
-extern int minix_rmdir(struct inode * dir, const char * name, int len);
-extern int minix_unlink(struct inode * dir, const char * name, int len);
-extern int minix_symlink(struct inode * inode, const char * name, int len,
-	const char * symname);
-extern int minix_link(struct inode * oldinode, struct inode * dir, const char * name, int len);
-extern int minix_mknod(struct inode * dir, const char * name, int len, int mode, int rdev);
-extern int minix_rename(struct inode * old_dir, const char * old_name, int old_len,
-	struct inode * new_dir, const char * new_name, int new_len, int must_be_dir);
-extern struct inode * minix_new_inode(const struct inode * dir);
-extern void minix_free_inode(struct inode * inode);
-extern unsigned long minix_count_free_inodes(struct super_block *sb);
-extern int minix_new_block(struct super_block * sb);
-extern void minix_free_block(struct super_block * sb, int block);
-extern unsigned long minix_count_free_blocks(struct super_block *sb);
-
-extern int minix_bmap(struct inode *,int);
-
-extern struct buffer_head * minix_getblk(struct inode *, int, int);
-extern struct buffer_head * minix_bread(struct inode *, int, int);
-
-extern void minix_truncate(struct inode *);
-extern void minix_put_super(struct super_block *);
-extern struct super_block *minix_read_super(struct super_block *,void *,int);
-extern int init_minix_fs(void);
-extern void minix_write_super(struct super_block *);
-extern int minix_remount (struct super_block * sb, int * flags, char * data);
-extern void minix_read_inode(struct inode *);
-extern void minix_write_inode(struct inode *);
-extern void minix_put_inode(struct inode *);
-extern void minix_statfs(struct super_block *, struct statfs *, int);
-extern int minix_sync_inode(struct inode *);
-extern int minix_sync_file(struct inode *, struct file *);
-
-extern struct inode_operations minix_file_inode_operations;
-extern struct inode_operations minix_dir_inode_operations;
-extern struct inode_operations minix_symlink_inode_operations;
-
-#endif /* __KERNEL__ */
-
-#endif
diff --git a/mkminix-0.1/mkmin-dj.h b/mkminix-0.1/mkmin-dj.h
deleted file mode 100644
index 1ed7b2161..000000000
--- a/mkminix-0.1/mkmin-dj.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Stolen from linux/fs.h */

-#define BLOCK_SIZE 1024

-

-/* Ugh */

-typedef unsigned char __u8;

-typedef unsigned short __u16;

-typedef unsigned int __u32;

-

-/* Stolen from linux/stat.h, since DJGPP's stat.h produces different values */

-#define S_IFMT  00170000

-#define S_IFSOCK 0140000

-#define S_IFLNK  0120000

-#define S_IFREG  0100000

-#define S_IFBLK  0060000

-#define S_IFDIR  0040000

-#define S_IFCHR  0020000

-#define S_IFIFO  0010000

-#define S_ISUID  0004000

-#define S_ISGID  0002000

-#define S_ISVTX  0001000

-

-#define S_ISLNK(m)      (((m) & S_IFMT) == S_IFLNK)

-#define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)

-#define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)

-#define S_ISCHR(m)      (((m) & S_IFMT) == S_IFCHR)

-#define S_ISBLK(m)      (((m) & S_IFMT) == S_IFBLK)

-#define S_ISFIFO(m)     (((m) & S_IFMT) == S_IFIFO)

-#define S_ISSOCK(m)     (((m) & S_IFMT) == S_IFSOCK)

-

-#define S_IRWXU 00700

-#define S_IRUSR 00400

-#define S_IWUSR 00200

-#define S_IXUSR 00100

-

-#define S_IRWXG 00070

-#define S_IRGRP 00040

-#define S_IWGRP 00020

-#define S_IXGRP 00010

-

-#define S_IRWXO 00007

-#define S_IROTH 00004

-#define S_IWOTH 00002

-#define S_IXOTH 00001

diff --git a/mkminix-0.1/mkminix.diff b/mkminix-0.1/mkminix.diff
deleted file mode 100644
index 45d6c8194..000000000
--- a/mkminix-0.1/mkminix.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-48a49,51
->  * 09.29.98  -  Modified to compile under DJGPP (minus mount-checking, etc.).
->  *              (wjblack@yahoo.com)
->  *
-69a73,78
-> 
-> /* DJGPP's IOCTL interface should probably not be trusted here.  It's not
->    needed, anyway.  Nor does DJGPP have any clue about mounted filesystems.
->    Oh, did I mention that the directory status, etc, doesn't match that of
->    the Minix FS? */
-> #ifndef __DJGPP__
-74a84,91
-> #endif
-> 
-> /* For those defs that DJGPP doesn't have (or has wrong) */
-> #ifdef __DJGPP__
-> #include "mkmin-dj.h"
-> #endif
-> 
-> /* DJGPP requires that you stick a linux/minix_fs.h somewhere appropriate */
-172a190
-> #ifndef __DJGPP__
-173a192,194
-> #else
-> #define usage() fatal_error("Usage: %s [-c | -l filename] [-nXX] [-iXX] imagefile [blocks]\n",16)
-> #endif
-175a197
-> #ifndef __DJGPP__
-196a219
-> #endif				/* __DJGPP__ */
-238a262
-> #ifndef __DJGPP__
-242a267
-> #endif
-613a639
-> #ifndef __DJGPP__
-614a641
-> #endif
-694a722
-> #ifndef __DJGPP__
-695a724
-> #endif
-707a737
-> #ifndef __DJGPP__
-713a744
-> #endif
diff --git a/mount/Makefile b/mount/Makefile
deleted file mode 100644
index 911f96c7c..000000000
--- a/mount/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-include ../make_include
-include ../MCONFIG
-
-DEFINES = -DHAVE_NFS $(BLKID_DEFINE)
-
-RPCSVCDIR = rpcsvc
-RPC_CFLAGS = -Wno-unused 
-RPCGEN = rpcgen
-
-COMPILE = $(CC) -c $(CFLAGS) $(DEFINES)
-LINK = $(CC) $(LDFLAGS)
-
-SUID_PROGS = mount umount
-NOSUID_PROGS = swapon losetup
-MAN5 = fstab.5 nfs.5
-MAN8 = mount.8 swapoff.8 swapon.8 umount.8 losetup.8
-
-ifeq "$(HAVE_PIVOT_ROOT)" "yes"
-NOSUID_PROGS := $(NOSUID_PROGS) pivot_root
-MAN8 := $(MAN8) pivot_root.8
-endif
-
-ifeq "$(HAVE_BLKID)" "yes"
-BLKID_DEFINE = -DHAVE_BLKID
-BLKID_LIB = -lblkid -luuid
-endif
-
-PROGS = $(SUID_PROGS) $(NOSUID_PROGS)
-
-MAYBE = pivot_root swapoff
-
-LO_OBJS = lomount.o $(LIB)/xstrncpy.o
-NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o
-GEN_FILES = nfsmount.h nfsmount_xdr.c nfsmount_clnt.c
-
-all: $(PROGS)
-
-install: $(PROGS)
-	$(INSTALLDIR) $(BINDIR) $(SBINDIR)
-	$(INSTALLSUID) $(SUID_PROGS) $(BINDIR)
-	$(INSTALLBIN) $(NOSUID_PROGS) $(SBINDIR)
-	(cd $(SBINDIR); ln -sf swapon swapoff)
-	$(INSTALLDIR) $(MAN5DIR) $(MAN8DIR)
-	$(INSTALLMAN) $(MAN5) $(MAN5DIR)
-	$(INSTALLMAN) $(MAN8) $(MAN8DIR)
-
-%.o: %.c
-	$(COMPILE) $<
-
-mount: mount.o fstab.o sundries.o xmalloc.o realpath.o mntent.o version.o \
-       get_label_uuid.o mount_by_label.o mount_blkid.o mount_guess_fstype.o \
-       getusername.o $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS)
-	$(LINK) $^ -o $@ $(BLKID_LIB)
-
-umount: umount.o fstab.o sundries.o xmalloc.o realpath.o mntent.o \
-	getusername.o get_label_uuid.o mount_by_label.o mount_blkid.o \
-	version.o $(LIB)/env.o $(LO_OBJS)
-	$(LINK) $^ -o $@ $(BLKID_LIB)
-
-swapon:	swapon.o version.o xmalloc.o \
-	get_label_uuid.o mount_by_label.o mount_blkid.o
-	$(LINK) $^ -o $@ $(BLKID_LIB)
-
-main_losetup.o: lomount.c
-	$(COMPILE) -DMAIN lomount.c -o $@
-
-losetup: main_losetup.o $(LIB)/xstrncpy.o
-	$(LINK) $^ -o $@
-
-mount.o umount.o nfsmount.o losetup.o fstab.o realpath.o sundries.o: sundries.h
-
-mount.o umount.o fstab.o sundries.o: fstab.h
-
-mount.o fstab.o mntent.o: mntent.h
-
-mount.o mount_guess_fstype.o: mount_guess_fstype.h
-
-mount.o: $(LIB)/setproctitle.h
-
-mount.o umount.o getusername.o: getusername.h
-
-mount.o umount.o losetup.o lomount.o: lomount.h loop.h my_dev_t.h
-
-swapon.o: swap_constants.h swapargs.h
-
-sundries.o nfsmount.o nfsmount_xdr.o nfsmount_clnt.o: nfsmount.h
-
-umount.o: mount_constants.h
-
-mount.o mount_blkid.o: mount_blkid.h
-
-mount.o mount_by_label.o mount_guess_fstype.o: linux_fs.h
-
-sundries.o realpath.o: realpath.h
-
-nfsmount_clnt.o: nfsmount_clnt.c
-	$(COMPILE) $(RPC_CFLAGS) nfsmount_clnt.c
-
-nfsmount_xdr.o: nfsmount_xdr.c
-	$(COMPILE) $(RPC_CFLAGS) nfsmount_xdr.c
-
-ifeq "$(HAVE_GOOD_RPC)" "yes"
-nfsmount.h: nfsmount.x
-	rm -f nfsmount.h
-	$(RPCGEN) -h -o nfsmount.h nfsmount.x
-
-nfsmount_xdr.c: nfsmount.x
-	rm -f nfsmount_xdr.c
-	$(RPCGEN) -c -o nfsmount_xdr.c nfsmount.x
-
-nfsmount_clnt.c: nfsmount.x
-	rm -f nfsmount_clnt.c
-	$(RPCGEN) -l -o nfsmount_clnt.c nfsmount.x
-else
-nfsmount.h:
-	cp $(RPCSVCDIR)/nfsmount.h .
-
-nfsmount_xdr.c:
-	cp $(RPCSVCDIR)/nfsmount_xdr.c .
-
-nfsmount_clnt.c:
-	cp $(RPCSVCDIR)/nfsmount_clnt.c .
-endif
-
-nfsmount.o: nfs_mount4.h
-
-swapargs.h:
-	sh swap.configure
-
-clean:
-	rm -f a.out core *~ *.o swapargs.h $(PROGS) $(MAYBE)
-	rm -f nfs_mountversion.h
-
-clobber distclean realclean: clean
-	rm -f $(GEN_FILES)
diff --git a/mount/Makefile.am b/mount/Makefile.am
new file mode 100644
index 000000000..927bea42d
--- /dev/null
+++ b/mount/Makefile.am
@@ -0,0 +1,52 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+AM_CPPFLAGS += -DHAVE_NFS
+
+bin_PROGRAMS = mount umount swapon losetup
+man_MANS = fstab.5 nfs.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
+
+mount_SOURCES = mount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \
+	get_label_uuid.c mount_by_label.c mount_blkid.c mount_guess_fstype.c \
+	getusername.c \
+	nfsmount.c nfsmount_xdr.c nfsmount_clnt.c \
+	lomount.c
+
+mount_LDADD = $(top_srcdir)/lib/libenv.la $(top_srcdir)/lib/libsetproctitle.la
+
+umount_SOURCES = umount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \
+	getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \
+	lomount.c
+
+umount_LDADD = $(top_srcdir)/lib/libenv.la
+
+swapon_SOURCES = swapon.c xmalloc.c \
+	get_label_uuid.c mount_by_label.c mount_blkid.c
+
+losetup_SOURCES = lomount.c
+losetup_CFLAGS = -DMAIN
+
+if HAVE_BLKID
+mount_LDADD += -lblkid -luuid
+umount_LDADD += -lblkid -luuid
+swapon_LDADD = -lblkid -luuid
+endif
+
+if HAVE_PIVOT_ROOT
+bin_PROGRAMS += pivot_root
+man_MANS += pivot_root.8
+endif
+
+
+swapon.c: swapargs.h
+
+swapargs.h:
+	sh swap.configure
+
+clean-local:
+	rm -f swapargs.h
+
+
+install-exec-hook:
+	chmod 4755 $(DESTDIR)$(bindir)/mount
+	chmod 4755 $(DESTDIR)$(bindir)/umount
+	cd $(DESTDIR)$(bindir) && ln -sf swapon swapoff
\ No newline at end of file
diff --git a/mount/Makefile.in b/mount/Makefile.in
new file mode 100644
index 000000000..6b28acc49
--- /dev/null
+++ b/mount/Makefile.in
@@ -0,0 +1,755 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+bin_PROGRAMS = mount$(EXEEXT) umount$(EXEEXT) swapon$(EXEEXT) \
+	losetup$(EXEEXT) $(am__EXEEXT_1)
+@HAVE_BLKID_TRUE@am__append_1 = -lblkid -luuid
+@HAVE_BLKID_TRUE@am__append_2 = -lblkid -luuid
+@HAVE_PIVOT_ROOT_TRUE@am__append_3 = pivot_root
+@HAVE_PIVOT_ROOT_TRUE@am__append_4 = pivot_root.8
+subdir = mount
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+@HAVE_PIVOT_ROOT_TRUE@am__EXEEXT_1 = pivot_root$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man8dir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_losetup_OBJECTS = losetup-lomount.$(OBJEXT)
+losetup_OBJECTS = $(am_losetup_OBJECTS)
+losetup_LDADD = $(LDADD)
+am_mount_OBJECTS = mount.$(OBJEXT) fstab.$(OBJEXT) sundries.$(OBJEXT) \
+	xmalloc.$(OBJEXT) realpath.$(OBJEXT) mntent.$(OBJEXT) \
+	get_label_uuid.$(OBJEXT) mount_by_label.$(OBJEXT) \
+	mount_blkid.$(OBJEXT) mount_guess_fstype.$(OBJEXT) \
+	getusername.$(OBJEXT) nfsmount.$(OBJEXT) \
+	nfsmount_xdr.$(OBJEXT) nfsmount_clnt.$(OBJEXT) \
+	lomount.$(OBJEXT)
+mount_OBJECTS = $(am_mount_OBJECTS)
+am__DEPENDENCIES_1 =
+mount_DEPENDENCIES = $(top_srcdir)/lib/libenv.la \
+	$(top_srcdir)/lib/libsetproctitle.la $(am__DEPENDENCIES_1)
+pivot_root_SOURCES = pivot_root.c
+pivot_root_OBJECTS = pivot_root.$(OBJEXT)
+pivot_root_LDADD = $(LDADD)
+am_swapon_OBJECTS = swapon.$(OBJEXT) xmalloc.$(OBJEXT) \
+	get_label_uuid.$(OBJEXT) mount_by_label.$(OBJEXT) \
+	mount_blkid.$(OBJEXT)
+swapon_OBJECTS = $(am_swapon_OBJECTS)
+swapon_DEPENDENCIES =
+am_umount_OBJECTS = umount.$(OBJEXT) fstab.$(OBJEXT) \
+	sundries.$(OBJEXT) xmalloc.$(OBJEXT) realpath.$(OBJEXT) \
+	mntent.$(OBJEXT) getusername.$(OBJEXT) \
+	get_label_uuid.$(OBJEXT) mount_by_label.$(OBJEXT) \
+	mount_blkid.$(OBJEXT) lomount.$(OBJEXT)
+umount_OBJECTS = $(am_umount_OBJECTS)
+umount_DEPENDENCIES = $(top_srcdir)/lib/libenv.la \
+	$(am__DEPENDENCIES_1)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(losetup_SOURCES) $(mount_SOURCES) pivot_root.c \
+	$(swapon_SOURCES) $(umount_SOURCES)
+DIST_SOURCES = $(losetup_SOURCES) $(mount_SOURCES) pivot_root.c \
+	$(swapon_SOURCES) $(umount_SOURCES)
+man5dir = $(mandir)/man5
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include -DHAVE_NFS
+DEFAULT_INCLUDES = 
+man_MANS = fstab.5 nfs.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 \
+	$(am__append_4)
+mount_SOURCES = mount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \
+	get_label_uuid.c mount_by_label.c mount_blkid.c mount_guess_fstype.c \
+	getusername.c \
+	nfsmount.c nfsmount_xdr.c nfsmount_clnt.c \
+	lomount.c
+
+mount_LDADD = $(top_srcdir)/lib/libenv.la \
+	$(top_srcdir)/lib/libsetproctitle.la $(am__append_1)
+umount_SOURCES = umount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \
+	getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \
+	lomount.c
+
+umount_LDADD = $(top_srcdir)/lib/libenv.la $(am__append_2)
+swapon_SOURCES = swapon.c xmalloc.c \
+	get_label_uuid.c mount_by_label.c mount_blkid.c
+
+losetup_SOURCES = lomount.c
+losetup_CFLAGS = -DMAIN
+@HAVE_BLKID_TRUE@swapon_LDADD = -lblkid -luuid
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  mount/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  mount/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
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-binPROGRAMS: $(bin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+losetup$(EXEEXT): $(losetup_OBJECTS) $(losetup_DEPENDENCIES) 
+	@rm -f losetup$(EXEEXT)
+	$(LINK) $(losetup_LDFLAGS) $(losetup_OBJECTS) $(losetup_LDADD) $(LIBS)
+mount$(EXEEXT): $(mount_OBJECTS) $(mount_DEPENDENCIES) 
+	@rm -f mount$(EXEEXT)
+	$(LINK) $(mount_LDFLAGS) $(mount_OBJECTS) $(mount_LDADD) $(LIBS)
+pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES) 
+	@rm -f pivot_root$(EXEEXT)
+	$(LINK) $(pivot_root_LDFLAGS) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
+swapon$(EXEEXT): $(swapon_OBJECTS) $(swapon_DEPENDENCIES) 
+	@rm -f swapon$(EXEEXT)
+	$(LINK) $(swapon_LDFLAGS) $(swapon_OBJECTS) $(swapon_LDADD) $(LIBS)
+umount$(EXEEXT): $(umount_OBJECTS) $(umount_DEPENDENCIES) 
+	@rm -f umount$(EXEEXT)
+	$(LINK) $(umount_LDFLAGS) $(umount_OBJECTS) $(umount_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstab.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_label_uuid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getusername.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lomount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-lomount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mntent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_blkid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_by_label.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_guess_fstype.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfsmount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfsmount_clnt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfsmount_xdr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realpath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sundries.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swapon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+losetup-lomount.o: lomount.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(losetup_CFLAGS) $(CFLAGS) -MT losetup-lomount.o -MD -MP -MF "$(DEPDIR)/losetup-lomount.Tpo" -c -o losetup-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-lomount.Tpo" "$(DEPDIR)/losetup-lomount.Po"; else rm -f "$(DEPDIR)/losetup-lomount.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='losetup-lomount.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(losetup_CFLAGS) $(CFLAGS) -c -o losetup-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
+
+losetup-lomount.obj: lomount.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(losetup_CFLAGS) $(CFLAGS) -MT losetup-lomount.obj -MD -MP -MF "$(DEPDIR)/losetup-lomount.Tpo" -c -o losetup-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-lomount.Tpo" "$(DEPDIR)/losetup-lomount.Po"; else rm -f "$(DEPDIR)/losetup-lomount.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='losetup-lomount.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(losetup_CFLAGS) $(CFLAGS) -c -o losetup-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man5: $(man5_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.5*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    5*) ;; \
+	    *) ext='5' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
+	done
+uninstall-man5:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.5*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    5*) ;; \
+	    *) ext='5' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
+	done
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+	done
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(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)
+
+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-libtool clean-local \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-exec-am: install-binPROGRAMS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
+install-info: install-info-am
+
+install-man: install-man5 install-man8
+
+installcheck-am: installcheck-binPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+
+uninstall-man: uninstall-man5 uninstall-man8
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-local ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-exec-hook \
+	install-info install-info-am install-man install-man5 \
+	install-man8 install-strip installcheck installcheck-am \
+	installcheck-binPROGRAMS installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-info-am uninstall-man uninstall-man5 uninstall-man8
+
+
+swapon.c: swapargs.h
+
+swapargs.h:
+	sh swap.configure
+
+clean-local:
+	rm -f swapargs.h
+
+install-exec-hook:
+	chmod 4755 $(DESTDIR)$(bindir)/mount
+	chmod 4755 $(DESTDIR)$(bindir)/umount
+	cd $(DESTDIR)$(bindir) && ln -sf swapon swapoff
+# 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 --git a/mount/get_label_uuid.c b/mount/get_label_uuid.c
index 8b5942f71..6d92e077a 100644
--- a/mount/get_label_uuid.c
+++ b/mount/get_label_uuid.c
@@ -1,4 +1,4 @@
-#ifndef HAVE_BLKID
+#ifndef HAVE_LIBBLKID
 /*
  * Get label. Used by mount, umount and swapon.
  */
diff --git a/mount/mount.8 b/mount/mount.8
index 767db5f79..59a5e91a5 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -370,6 +370,7 @@ currently supported include:
 .IR coda ,
 .IR coherent ,
 .IR cramfs ,
+.IR debugfs ,
 .IR devpts ,
 .IR efs ,
 .IR ext ,
@@ -536,7 +537,7 @@ Some of these options are only useful when they appear in the
 file.  The following options apply to any file system that is being
 mounted (but not every file system actually honors them - e.g., the
 .B sync
-option today has effect only for ext2, ext3 and ufs):
+option today has effect only for ext2, ext3, fat, vfat and ufs):
 .RS
 .TP
 .B async
@@ -631,7 +632,8 @@ Allow set-user-identifier or set-group-identifier bits to take
 effect.
 .TP
 .B sync
-All I/O to the file system should be done synchronously.
+All I/O to the file system should be done synchronously. In case of media with limited number of write cycles 
+(e.g. some flash drives) "sync" may cause life-cycle shortening.
 .TP
 .B dirsync
 All directory updates within the file system should be done synchronously.
@@ -736,6 +738,13 @@ These options are accepted but ignored.
 .SH "Mount options for coherent"
 None.
 
+.SH "Mount options for debugfs"
+The debugfs file system is a pseudo file system, traditionally mounted on
+.IR /sys/kernel/debug .
+.\" or just /debug
+.\" present since 2.6.11
+There are no mount options.
+
 .SH "Mount options for devpts"
 The devpts file system is a pseudo file system, traditionally mounted on
 .IR /dev/pts .
@@ -1933,11 +1942,11 @@ It is possible for a corrupted file system to cause a crash.
 .PP
 Some Linux file systems don't support
 .B "\-o sync and \-o dirsync"
-(the ext2 and ext3 file systems
+(the ext2, ext3, fat and vfat file systems
 .I do
 support synchronous updates (a la BSD) when mounted with the
 .B sync
-option).
+option). 
 .PP
 The
 .B "\-o remount"
diff --git a/mount/mount.c b/mount/mount.c
index 0f48ea931..572bc1b15 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -839,7 +839,6 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
    * Also nfs requires a separate program, but it is built in.
    */
   if (!fake && types && streq (types, "nfs")) {
-#ifdef HAVE_NFS
 retry_nfs:
     mnt_err = nfsmount (spec, node, &flags, &extra_opts, &mount_opts,
 			&nfs_mount_version, bg);
@@ -847,10 +846,6 @@ retry_nfs:
 	res = mnt_err;
 	goto out;
     }
-#else
-    die (EX_SOFTWARE, _("mount: this version was compiled "
-		      "without support for the type `nfs'"));
-#endif
   }
 
   block_signals (SIG_BLOCK);
@@ -884,7 +879,6 @@ retry_nfs:
 
   block_signals (SIG_UNBLOCK);
 
-#ifdef HAVE_NFS
   if (mnt_err && types && streq (types, "nfs")) {
       if (nfs_mount_version == 4 && mnt_err != EBUSY && mnt_err != ENOENT) {
 	  if (verbose)
@@ -893,7 +887,6 @@ retry_nfs:
 	  goto retry_nfs;
       }
   }
-#endif
 
   /* Mount failed, complain, but don't die.  */
 
@@ -1308,14 +1301,12 @@ do_mount_all (char *types, char *options, char *test_opts) {
 						DISKMAJOR(statbuf.st_rdev));
 					g = major;
 				}
-#ifdef HAVE_NFS
 				if (strcmp(mc->m.mnt_type, "nfs") == 0) {
 					g = xstrdup(mc->m.mnt_fsname);
 					colon = strchr(g, ':');
 					if (colon)
 						*colon = '\0';
 				}
-#endif
 			}
 			if (g) {
 				for (cp = childhead.nxt; cp; cp = cp->nxt)
@@ -1389,7 +1380,6 @@ do_mount_all (char *types, char *options, char *test_opts) {
 	return status;
 }
 
-extern char version[];
 static struct option longopts[] = {
 	{ "all", 0, 0, 'a' },
 	{ "fake", 0, 0, 'f' },
@@ -1550,7 +1540,7 @@ main(int argc, char *argv[]) {
 			++verbose;
 			break;
 		case 'V':		/* version */
-			printf ("mount: %s\n", version);
+			printf ("mount: util-linux-%s\n", VERSION);
 			exit (0);
 		case 'w':		/* mount read/write */
 			readwrite = 1;
diff --git a/mount/mount_blkid.c b/mount/mount_blkid.c
index c485c913c..8fa30a1ce 100644
--- a/mount/mount_blkid.c
+++ b/mount/mount_blkid.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "mount_blkid.h"
 
-#ifdef HAVE_BLKID
+#ifdef HAVE_LIBBLKID
 
 blkid_cache blkid;
 
diff --git a/mount/mount_blkid.h b/mount/mount_blkid.h
index 67c9975b2..c96ff8cbb 100644
--- a/mount/mount_blkid.h
+++ b/mount/mount_blkid.h
@@ -1,4 +1,4 @@
-#ifdef HAVE_BLKID
+#ifdef HAVE_LIBBLKID
 #include <blkid/blkid.h>
 extern blkid_cache blkid;
 #endif
diff --git a/mount/mount_by_label.c b/mount/mount_by_label.c
index 91e9f3ac8..4899f03b1 100644
--- a/mount/mount_by_label.c
+++ b/mount/mount_by_label.c
@@ -1,4 +1,4 @@
-#ifndef HAVE_BLKID
+#ifndef HAVE_LIBBLKID
 /*
  * mount_by_label.c - aeb
  *
diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c
index 54ff3b8d5..f1637f1e4 100644
--- a/mount/mount_guess_fstype.c
+++ b/mount/mount_guess_fstype.c
@@ -46,7 +46,7 @@
 #define ETC_FILESYSTEMS		"/etc/filesystems"
 #define PROC_FILESYSTEMS	"/proc/filesystems"
 
-#ifdef HAVE_BLKID
+#ifdef HAVE_LIBBLKID
 
 char *
 do_guess_fstype(const char *device) 
diff --git a/mount/nfsmount.c b/mount/nfsmount.c
index a7f5770c9..1e76f9dcb 100644
--- a/mount/nfsmount.c
+++ b/mount/nfsmount.c
@@ -32,8 +32,6 @@
  * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
  */
 
-#include "../defines.h"	/* for HAVE_rpcsvc_nfs_prot_h and HAVE_inet_aton */
-
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
@@ -53,7 +51,7 @@
 #include "sundries.h"
 #include "nfsmount.h"
 
-#ifdef HAVE_rpcsvc_nfs_prot_h
+#ifdef HAVE_RPCSVC_NFS_PROT_H
 #include <rpcsvc/nfs_prot.h>
 #else
 #include <linux/nfs.h>
@@ -259,7 +257,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	}
 
 	server_addr.sin_family = AF_INET;
-#ifdef HAVE_inet_aton
+#ifdef HAVE_INET_ATON
 	if (!inet_aton(hostname, &server_addr.sin_addr))
 #endif
 	{
diff --git a/mount/nfsmount.h b/mount/nfsmount.h
new file mode 100644
index 000000000..aa4a93bd0
--- /dev/null
+++ b/mount/nfsmount.h
@@ -0,0 +1,328 @@
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+
+#ifndef _NFSMOUNT_H_RPCGEN
+#define _NFSMOUNT_H_RPCGEN
+
+#include <rpc/rpc.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user or with the express written consent of
+ * Sun Microsystems, Inc.
+ *
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ *
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ *
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ *
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
+ */
+
+/* from @(#)mount.x	1.3 91/03/11 TIRPC 1.0 */
+#ifndef _rpcsvc_mount_h
+#define _rpcsvc_mount_h
+#include <asm/types.h>
+#define MNTPATHLEN 1024
+#define MNTNAMLEN 255
+#define FHSIZE 32
+#define FHSIZE3 64
+
+typedef char fhandle[FHSIZE];
+
+typedef struct {
+	u_int fhandle3_len;
+	char *fhandle3_val;
+} fhandle3;
+
+enum mountstat3 {
+	MNT_OK = 0,
+	MNT3ERR_PERM = 1,
+	MNT3ERR_NOENT = 2,
+	MNT3ERR_IO = 5,
+	MNT3ERR_ACCES = 13,
+	MNT3ERR_NOTDIR = 20,
+	MNT3ERR_INVAL = 22,
+	MNT3ERR_NAMETOOLONG = 63,
+	MNT3ERR_NOTSUPP = 10004,
+	MNT3ERR_SERVERFAULT = 10006,
+};
+typedef enum mountstat3 mountstat3;
+
+struct fhstatus {
+	u_int fhs_status;
+	union {
+		fhandle fhs_fhandle;
+	} fhstatus_u;
+};
+typedef struct fhstatus fhstatus;
+
+struct mountres3_ok {
+	fhandle3 fhandle;
+	struct {
+		u_int auth_flavours_len;
+		int *auth_flavours_val;
+	} auth_flavours;
+};
+typedef struct mountres3_ok mountres3_ok;
+
+struct mountres3 {
+	mountstat3 fhs_status;
+	union {
+		mountres3_ok mountinfo;
+	} mountres3_u;
+};
+typedef struct mountres3 mountres3;
+
+typedef char *dirpath;
+
+typedef char *name;
+
+typedef struct mountbody *mountlist;
+
+struct mountbody {
+	name ml_hostname;
+	dirpath ml_directory;
+	mountlist ml_next;
+};
+typedef struct mountbody mountbody;
+
+typedef struct groupnode *groups;
+
+struct groupnode {
+	name gr_name;
+	groups gr_next;
+};
+typedef struct groupnode groupnode;
+
+typedef struct exportnode *exports;
+
+struct exportnode {
+	dirpath ex_dir;
+	groups ex_groups;
+	exports ex_next;
+};
+typedef struct exportnode exportnode;
+
+struct ppathcnf {
+	int pc_link_max;
+	short pc_max_canon;
+	short pc_max_input;
+	short pc_name_max;
+	short pc_path_max;
+	short pc_pipe_buf;
+	u_char pc_vdisable;
+	char pc_xxx;
+	short pc_mask[2];
+};
+typedef struct ppathcnf ppathcnf;
+#endif /*!_rpcsvc_mount_h*/
+
+#define MOUNTPROG 100005
+#define MOUNTVERS 1
+
+#if defined(__STDC__) || defined(__cplusplus)
+#define MOUNTPROC_NULL 0
+extern  void * mountproc_null_1(void *, CLIENT *);
+extern  void * mountproc_null_1_svc(void *, struct svc_req *);
+#define MOUNTPROC_MNT 1
+extern  fhstatus * mountproc_mnt_1(dirpath *, CLIENT *);
+extern  fhstatus * mountproc_mnt_1_svc(dirpath *, struct svc_req *);
+#define MOUNTPROC_DUMP 2
+extern  mountlist * mountproc_dump_1(void *, CLIENT *);
+extern  mountlist * mountproc_dump_1_svc(void *, struct svc_req *);
+#define MOUNTPROC_UMNT 3
+extern  void * mountproc_umnt_1(dirpath *, CLIENT *);
+extern  void * mountproc_umnt_1_svc(dirpath *, struct svc_req *);
+#define MOUNTPROC_UMNTALL 4
+extern  void * mountproc_umntall_1(void *, CLIENT *);
+extern  void * mountproc_umntall_1_svc(void *, struct svc_req *);
+#define MOUNTPROC_EXPORT 5
+extern  exports * mountproc_export_1(void *, CLIENT *);
+extern  exports * mountproc_export_1_svc(void *, struct svc_req *);
+#define MOUNTPROC_EXPORTALL 6
+extern  exports * mountproc_exportall_1(void *, CLIENT *);
+extern  exports * mountproc_exportall_1_svc(void *, struct svc_req *);
+extern int mountprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
+
+#else /* K&R C */
+#define MOUNTPROC_NULL 0
+extern  void * mountproc_null_1();
+extern  void * mountproc_null_1_svc();
+#define MOUNTPROC_MNT 1
+extern  fhstatus * mountproc_mnt_1();
+extern  fhstatus * mountproc_mnt_1_svc();
+#define MOUNTPROC_DUMP 2
+extern  mountlist * mountproc_dump_1();
+extern  mountlist * mountproc_dump_1_svc();
+#define MOUNTPROC_UMNT 3
+extern  void * mountproc_umnt_1();
+extern  void * mountproc_umnt_1_svc();
+#define MOUNTPROC_UMNTALL 4
+extern  void * mountproc_umntall_1();
+extern  void * mountproc_umntall_1_svc();
+#define MOUNTPROC_EXPORT 5
+extern  exports * mountproc_export_1();
+extern  exports * mountproc_export_1_svc();
+#define MOUNTPROC_EXPORTALL 6
+extern  exports * mountproc_exportall_1();
+extern  exports * mountproc_exportall_1_svc();
+extern int mountprog_1_freeresult ();
+#endif /* K&R C */
+#define MOUNTVERS_POSIX 2
+
+#if defined(__STDC__) || defined(__cplusplus)
+extern  void * mountproc_null_2(void *, CLIENT *);
+extern  void * mountproc_null_2_svc(void *, struct svc_req *);
+extern  fhstatus * mountproc_mnt_2(dirpath *, CLIENT *);
+extern  fhstatus * mountproc_mnt_2_svc(dirpath *, struct svc_req *);
+extern  mountlist * mountproc_dump_2(void *, CLIENT *);
+extern  mountlist * mountproc_dump_2_svc(void *, struct svc_req *);
+extern  void * mountproc_umnt_2(dirpath *, CLIENT *);
+extern  void * mountproc_umnt_2_svc(dirpath *, struct svc_req *);
+extern  void * mountproc_umntall_2(void *, CLIENT *);
+extern  void * mountproc_umntall_2_svc(void *, struct svc_req *);
+extern  exports * mountproc_export_2(void *, CLIENT *);
+extern  exports * mountproc_export_2_svc(void *, struct svc_req *);
+extern  exports * mountproc_exportall_2(void *, CLIENT *);
+extern  exports * mountproc_exportall_2_svc(void *, struct svc_req *);
+#define MOUNTPROC_PATHCONF 7
+extern  ppathcnf * mountproc_pathconf_2(dirpath *, CLIENT *);
+extern  ppathcnf * mountproc_pathconf_2_svc(dirpath *, struct svc_req *);
+extern int mountprog_2_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
+
+#else /* K&R C */
+extern  void * mountproc_null_2();
+extern  void * mountproc_null_2_svc();
+extern  fhstatus * mountproc_mnt_2();
+extern  fhstatus * mountproc_mnt_2_svc();
+extern  mountlist * mountproc_dump_2();
+extern  mountlist * mountproc_dump_2_svc();
+extern  void * mountproc_umnt_2();
+extern  void * mountproc_umnt_2_svc();
+extern  void * mountproc_umntall_2();
+extern  void * mountproc_umntall_2_svc();
+extern  exports * mountproc_export_2();
+extern  exports * mountproc_export_2_svc();
+extern  exports * mountproc_exportall_2();
+extern  exports * mountproc_exportall_2_svc();
+#define MOUNTPROC_PATHCONF 7
+extern  ppathcnf * mountproc_pathconf_2();
+extern  ppathcnf * mountproc_pathconf_2_svc();
+extern int mountprog_2_freeresult ();
+#endif /* K&R C */
+#define MOUNT_V3 3
+
+#if defined(__STDC__) || defined(__cplusplus)
+#define MOUNTPROC3_NULL 0
+extern  void * mountproc3_null_3(void *, CLIENT *);
+extern  void * mountproc3_null_3_svc(void *, struct svc_req *);
+#define MOUNTPROC3_MNT 1
+extern  mountres3 * mountproc3_mnt_3(dirpath *, CLIENT *);
+extern  mountres3 * mountproc3_mnt_3_svc(dirpath *, struct svc_req *);
+#define MOUNTPROC3_DUMP 2
+extern  mountlist * mountproc3_dump_3(void *, CLIENT *);
+extern  mountlist * mountproc3_dump_3_svc(void *, struct svc_req *);
+#define MOUNTPROC3_UMNT 3
+extern  void * mountproc3_umnt_3(dirpath *, CLIENT *);
+extern  void * mountproc3_umnt_3_svc(dirpath *, struct svc_req *);
+#define MOUNTPROC3_UMNTALL 4
+extern  void * mountproc3_umntall_3(void *, CLIENT *);
+extern  void * mountproc3_umntall_3_svc(void *, struct svc_req *);
+#define MOUNTPROC3_EXPORT 5
+extern  exports * mountproc3_export_3(void *, CLIENT *);
+extern  exports * mountproc3_export_3_svc(void *, struct svc_req *);
+extern int mountprog_3_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
+
+#else /* K&R C */
+#define MOUNTPROC3_NULL 0
+extern  void * mountproc3_null_3();
+extern  void * mountproc3_null_3_svc();
+#define MOUNTPROC3_MNT 1
+extern  mountres3 * mountproc3_mnt_3();
+extern  mountres3 * mountproc3_mnt_3_svc();
+#define MOUNTPROC3_DUMP 2
+extern  mountlist * mountproc3_dump_3();
+extern  mountlist * mountproc3_dump_3_svc();
+#define MOUNTPROC3_UMNT 3
+extern  void * mountproc3_umnt_3();
+extern  void * mountproc3_umnt_3_svc();
+#define MOUNTPROC3_UMNTALL 4
+extern  void * mountproc3_umntall_3();
+extern  void * mountproc3_umntall_3_svc();
+#define MOUNTPROC3_EXPORT 5
+extern  exports * mountproc3_export_3();
+extern  exports * mountproc3_export_3_svc();
+extern int mountprog_3_freeresult ();
+#endif /* K&R C */
+
+/* the xdr functions */
+
+#if defined(__STDC__) || defined(__cplusplus)
+extern  bool_t xdr_fhandle (XDR *, fhandle);
+extern  bool_t xdr_fhandle3 (XDR *, fhandle3*);
+extern  bool_t xdr_mountstat3 (XDR *, mountstat3*);
+extern  bool_t xdr_fhstatus (XDR *, fhstatus*);
+extern  bool_t xdr_mountres3_ok (XDR *, mountres3_ok*);
+extern  bool_t xdr_mountres3 (XDR *, mountres3*);
+extern  bool_t xdr_dirpath (XDR *, dirpath*);
+extern  bool_t xdr_name (XDR *, name*);
+extern  bool_t xdr_mountlist (XDR *, mountlist*);
+extern  bool_t xdr_mountbody (XDR *, mountbody*);
+extern  bool_t xdr_groups (XDR *, groups*);
+extern  bool_t xdr_groupnode (XDR *, groupnode*);
+extern  bool_t xdr_exports (XDR *, exports*);
+extern  bool_t xdr_exportnode (XDR *, exportnode*);
+extern  bool_t xdr_ppathcnf (XDR *, ppathcnf*);
+
+#else /* K&R C */
+extern bool_t xdr_fhandle ();
+extern bool_t xdr_fhandle3 ();
+extern bool_t xdr_mountstat3 ();
+extern bool_t xdr_fhstatus ();
+extern bool_t xdr_mountres3_ok ();
+extern bool_t xdr_mountres3 ();
+extern bool_t xdr_dirpath ();
+extern bool_t xdr_name ();
+extern bool_t xdr_mountlist ();
+extern bool_t xdr_mountbody ();
+extern bool_t xdr_groups ();
+extern bool_t xdr_groupnode ();
+extern bool_t xdr_exports ();
+extern bool_t xdr_exportnode ();
+extern bool_t xdr_ppathcnf ();
+
+#endif /* K&R C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !_NFSMOUNT_H_RPCGEN */
diff --git a/mount/nfsmount_clnt.c b/mount/nfsmount_clnt.c
new file mode 100644
index 000000000..b518f60b2
--- /dev/null
+++ b/mount/nfsmount_clnt.c
@@ -0,0 +1,361 @@
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+
+#include <memory.h> /* for memset */
+#include "nfsmount.h"
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user or with the express written consent of
+ * Sun Microsystems, Inc.
+ *
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ *
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ *
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ *
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
+ */
+
+/* from @(#)mount.x	1.3 91/03/11 TIRPC 1.0 */
+#include <string.h> /* for memset() */
+#include <asm/types.h>
+
+/* Default timeout can be changed using clnt_control() */
+static struct timeval TIMEOUT = { 25, 0 };
+
+void *
+mountproc_null_1(void *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_NULL,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+fhstatus *
+mountproc_mnt_1(dirpath *argp, CLIENT *clnt)
+{
+	static fhstatus clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_MNT,
+		(xdrproc_t) xdr_dirpath, (caddr_t) argp,
+		(xdrproc_t) xdr_fhstatus, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+mountlist *
+mountproc_dump_1(void *argp, CLIENT *clnt)
+{
+	static mountlist clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_DUMP,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_mountlist, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+void *
+mountproc_umnt_1(dirpath *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_UMNT,
+		(xdrproc_t) xdr_dirpath, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+void *
+mountproc_umntall_1(void *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_UMNTALL,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+exports *
+mountproc_export_1(void *argp, CLIENT *clnt)
+{
+	static exports clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_EXPORT,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_exports, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+exports *
+mountproc_exportall_1(void *argp, CLIENT *clnt)
+{
+	static exports clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_EXPORTALL,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_exports, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+void *
+mountproc_null_2(void *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_NULL,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+fhstatus *
+mountproc_mnt_2(dirpath *argp, CLIENT *clnt)
+{
+	static fhstatus clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_MNT,
+		(xdrproc_t) xdr_dirpath, (caddr_t) argp,
+		(xdrproc_t) xdr_fhstatus, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+mountlist *
+mountproc_dump_2(void *argp, CLIENT *clnt)
+{
+	static mountlist clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_DUMP,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_mountlist, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+void *
+mountproc_umnt_2(dirpath *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_UMNT,
+		(xdrproc_t) xdr_dirpath, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+void *
+mountproc_umntall_2(void *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_UMNTALL,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+exports *
+mountproc_export_2(void *argp, CLIENT *clnt)
+{
+	static exports clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_EXPORT,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_exports, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+exports *
+mountproc_exportall_2(void *argp, CLIENT *clnt)
+{
+	static exports clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_EXPORTALL,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_exports, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+ppathcnf *
+mountproc_pathconf_2(dirpath *argp, CLIENT *clnt)
+{
+	static ppathcnf clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC_PATHCONF,
+		(xdrproc_t) xdr_dirpath, (caddr_t) argp,
+		(xdrproc_t) xdr_ppathcnf, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+void *
+mountproc3_null_3(void *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC3_NULL,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+mountres3 *
+mountproc3_mnt_3(dirpath *argp, CLIENT *clnt)
+{
+	static mountres3 clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC3_MNT,
+		(xdrproc_t) xdr_dirpath, (caddr_t) argp,
+		(xdrproc_t) xdr_mountres3, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+mountlist *
+mountproc3_dump_3(void *argp, CLIENT *clnt)
+{
+	static mountlist clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC3_DUMP,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_mountlist, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
+
+void *
+mountproc3_umnt_3(dirpath *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC3_UMNT,
+		(xdrproc_t) xdr_dirpath, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+void *
+mountproc3_umntall_3(void *argp, CLIENT *clnt)
+{
+	static char clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC3_UMNTALL,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_void, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return ((void *)&clnt_res);
+}
+
+exports *
+mountproc3_export_3(void *argp, CLIENT *clnt)
+{
+	static exports clnt_res;
+
+	memset((char *)&clnt_res, 0, sizeof(clnt_res));
+	if (clnt_call (clnt, MOUNTPROC3_EXPORT,
+		(xdrproc_t) xdr_void, (caddr_t) argp,
+		(xdrproc_t) xdr_exports, (caddr_t) &clnt_res,
+		TIMEOUT) != RPC_SUCCESS) {
+		return (NULL);
+	}
+	return (&clnt_res);
+}
diff --git a/mount/nfsmount_xdr.c b/mount/nfsmount_xdr.c
new file mode 100644
index 000000000..e91fcbfd8
--- /dev/null
+++ b/mount/nfsmount_xdr.c
@@ -0,0 +1,329 @@
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+
+#include "nfsmount.h"
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user or with the express written consent of
+ * Sun Microsystems, Inc.
+ *
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ *
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ *
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ *
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
+ */
+
+/* from @(#)mount.x	1.3 91/03/11 TIRPC 1.0 */
+#include <asm/types.h>
+
+bool_t
+xdr_fhandle (XDR *xdrs, fhandle objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_opaque (xdrs, objp, FHSIZE))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_fhandle3 (XDR *xdrs, fhandle3 *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_bytes (xdrs, (char **)&objp->fhandle3_val, (u_int *) &objp->fhandle3_len, FHSIZE3))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_mountstat3 (XDR *xdrs, mountstat3 *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_fhstatus (XDR *xdrs, fhstatus *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_u_int (xdrs, &objp->fhs_status))
+		 return FALSE;
+	switch (objp->fhs_status) {
+	case 0:
+		 if (!xdr_fhandle (xdrs, objp->fhstatus_u.fhs_fhandle))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+
+bool_t
+xdr_mountres3_ok (XDR *xdrs, mountres3_ok *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_fhandle3 (xdrs, &objp->fhandle))
+		 return FALSE;
+	 if (!xdr_array (xdrs, (char **)&objp->auth_flavours.auth_flavours_val, (u_int *) &objp->auth_flavours.auth_flavours_len, ~0,
+		sizeof (int), (xdrproc_t) xdr_int))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_mountres3 (XDR *xdrs, mountres3 *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_mountstat3 (xdrs, &objp->fhs_status))
+		 return FALSE;
+	switch (objp->fhs_status) {
+	case MNT_OK:
+		 if (!xdr_mountres3_ok (xdrs, &objp->mountres3_u.mountinfo))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+
+bool_t
+xdr_dirpath (XDR *xdrs, dirpath *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_string (xdrs, objp, MNTPATHLEN))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_name (XDR *xdrs, name *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_string (xdrs, objp, MNTNAMLEN))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_mountlist (XDR *xdrs, mountlist *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (struct mountbody), (xdrproc_t) xdr_mountbody))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_mountbody (XDR *xdrs, mountbody *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_name (xdrs, &objp->ml_hostname))
+		 return FALSE;
+	 if (!xdr_dirpath (xdrs, &objp->ml_directory))
+		 return FALSE;
+	 if (!xdr_mountlist (xdrs, &objp->ml_next))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_groups (XDR *xdrs, groups *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (struct groupnode), (xdrproc_t) xdr_groupnode))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_groupnode (XDR *xdrs, groupnode *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_name (xdrs, &objp->gr_name))
+		 return FALSE;
+	 if (!xdr_groups (xdrs, &objp->gr_next))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_exports (XDR *xdrs, exports *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (struct exportnode), (xdrproc_t) xdr_exportnode))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_exportnode (XDR *xdrs, exportnode *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_dirpath (xdrs, &objp->ex_dir))
+		 return FALSE;
+	 if (!xdr_groups (xdrs, &objp->ex_groups))
+		 return FALSE;
+	 if (!xdr_exports (xdrs, &objp->ex_next))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_ppathcnf (XDR *xdrs, ppathcnf *objp)
+{
+	register int32_t *buf;
+
+	int i;
+
+	if (xdrs->x_op == XDR_ENCODE) {
+		buf = XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_int (xdrs, &objp->pc_link_max))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_max_canon))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_max_input))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_name_max))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_path_max))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_pipe_buf))
+				 return FALSE;
+
+		} else {
+		IXDR_PUT_LONG(buf, objp->pc_link_max);
+		IXDR_PUT_SHORT(buf, objp->pc_max_canon);
+		IXDR_PUT_SHORT(buf, objp->pc_max_input);
+		IXDR_PUT_SHORT(buf, objp->pc_name_max);
+		IXDR_PUT_SHORT(buf, objp->pc_path_max);
+		IXDR_PUT_SHORT(buf, objp->pc_pipe_buf);
+		}
+		 if (!xdr_u_char (xdrs, &objp->pc_vdisable))
+			 return FALSE;
+		 if (!xdr_char (xdrs, &objp->pc_xxx))
+			 return FALSE;
+		buf = XDR_INLINE (xdrs, ( 2 ) * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_vector (xdrs, (char *)objp->pc_mask, 2,
+				sizeof (short), (xdrproc_t) xdr_short))
+				 return FALSE;
+		} else {
+			{
+				register short *genp;
+
+				for (i = 0, genp = objp->pc_mask;
+					i < 2; ++i) {
+					IXDR_PUT_SHORT(buf, *genp++);
+				}
+			}
+		}
+		return TRUE;
+	} else if (xdrs->x_op == XDR_DECODE) {
+		buf = XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_int (xdrs, &objp->pc_link_max))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_max_canon))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_max_input))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_name_max))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_path_max))
+				 return FALSE;
+			 if (!xdr_short (xdrs, &objp->pc_pipe_buf))
+				 return FALSE;
+
+		} else {
+		objp->pc_link_max = IXDR_GET_LONG(buf);
+		objp->pc_max_canon = IXDR_GET_SHORT(buf);
+		objp->pc_max_input = IXDR_GET_SHORT(buf);
+		objp->pc_name_max = IXDR_GET_SHORT(buf);
+		objp->pc_path_max = IXDR_GET_SHORT(buf);
+		objp->pc_pipe_buf = IXDR_GET_SHORT(buf);
+		}
+		 if (!xdr_u_char (xdrs, &objp->pc_vdisable))
+			 return FALSE;
+		 if (!xdr_char (xdrs, &objp->pc_xxx))
+			 return FALSE;
+		buf = XDR_INLINE (xdrs, ( 2 ) * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_vector (xdrs, (char *)objp->pc_mask, 2,
+				sizeof (short), (xdrproc_t) xdr_short))
+				 return FALSE;
+		} else {
+			{
+				register short *genp;
+
+				for (i = 0, genp = objp->pc_mask;
+					i < 2; ++i) {
+					*genp++ = IXDR_GET_SHORT(buf);
+				}
+			}
+		}
+	 return TRUE;
+	}
+
+	 if (!xdr_int (xdrs, &objp->pc_link_max))
+		 return FALSE;
+	 if (!xdr_short (xdrs, &objp->pc_max_canon))
+		 return FALSE;
+	 if (!xdr_short (xdrs, &objp->pc_max_input))
+		 return FALSE;
+	 if (!xdr_short (xdrs, &objp->pc_name_max))
+		 return FALSE;
+	 if (!xdr_short (xdrs, &objp->pc_path_max))
+		 return FALSE;
+	 if (!xdr_short (xdrs, &objp->pc_pipe_buf))
+		 return FALSE;
+	 if (!xdr_u_char (xdrs, &objp->pc_vdisable))
+		 return FALSE;
+	 if (!xdr_char (xdrs, &objp->pc_xxx))
+		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->pc_mask, 2,
+		sizeof (short), (xdrproc_t) xdr_short))
+		 return FALSE;
+	return TRUE;
+}
diff --git a/mount/rpcsvc/nfsmount_clnt.c b/mount/rpcsvc/nfsmount_clnt.c
index 053d357af..b518f60b2 100644
--- a/mount/rpcsvc/nfsmount_clnt.c
+++ b/mount/rpcsvc/nfsmount_clnt.c
@@ -39,7 +39,7 @@
  */
 
 /* from @(#)mount.x	1.3 91/03/11 TIRPC 1.0 */
-#include <string.h>		/* for memset() */
+#include <string.h> /* for memset() */
 #include <asm/types.h>
 
 /* Default timeout can be changed using clnt_control() */
diff --git a/mount/rpcsvc/nfsmount_xdr.c b/mount/rpcsvc/nfsmount_xdr.c
index c22492de3..e91fcbfd8 100644
--- a/mount/rpcsvc/nfsmount_xdr.c
+++ b/mount/rpcsvc/nfsmount_xdr.c
@@ -217,8 +217,7 @@ xdr_ppathcnf (XDR *xdrs, ppathcnf *objp)
 	int i;
 
 	if (xdrs->x_op == XDR_ENCODE) {
-		/* On many machines XDR_INLINE returns a (long *) */
-		buf = (int32_t *) XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT);
+		buf = XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT);
 		if (buf == NULL) {
 			 if (!xdr_int (xdrs, &objp->pc_link_max))
 				 return FALSE;
@@ -245,7 +244,7 @@ xdr_ppathcnf (XDR *xdrs, ppathcnf *objp)
 			 return FALSE;
 		 if (!xdr_char (xdrs, &objp->pc_xxx))
 			 return FALSE;
-		buf = (int32_t *) XDR_INLINE(xdrs, 2  * BYTES_PER_XDR_UNIT);
+		buf = XDR_INLINE (xdrs, ( 2 ) * BYTES_PER_XDR_UNIT);
 		if (buf == NULL) {
 			 if (!xdr_vector (xdrs, (char *)objp->pc_mask, 2,
 				sizeof (short), (xdrproc_t) xdr_short))
@@ -262,7 +261,7 @@ xdr_ppathcnf (XDR *xdrs, ppathcnf *objp)
 		}
 		return TRUE;
 	} else if (xdrs->x_op == XDR_DECODE) {
-		buf = (int32_t *) XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT);
+		buf = XDR_INLINE (xdrs, 6 * BYTES_PER_XDR_UNIT);
 		if (buf == NULL) {
 			 if (!xdr_int (xdrs, &objp->pc_link_max))
 				 return FALSE;
@@ -289,7 +288,7 @@ xdr_ppathcnf (XDR *xdrs, ppathcnf *objp)
 			 return FALSE;
 		 if (!xdr_char (xdrs, &objp->pc_xxx))
 			 return FALSE;
-		buf = (int32_t *) XDR_INLINE(xdrs, 2  * BYTES_PER_XDR_UNIT);
+		buf = XDR_INLINE (xdrs, ( 2 ) * BYTES_PER_XDR_UNIT);
 		if (buf == NULL) {
 			 if (!xdr_vector (xdrs, (char *)objp->pc_mask, 2,
 				sizeof (short), (xdrproc_t) xdr_short))
diff --git a/mount/sundries.h b/mount/sundries.h
index af0df4e27..6def95b1c 100644
--- a/mount/sundries.h
+++ b/mount/sundries.h
@@ -34,10 +34,8 @@ char *xstrconcat4 (const char *, const char *, const char *, const char *);
 
 void die (int errcode, const char *fmt, ...);
 
-#ifdef HAVE_NFS
 int nfsmount (const char *spec, const char *node, int *flags,
 	      char **orig_opts, char **opt_args, int *version, int running_bg);
-#endif
 
 /* exit status - bits below are ORed */
 #define EX_USAGE	1	/* incorrect invocation or permission */
diff --git a/mount/swapon.c b/mount/swapon.c
index 28faff90b..c5c492f2f 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -34,7 +34,6 @@ int priority = -1;	/* non-prioritized swap by default */
 /* If true, don't complain if the device/file doesn't exist */
 int ifexists = 0;
 
-extern char version[];
 char *progname;
 
 static struct option longswaponopts[] = {
@@ -394,7 +393,7 @@ main_swapon(int argc, char *argv[]) {
 			++verbose;
 			break;
 		case 'V':		/* version */
-			printf("%s: %s\n", progname, version);
+			printf("%s: util-linux-%s\n", progname, VERSION);
 			exit(0);
 		case 0:
 			break;
@@ -446,7 +445,7 @@ main_swapoff(int argc, char *argv[]) {
 			++verbose;
 			break;
 		case 'V':		/* version */
-			printf("%s: %s\n", progname, version);
+			printf("%s: util-linux-%s\n", progname, VERSION);
 			exit(0);
 		case 'L':
 			addl(optarg);
diff --git a/mount/umount.c b/mount/umount.c
index db63d96a8..479b0d77c 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -20,7 +20,6 @@
 #include "env.h"
 #include "nls.h"
 
-#ifdef HAVE_NFS
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <netdb.h>
@@ -29,7 +28,6 @@
 #include <rpc/pmap_prot.h>
 #include "nfsmount.h"
 #include <arpa/inet.h>
-#endif
 
 #if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
 /* Interesting ... it seems libc knows about MNT_FORCE and presumably
@@ -146,7 +144,6 @@ check_special_umountprog(const char *spec, const char *node,
 	return 0;
 }
 
-#ifdef HAVE_NFS
 static int xdr_dir(XDR *xdrsp, char *dirp)
 {
       return (xdr_string(xdrsp, &dirp, MNTPATHLEN));
@@ -238,7 +235,6 @@ nfs_umount_rpc_call(const char *spec, const char *opts)
 
       return 0;
 }
-#endif /* HAVE_NFS */
 
 /* complain about a failed umount */
 static void complain(int err, const char *dev) {
@@ -293,12 +289,10 @@ umount_one (const char *spec, const char *node, const char *type,
 	if (check_special_umountprog(spec, node, type, &status))
 		return status;
 
-#ifdef HAVE_NFS
 	/* Ignore any RPC errors, so that you can umount the filesystem
 	   if the server is down.  */
 	if (strcasecmp(type, "nfs") == 0)
 		nfs_umount_rpc_call(spec, opts);
-#endif
  
 	umnt_err = umnt_err2 = 0;
 	if (lazy) {
@@ -480,7 +474,6 @@ umount_all (char *types, char *test_opts) {
      return errors;
 }
 
-extern char version[];
 static struct option longopts[] =
 {
   { "all", 0, 0, 'a' },
@@ -697,7 +690,7 @@ main (int argc, char *argv[]) {
 			++verbose;
 			break;
 		case 'V':		/* version */
-			printf ("umount: %s\n", version);
+			printf ("umount: util-linux-%s\n", VERSION);
 			exit (0);
 		case 't':		/* specify file system type */
 			types = optarg;
@@ -714,7 +707,7 @@ main (int argc, char *argv[]) {
 
 	if (getuid () != geteuid ()) {
 		suid = 1;
-		if (all || types || nomtab || force || remount)
+		if (all || types || nomtab || force)
 			die (2, _("umount: only root can do that"));
 	}
 
diff --git a/mount/version.c b/mount/version.c
deleted file mode 100644
index a98d11874..000000000
--- a/mount/version.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "../defines.h"
-char version[] = "mount-" UTIL_LINUX_VERSION;
diff --git a/partx/Makefile b/partx/Makefile
deleted file mode 100644
index 9f9a9dbe9..000000000
--- a/partx/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-OBJ = bsd.o dos.o partx.o solaris.o unixware.o gpt.o crc32.o
-CFLAGS += -Wall
-
-all: addpart delpart partx
-
-partx:	$(OBJ)
-
-addpart: addpart.o
-
-delpart: delpart.o
-
-clean:
-	rm -f $(OBJ) addpart.o delpart.o addpart delpart partx *~
-
-$(OBJ): partx.h
diff --git a/partx/Makefile.am b/partx/Makefile.am
new file mode 100644
index 000000000..6c452a29a
--- /dev/null
+++ b/partx/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+if BUILD_PARTX
+
+usrsbin_PROGRAMS = addpart delpart partx
+partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c
+
+endif
diff --git a/partx/Makefile.in b/partx/Makefile.in
new file mode 100644
index 000000000..9ab9edc4d
--- /dev/null
+++ b/partx/Makefile.in
@@ -0,0 +1,569 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+@BUILD_PARTX_TRUE@usrsbin_PROGRAMS = addpart$(EXEEXT) delpart$(EXEEXT) \
+@BUILD_PARTX_TRUE@	partx$(EXEEXT)
+subdir = partx
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(usrsbindir)"
+usrsbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(usrsbin_PROGRAMS)
+addpart_SOURCES = addpart.c
+addpart_OBJECTS = addpart.$(OBJEXT)
+addpart_LDADD = $(LDADD)
+delpart_SOURCES = delpart.c
+delpart_OBJECTS = delpart.$(OBJEXT)
+delpart_LDADD = $(LDADD)
+am__partx_SOURCES_DIST = bsd.c dos.c partx.c solaris.c unixware.c \
+	gpt.c crc32.c
+@BUILD_PARTX_TRUE@am_partx_OBJECTS = bsd.$(OBJEXT) dos.$(OBJEXT) \
+@BUILD_PARTX_TRUE@	partx.$(OBJEXT) solaris.$(OBJEXT) \
+@BUILD_PARTX_TRUE@	unixware.$(OBJEXT) gpt.$(OBJEXT) \
+@BUILD_PARTX_TRUE@	crc32.$(OBJEXT)
+partx_OBJECTS = $(am_partx_OBJECTS)
+partx_LDADD = $(LDADD)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = addpart.c delpart.c $(partx_SOURCES)
+DIST_SOURCES = addpart.c delpart.c $(am__partx_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+@BUILD_PARTX_TRUE@partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  partx/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  partx/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
+install-usrsbinPROGRAMS: $(usrsbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrsbindir)" || $(mkdir_p) "$(DESTDIR)$(usrsbindir)"
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrsbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrsbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrsbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrsbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrsbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrsbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrsbindir)/$$f"; \
+	done
+
+clean-usrsbinPROGRAMS:
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrsbinPROGRAMS: $(usrsbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrsbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrsbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+addpart$(EXEEXT): $(addpart_OBJECTS) $(addpart_DEPENDENCIES) 
+	@rm -f addpart$(EXEEXT)
+	$(LINK) $(addpart_LDFLAGS) $(addpart_OBJECTS) $(addpart_LDADD) $(LIBS)
+delpart$(EXEEXT): $(delpart_OBJECTS) $(delpart_DEPENDENCIES) 
+	@rm -f delpart$(EXEEXT)
+	$(LINK) $(delpart_LDFLAGS) $(delpart_OBJECTS) $(delpart_LDADD) $(LIBS)
+partx$(EXEEXT): $(partx_OBJECTS) $(partx_DEPENDENCIES) 
+	@rm -f partx$(EXEEXT)
+	$(LINK) $(partx_LDFLAGS) $(partx_OBJECTS) $(partx_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addpart.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delpart.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dos.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/partx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solaris.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unixware.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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)$(usrsbindir)"; 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)
+
+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-libtool clean-usrsbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-usrsbinPROGRAMS
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am: installcheck-usrsbinPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-usrsbinPROGRAMS
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-usrsbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip install-usrsbinPROGRAMS installcheck \
+	installcheck-am installcheck-usrsbinPROGRAMS installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am uninstall-usrsbinPROGRAMS
+
+# 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 --git a/partx/addpart.c b/partx/addpart.c
index 11d4305b9..004fee537 100644
--- a/partx/addpart.c
+++ b/partx/addpart.c
@@ -3,6 +3,9 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
+#ifdef HAVE_LINUX_COMPILER_H
+#include <linux/compiler.h>
+#endif
 #include <linux/blkpg.h>
 
 int
diff --git a/partx/delpart.c b/partx/delpart.c
index 8504c0223..9dca74677 100644
--- a/partx/delpart.c
+++ b/partx/delpart.c
@@ -3,6 +3,9 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
+#ifdef HAVE_LINUX_COMPILER_H
+#include <linux/compiler.h>
+#endif
 #include <linux/blkpg.h>
 
 int
diff --git a/partx/gpt.h b/partx/gpt.h
index d0a81f5f2..39814b5d0 100644
--- a/partx/gpt.h
+++ b/partx/gpt.h
@@ -36,7 +36,7 @@
 #define MSDOS_MBR_SIGNATURE 0xaa55
 #define GPT_BLOCK_SIZE 512
 
-#define GPT_HEADER_SIGNATURE 0x5452415020494645
+#define GPT_HEADER_SIGNATURE 0x5452415020494645ULL
 #define GPT_HEADER_REVISION_V1_02 0x00010200
 #define GPT_HEADER_REVISION_V1_00 0x00010000
 #define GPT_HEADER_REVISION_V0_99 0x00009900
diff --git a/partx/partx.c b/partx/partx.c
index 5fb56f331..6448e8c6e 100644
--- a/partx/partx.c
+++ b/partx/partx.c
@@ -38,6 +38,9 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <linux/hdreg.h>        /* HDIO_GETGEO */
+#ifdef HAVE_LINUX_COMPILER_H
+#include <linux/compiler.h>
+#endif
 #include <linux/blkpg.h>
 #define BLKGETSIZE _IO(0x12,96)    /* return device size */
 
@@ -316,7 +319,7 @@ main(int argc, char **argv){
 	return 0;
 }
 
-void *
+static void *
 xmalloc (size_t size) {
 	void *t;
 
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 000000000..7f187f57c
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,11 @@
+2005-07-29  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.14.5.
+	* en@boldquot.header: New file, from gettext-0.14.5.
+	* en@quot.header: New file, from gettext-0.14.5.
+
+2005-01-30  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* en@boldquot.header: New file, from gettext-0.14.1.
+	* en@quot.header: New file, from gettext-0.14.1.
+
diff --git a/po/GNU.ABOUT-NLS b/po/GNU.ABOUT-NLS
deleted file mode 100644
index 28d38c76f..000000000
--- a/po/GNU.ABOUT-NLS
+++ /dev/null
@@ -1,226 +0,0 @@
-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 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 at translations should 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.
-
-One advise in advance
-=====================
-
-   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 or message inheritance) 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'.
-
-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 provides
-usable `catgets' (if using this is selected by the installer) or
-`gettext' functions.  If neither is available, the GNU `gettext' own
-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 --with-catgets
-     ./configure --disable-nls
-
-will respectively bypass any pre-existing `catgets' or `gettext' to use
-the internationalizing routines provided within this package, enable
-the use of the `catgets' functions (if found on the locale system), 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 be not what is 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.
-
-   By default the configuration process will not test for the `catgets'
-function and therefore they will not be used.  The reasons are already
-given above: the emulation on top of `catgets' cannot provide all the
-extensions provided by the GNU `gettext' library.  If you nevertheless
-want to use the `catgets' functions use
-
-     ./configure --with-catgets
-
-to enable the test for `catgets' (this causes no harm if `catgets' is
-not available on your system).  If you really select this option we
-would like to hear about the reasons because we cannot think of any
-good one ourself.
-
-   Internationalized packages have usually 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.
-
-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
-ISO 639 `LL' two-letter code prior to using the programs in the
-package.  For example, let's suppose that you speak German.  At the
-shell prompt, merely execute `setenv LANG de' (in `csh'),
-`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash').  This
-can be done from your `.login' or `.profile' file, once and for all.
-
-   An operating system might already offer message localization for
-many of its programs, while other programs have been installed locally
-with the full capabilities of GNU `gettext'.  Just using `gettext'
-extended syntax for `LANG' would break proper localization of already
-available operating system programs.  In this case, users should set
-both `LANGUAGE' and `LANG' variables in their environment, as programs
-using GNU `gettext' give preference to `LANGUAGE'.  For example, some
-Swedish users would rather read translations in German than English for
-when Swedish is not available.  This is easily accomplished by setting
-`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
-
-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, courtesy of Linux
-International.  You may reach your translation team at the address
-`LL@li.org', replacing LL by the two-letter ISO 639 code for your
-language.  Language codes are *not* the same as the country codes given
-in ISO 3166.  The following translation teams exist, as of December
-1997:
-
-     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
-     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
-     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
-     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
-     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
-     Swedish `sv', and Turkish `tr'.
-
-For example, you may reach the Chinese translation team by writing to
-`zh@li.org'.
-
-   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 `translation@iro.umontreal.ca' 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 skill are praised more than
-programming skill, here.
-
-Available Packages
-==================
-
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of December
-1997.  The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination.
-
-     Ready PO files    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
-                     .----------------------------------------------------.
-     bash            |       []          []          []                   |  3
-     bison           |       []          []          []                   |  3
-     clisp           |       [] [] []    []                               |  4
-     cpio            |       []    []    []       [] []    []             |  6
-     diffutils       |       []    []    []                []          [] |  5
-     enscript        |       []    [] [] []          []             []    |  6
-     fileutils       | []    []    []    []       [] []    [] []    [] [] | 10
-     findutils       |       []    []    [] []    [] []    []    []    [] |  9
-     flex            |             []    []       []                   [] |  4
-     gcal            |       []          []          []    []          [] |  5
-     gettext         |    [] []    []    []       [] [] [] [] []    [] [] | 12
-     grep            |       []    []    []       [] [] [] []    [] [] [] | 10
-     hello           |    [] []    []    []       [] [] [] [] []    [] [] | 11
-     id-utils        |       []          []                []             |  3
-     indent          |    [] []                   []       []    []       |  5
-     libc            |       []    []    []       [] []    []          [] |  7
-     m4              |       []          []    []    []          []    [] |  6
-     make            |       []    []    []       [] []    []             |  6
-     music           |                   []                []             |  2
-     ptx             |       []    []    []          [] [] [] []       [] |  8
-     recode          |    [] []    []    []          []    [] []    [] [] |  9
-     sh-utils        |       []    []    []          [] [] [] []       [] |  8
-     sharutils       | []    []    []    []          []                [] |  6
-     tar             | []    []          [] []    [] [] [] [] []    [] [] | 11
-     texinfo         | []    []          []                               |  3
-     textutils       | []    []    []    []       [] [] [] []          [] |  9
-     wdiff           | []    []    []    []          [] [] []          [] |  8
-                     `----------------------------------------------------'
-       17 languages    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
-       27 packages      6  4 25  1 18  1 26  2  1 12 20  9 19  7  4  7 17  179
-
-   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 December 1997 seems to be old, you may fetch a more recent copy
-of this `ABOUT-NLS' file on most GNU archive sites.
-
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 000000000..37c8563ef
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1 @@
+ca cs da de es et fi fr it ja nl pt_BR ru sl sv tr uk vi
diff --git a/po/Makefile b/po/Makefile
deleted file mode 100644
index ec62b9903..000000000
--- a/po/Makefile
+++ /dev/null
@@ -1,156 +0,0 @@
-PACKAGE = util-linux
-
-include ../make_include
-include ../MCONFIG
-
-ifeq "$(DISABLE_NLS)" "yes"
-  DO_NLS=no
-else
-  DO_NLS=$(HAVE_XGETTEXT)
-endif
-
-#
-# po2tbl.sed is not taken from /usr/share/gettext/intl
-# Often it is not present.
-# A RedHat 5.2 installation only has po2tbl.sed.in.
-#
-PO2TBL = ./po2tbl.sed
-INTL = /usr/share/gettext/intl
-
-SHELL = /bin/sh
-
-localedir = $(LOCALEDIR)
-gnulocaledir = $(LOCALEDIR)
-
-# Not giving an explicit path improves the chances of finding this
-INSTALL = install -c
-INSTALL_DATA = ${INSTALL} -m 644
-
-# Not giving an explicit path improves the chances of finding these
-# On the other hand, I have both xgettext 0.10.35 (in /usr/bin) and
-# /usr/openwin/bin/xgettext, and only the former can be used here..
-GENCAT = gencat
-MSGFMT = msgfmt
-# MSGFMT = msgfmt -c	# -c: undocumented, but useful option
-XGETTEXT = xgettext
-MSGMERGE = msgmerge
-
-
-# ..      for <config.h> (if HAVE_CONFIG_H is set)
-# $(INTL) for "libgettext.h"
-INCLUDES = -I.. -I$(INTL)
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-# Enter here all .po files
-POFILES = ca.po cs.po da.po de.po es.po et.po fi.po fr.po it.po ja.po nl.po pt_BR.po sl.po sv.po tr.po uk.po
-# the same but with .gmo
-GMOFILES = ca.gmo cs.gmo da.gmo de.gmo es.gmo et.gmo fi.gmo fr.gmo it.gmo ja.gmo nl.gmo pt_BR.gmo sl.gmo sv.gmo tr.gmo uk.gmo
-
-CATALOGS = $(GMOFILES)
-CATOBJEXT = .gmo
-INSTOBJEXT = .mo
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	$(MSGFMT) -o $@ $<
-
-.po.cat:
-	sed -f $(PO2TBL) < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
-
-all: all-$(DO_NLS)
-
-all-yes: cat-id-tbl.c $(CATALOGS)
-all-no:
-
-util-linux.pot:
-	$(XGETTEXT) --default-domain=util-linux --directory=.. \
-	  --add-comments --keyword=_ --keyword=N_ \
-	  --files-from=POTFILES.in $(FOREIGN)
-	mv util-linux.po util-linux.pot
-
-cat-id-tbl.c: stamp-cat-id
-stamp-cat-id: util-linux.pot
-	rm -f cat-id-tbl.tmp
-	sed -f $(PO2TBL) util-linux.pot \
-		| sed -e "s/@PACKAGE NAME@/util-linux/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp cat-id-tbl.c; \
-	fi
-	rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
-install: install-data-$(DO_NLS)
-install-data-no: all
-install-data-yes: all
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  ../mkinstalldirs $$dir; \
-	  $(INSTALL_DATA) $$cat $$dir/util-linux$(INSTOBJEXT); \
-	  echo "installing $$cat as $$dir/util-linux$(INSTOBJEXT)"; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/util-linux$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/util-linux$(INSTOBJEXT).m"; \
-	  fi; \
-	done
-
-uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT).m; \
-	done
-
-cat-id-tbl.o: $(INTL)/libgettext.h
-
-clean:
-	rm -f core core.* *~ *.o cat-id-tbl.c cat-id-tbl.tmp
-
-distclean: clean
-	rm -f POTFILES *.gmo *.mo *.msg *.cat *.cat.m
-
-# also util-linux.pot is a generated file
-# however, the translation robot likes it
-
-# only for translators not using the robot
-update-po: 
-	rm -f util-linux.pot
-	$(MAKE) util-linux.pot
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po util-linux.pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
-	  fi; \
-	done
-
-POTFILES: 
-	./update-potfiles
-
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 000000000..22eddd193
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,384 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2005 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.14.4
+
+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@
+datadir = @prefix@/usr/share
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+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 -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# $(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 test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+	  --files-from=$(srcdir)/POTFILES.in \
+	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	  --msgid-bugs-address="$$msgid_bugs_address"
+	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) $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	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 \
+	  $(mkinstalldirs) $(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
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkinstalldirs) $(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 \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkinstalldirs) $(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) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$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 "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)
+	@:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
+
+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:
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 000000000..03a156659
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Adrian Bunk <bunk@stusta.de>
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = Adrian Bunk <bunk@stusta.de>
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/Makevars.template b/po/Makevars.template
new file mode 100644
index 000000000..32692ab4b
--- /dev/null
+++ b/po/Makevars.template
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c8429149a..7c5f8250d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,7 +10,6 @@ disk-utils/mkfs.cramfs.c
 disk-utils/mkfs.minix.c
 disk-utils/mkswap.c
 disk-utils/raw.c
-disk-utils/setfdprm.c
 fdisk/cfdisk.c
 fdisk/disksize.c
 fdisk/fdiskaixlabel.c
@@ -29,25 +28,19 @@ hwclock/cmos.c
 hwclock/hwclock.c
 hwclock/kd.c
 hwclock/rtc.c
-lib/carefulputc.c
 lib/env.c
-lib/err.c
 lib/md5.c
-lib/my_reboot.c
 lib/setproctitle.c
-lib/xstrncpy.c
 login-utils/agetty.c
 login-utils/checktty.c
 login-utils/chfn.c
 login-utils/chsh.c
-login-utils/cryptocard.c
 login-utils/initctl.c
 login-utils/islocal.c
 login-utils/last.c
 login-utils/login.c
 login-utils/mesg.c
 login-utils/newgrp.c
-login-utils/passwd.c
 login-utils/selinux_utils.c
 login-utils/setpwnam.c
 login-utils/shutdown.c
@@ -80,12 +73,13 @@ mount/mount.c
 mount/mount_guess_fstype.c
 mount/mount_guess_rootdev.c
 mount/nfsmount.c
+mount/nfsmount_clnt.c
+mount/nfsmount_xdr.c
 mount/pivot_root.c
 mount/realpath.c
 mount/sundries.c
 mount/swapon.c
 mount/umount.c
-mount/version.c
 mount/xmalloc.c
 partx/addpart.c
 partx/bsd.c
@@ -96,8 +90,9 @@ partx/gpt.c
 partx/partx.c
 partx/solaris.c
 partx/unixware.c
-rescuept/rescuept.c
-sys-utils/arch.c
+schedutils/chrt.c
+schedutils/ionice.c
+schedutils/taskset.c
 sys-utils/ctrlaltdel.c
 sys-utils/cytune.c
 sys-utils/dmesg.c
@@ -108,7 +103,6 @@ sys-utils/rdev.c
 sys-utils/readprofile.c
 sys-utils/renice.c
 sys-utils/setsid.c
-sys-utils/sln.c
 sys-utils/tunelp.c
 text-utils/col.c
 text-utils/colcrt.c
diff --git a/po/Rules-quot b/po/Rules-quot
new file mode 100644
index 000000000..9c2a995e3
--- /dev/null
+++ b/po/Rules-quot
@@ -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 $$ll -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 --git a/po/boldquot.sed b/po/boldquot.sed
new file mode 100644
index 000000000..4b937aa51
--- /dev/null
+++ b/po/boldquot.sed
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/“\1�/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“�/""/g
+s/“/“/g
+s/�/�/g
+s/‘/‘/g
+s/’/’/g
diff --git a/po/ca.gmo b/po/ca.gmo
new file mode 100644
index 000000000..8267f7f21
--- /dev/null
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index c39b726e7..1bcbd5508 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,6 +1,8 @@
 # translation of util-linux.po to Catalan
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright © 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Antoni Bella Perez <bella5@teleline.es>, 2002, 2003.
+# Jordi Mallach <jordi@gnu.org>, 2004, 2005.
+# Josep Puigdemont <josep@imatge-sintetica.com>, 2005
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided that this
@@ -9,20 +11,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2003-08-01 10:59+0200\n"
-"Last-Translator: Antoni Bella Perez <bella5@teleline.es>\n"
+"Project-Id-Version: util-linux-2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-31 20:23+0100\n"
+"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
 
 #: disk-utils/blockdev.c:62
 msgid "set read-only"
-msgstr "estableix a sols lectura"
+msgstr "estableix a només lectura"
 
 #: disk-utils/blockdev.c:63
 msgid "set read-write"
@@ -30,15 +31,15 @@ msgstr "estableix a lectura/escriptura"
 
 #: disk-utils/blockdev.c:66
 msgid "get read-only"
-msgstr "obtindre sols lectura"
+msgstr "obtingues només lectura"
 
 #: disk-utils/blockdev.c:69
 msgid "get sectorsize"
-msgstr "obtindre la mida del sector"
+msgstr "obtingues la mida del sector"
 
 #: disk-utils/blockdev.c:72
 msgid "get blocksize"
-msgstr "obtindre la mida del bloc"
+msgstr "obtingues la mida del bloc"
 
 #: disk-utils/blockdev.c:75
 msgid "set blocksize"
@@ -46,20 +47,19 @@ msgstr "estableix la mida del bloc"
 
 #: disk-utils/blockdev.c:78
 msgid "get 32-bit sector count"
-msgstr ""
+msgstr "obtingues el compte de sectors de 32 bits"
 
 #: disk-utils/blockdev.c:81
-#, fuzzy
 msgid "get size in bytes"
-msgstr "obtindre la mida"
+msgstr "obtingues la mida en octets"
 
 #: disk-utils/blockdev.c:84
 msgid "set readahead"
-msgstr "estableix 'readahead'"
+msgstr "estableix «readahead»"
 
 #: disk-utils/blockdev.c:87
 msgid "get readahead"
-msgstr "obtindre 'readahead'"
+msgstr "obtingues \"readahead\""
 
 #: disk-utils/blockdev.c:90
 msgid "flush buffers"
@@ -72,7 +72,7 @@ msgstr "torna a llegir la taula de particions"
 #: disk-utils/blockdev.c:103
 #, c-format
 msgid "Usage:\n"
-msgstr "Ús:\n"
+msgstr "Forma d'ús:\n"
 
 #: disk-utils/blockdev.c:105
 #, c-format
@@ -82,17 +82,17 @@ msgstr "  %s --report [dispositius]\n"
 #: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
-msgstr "  %s [-v|-q] comandaments dels dispositius\n"
+msgstr "  %s [-v|-q] ordres dispositius\n"
 
 #: disk-utils/blockdev.c:107
 #, c-format
 msgid "Available commands:\n"
-msgstr "Comandaments disponibles:\n"
+msgstr "Ordres disponibles:\n"
 
 #: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
-msgstr "%s: Comandament desconegut: %s\n"
+msgstr "%s: Ordre desconeguda: %s\n"
 
 #: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
@@ -102,27 +102,27 @@ msgstr "%s requereix un argument\n"
 #: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
-msgstr "%s ha tingut èxit.\n"
+msgstr "%s s'ha completat amb èxit.\n"
 
 #: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
-msgstr "%s: No pot obrir %s\n"
+msgstr "%s: no es pot obrir %s\n"
 
 #: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
-msgstr "%s: Error de ioctl en %s\n"
+msgstr "%s: s'ha produït un error d'ioctl en %s\n"
 
 #: disk-utils/blockdev.c:391
 #, c-format
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
-msgstr "RO    RA   SSZ   BSZ  Comença Sec.  Mida    Dispositiu\n"
+msgstr "RO    RA   SSZ   BSZ   SectInici    Mida    Dispositiu\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
-msgstr "ús:\n"
+msgstr "forma d'ús:\n"
 
 #: disk-utils/fdformat.c:31
 #, c-format
@@ -141,12 +141,13 @@ msgstr "S'està verificant... "
 
 #: disk-utils/fdformat.c:71
 msgid "Read: "
-msgstr "Llegeix: "
+msgstr "Lectura: "
 
 #: disk-utils/fdformat.c:73
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
-msgstr "Problema llegint el cilindre %d, s'esperava %d i s'ha llegit %d\n"
+msgstr ""
+"Hi ha un problema en llegir el cilindre %d, s'esperava %d i s'ha llegit %d\n"
 
 #: disk-utils/fdformat.c:79
 #, c-format
@@ -155,27 +156,26 @@ msgid ""
 "Continuing ... "
 msgstr ""
 "dades incorrectes al cilindre %d\n"
-"Continuant... "
+"S'està continuant... "
 
 #: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "ús: %s [ -n ] dispositiu\n"
+msgstr "forma d'ús: %s [ -n ] dispositiu\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
-msgstr "%s provinent de %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
+msgstr "%s des de %s\n"
 
 #: disk-utils/fdformat.c:130
 #, c-format
 msgid "%s: not a block device\n"
-msgstr "%s: No és un dispositiu de bloc\n"
+msgstr "%s: no és un dispositiu de bloc\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
@@ -184,17 +184,17 @@ msgstr "No es pot determinar l'actual tipus de format"
 #: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
-msgstr "%s cares, %d pistes, %d segons/pista. Capacitat total %d kB.\n"
+msgstr "Cara %s, %d pistes, %d segons/pista. Capacitat total %d kB.\n"
 
 #: disk-utils/fdformat.c:142
 msgid "Double"
-msgstr "Doble densitat"
+msgstr "Doble"
 
 #: disk-utils/fdformat.c:142
 msgid "Single"
-msgstr "Densitat simple"
+msgstr "Simple"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -203,113 +203,118 @@ msgid ""
 " -v         be more verbose\n"
 " file       file to test\n"
 msgstr ""
-"ús: %s [-hv] [-x dir] fitxer\n"
+"forma d'ús: %s [-hv] [-x dir] fitxer\n"
 " -h         mostra aquesta ajuda\n"
-" -x dir     extreu a dins del dir\n"
+" -x dir     extreu dins del directori dir\n"
 " -v         mostra més missatges\n"
 " fitxer     fitxer a comprovar\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
-msgstr "%s: Error %d al descomprimir! %p(%d)\n"
+msgstr "%s: s'ha produït un error %d en descomprimir! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "%s: Error en la mida de l'enllaç simbòlic `%s'\n"
+msgstr "%s: hi ha un error en la mida de l'enllaç simbòlic «%s»\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
-msgstr "  descomprimint el bloc en %ld a %ld (%ld)\n"
+msgstr "  s'està descomprimint el bloc de %ld a %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
-msgstr "%s: Mode fals en `%s' (%o)\n"
+msgstr "%s: mode erroni a «%s» (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
-msgstr "  buit en %ld (%d)\n"
+msgstr "  forat a %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: No bloc (%ld) octets\n"
 
-#: disk-utils/fsck.cramfs.c:353
+# "No mida" no és gens correcte... jm
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
-msgstr "%s: No mida (%ld vs %ld) octets\n"
+msgstr "%s: Octets sense mida (%ld vs %ld)\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
-msgstr "%s: cramfs no vàlid, longitud de la ruta errònia\n"
+msgstr "%s: el cramfs és invàlid, la longitud del camí és errònia\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
-msgstr "%s: Compilat sense suport per a -x\n"
+msgstr "%s: compilat sense implementar -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
-msgstr "%s: Atenció, no es pot determinar la mida del sistema de fitxers \n"
+msgstr "%s: avís; no es pot determinar la mida del sistema de fitxers \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
-msgstr "%s no és un dispositiu de bloc o un fitxer\n"
+msgstr "%s no és cap dispositiu de bloc o un fitxer\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
-msgstr "%s: cramfs no vàlid, longitud del fitxer massa curta\n"
+msgstr "%s: el cramfs és invàlid, la longitud del fitxer és massa curta\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
-msgstr "%s: cramfs no vàlid, màgia errònia\n"
+msgstr "%s: el cramfs és invàlid, la màgia és errònia\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
-msgstr "%s: Atenció; longitud del fitxer massa llarga, imatge desplaçada?\n"
+msgstr ""
+"%s: avís; la longitud del fitxer és massa llarga, potser és una imatge amb "
+"farciment?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
-msgstr "%s: cramfs no vàlid, error del crc\n"
+msgstr "%s: el cramfs és invàlid, error de crc\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
-msgstr "%s: Atenció; imatge cramfs antiga, no és CRC\n"
+msgstr "%s: avís; la imatge cramfs és antiga, no té CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
-msgstr "%s: cramfs no vàlid, superbloc dolent\n"
+msgstr "%s: el cramfs és invàlid, el superbloc és erroni\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
-"%s: cramfs no vàlid, el final de les dades als directoris (%ld)\n"
-"és diferent del començament de les dades dels fitxers (%ld)\n"
+"%s: el cramfs és invàlid, el final de les dades als directoris (%ld)\n"
+"és diferent de l'inici de les dades dels fitxers (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
-msgstr "%s: cramfs no vàlid, desplaçament no vàlid de les dades dels fitxers\n"
+msgstr ""
+"%s: el cramfs és invàlid, hi ha un desplaçament invàlid de les dades dels "
+"fitxers\n"
 
 #: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Ús: %s [-larvsmf] /dev/_nom_\n"
+msgstr "Forma d'ús: %s [-larvsmf] /dev/nom\n"
 
 #: disk-utils/fsck.minix.c:293
 #, c-format
@@ -318,36 +323,37 @@ msgstr "%s està muntat.\t "
 
 #: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
-msgstr "N'esteu segur que desitgeu continuar?"
+msgstr "Esteu segur de voler continuar?"
 
 #: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
-msgstr "comprovació avortada.\n"
+msgstr "s'ha avortat la comprovació.\n"
 
 #: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr "Número de zona < FIRSTZONE en el fitxer `%s'."
+msgstr "Número de zona < FIRSTZONE en el fitxer «%s»."
 
 #: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr "Número de zona >= ZONES en el fitxer `%s'."
+msgstr "Número de zona >= ZONES en el fitxer «%s»."
 
 #: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
-msgstr "Elimina bloc"
+msgstr "Elimina el bloc"
 
 #: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr "Error de lectura: No es pot cercar el bloc en el fitxer '%s'\n"
+msgstr ""
+"S'ha produït un error de lectura: no es pot cercar el bloc al fitxer «%s»\n"
 
 #: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr "Error de lectura: Bloc incorrecte en el fitxer '%s'\n"
+msgstr "S'ha produït un error de lectura: bloc erroni al fitxer «%s»\n"
 
 #: disk-utils/fsck.minix.c:389
 #, c-format
@@ -355,21 +361,22 @@ msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
-"Error intern: S'està intentant escriure un bloc incorrecte\n"
-"El requeriment d'escriptura serà ignorat\n"
+"S'ha produït un error intern: s'està intentant escriure un bloc erroni\n"
+"S'ha ignorat la petició d'escriptura\n"
 
 #: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
-msgstr "error cercant en write_block"
+msgstr "s'ha produït un error en fer una cerca en write_block"
 
 #: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr "Error d'escriptura: Bloc incorrecte en el fitxer '%s'\n"
+msgstr ""
+"S'ha produït un error d'escriptura: hi ha un bloc incorrecte al fitxer «%s»\n"
 
 #: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
-msgstr "error cercant en write_super_block"
+msgstr "s'ha produït un error en fer una cerca en write_super_block"
 
 #: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
@@ -377,7 +384,7 @@ msgstr "no es pot escriure el superbloc"
 
 #: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
-msgstr "No es pot escriure el mapa de ínodes"
+msgstr "No es pot escriure el mapa de nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
@@ -385,11 +392,11 @@ msgstr "No es pot escriure el mapa de zona"
 
 #: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
-msgstr "No es poden escriure els ínodes"
+msgstr "No es poden escriure els nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:557
 msgid "seek failed"
-msgstr "error cercant"
+msgstr "la cerca ha fallat"
 
 #: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
@@ -401,7 +408,7 @@ msgstr "número màgic incorrecte en el superbloc"
 
 #: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
-msgstr "Sols es suporten blocs o zones de 1k"
+msgstr "Només es suporten blocs o zones de 1k"
 
 #: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
@@ -413,23 +420,25 @@ msgstr "Camp s_zmap_blocks incorrecte en el superbloc"
 
 #: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
-msgstr "No es pot assignar memòria temporal per al mapa de ínodes"
+msgstr ""
+"No es pot assignar memòria intermèdia per al mapa de nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
-msgstr "No es pot assignar memòria temporal per als ínodes"
+msgstr "No es pot assignar memòria intermèdia per als nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
-msgstr "No es pot assignar memòria temporal per al nombre de ínodes"
+msgstr ""
+"No es pot assignar memòria intermèdia per al nombre de nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
-msgstr "No es pot assignar memòria temporal per al nombre de zones"
+msgstr "No es pot assignar memòria intermèdia per al nombre de zones"
 
 #: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
-msgstr "No es pot llegir el mapa de ínodes"
+msgstr "No es pot llegir el mapa de nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
@@ -437,7 +446,7 @@ msgstr "No es pot llegir el mapa de zones"
 
 #: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
-msgstr "No es poden llegir els ínodes"
+msgstr "No es poden llegir els nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:612
 #, c-format
@@ -447,7 +456,7 @@ msgstr "Atenció: Firstzone != Norm_firstzone\n"
 #: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
-msgstr "%ld ínodes\n"
+msgstr "%ld nodes d'identificació\n"
 
 #: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
@@ -457,17 +466,17 @@ msgstr "%ld blocs\n"
 #: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
-msgstr "Primerazonadades=%ld (%ld)\n"
+msgstr "Primera zona de dades=%ld (%ld)\n"
 
 #: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
-msgstr "Midadelazona=%d\n"
+msgstr "Mida de la zona=%d\n"
 
 #: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
-msgstr "Midamàxima=%ld\n"
+msgstr "Mida màxima=%ld\n"
 
 #: disk-utils/fsck.minix.c:622
 #, c-format
@@ -480,42 +489,44 @@ msgid ""
 "namelen=%d\n"
 "\n"
 msgstr ""
-"Longituddelnom=%d\n"
+"longitud del nom=%d\n"
 "\n"
 
 #: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
-msgstr "L'ínode %d està marcat com a no usat, però és usat pel fitxer '%s'\n"
+msgstr ""
+"El node d'identificació %d està marcat com a no usat, però és usat pel "
+"fitxer «%s»\n"
 
 #: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
-msgstr "Marcar en ús"
+msgstr "Marca'l en ús"
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
-msgstr "El fitxer `%s' té el mode %05o\n"
+msgstr "El fitxer «%s» té el mode %05o\n"
 
 #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 #, c-format
 msgid "Warning: inode count too big.\n"
-msgstr "Atenció: Nombre d'ínodes massa gran.\n"
+msgstr "Avís: el nombre de nodes d'identificació és massa gran.\n"
 
 #: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
-msgstr "l'ínode arrel no és un directori"
+msgstr "el node d'identificació arrel no és un directori"
 
 #: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr "El bloc ja ha estat emprat anteriorment. Ara està en el fitxer `%s'."
+msgstr "El bloc ja ha estat emprat anteriorment. Ara està en el fitxer \"%s\"."
 
 #: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
 #: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
 #: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
-msgstr "Esborra"
+msgstr "Neteja"
 
 #: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
@@ -524,13 +535,14 @@ msgstr "El bloc %d en el fitxer `%s' està marcat com a no usat."
 
 #: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
-msgstr "Correcte"
+msgstr "Corregeix"
 
 #: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
-"El directori `%s' conté un nombre d'ínode incorrecte per al fitxer '%.*s'."
+"El directori `%s' conté un nombre de nodes d'identificació incorrecte per al "
+"fitxer «%.*s»."
 
 #: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
@@ -539,22 +551,22 @@ msgstr " Elimina"
 #: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr "`%s': Directori incorrecte: '.' no és el primer\n"
+msgstr "«%s»: directori incorrecte: «.» no és el primer\n"
 
 #: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
-msgstr "`%s': Directori incorrecte: '..' no és el segon\n"
+msgstr "«%s»: directori incorrecte: «..» no és el segon\n"
 
 #: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr "%s: Directori incorrecte: '.' no és el primer\n"
+msgstr "%s: directori incorrecte: «.» no és el primer\n"
 
 #: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
-msgstr "%s: Directori incorrecte: '..' no és el segon\n"
+msgstr "%s: directori incorrecte: «..» no és el segon\n"
 
 #: disk-utils/fsck.minix.c:1066
 msgid "internal error"
@@ -563,31 +575,35 @@ msgstr "error intern"
 #: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
-msgstr "%s: Directori incorrecte: Mida < 32"
+msgstr "%s: directori incorrecte: mida < 32"
 
 #: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
-msgstr "error cercant en bad_zone"
+msgstr "s'ha produït un error en cercar a bad_zone"
 
 #: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
-msgstr "No s'ha esborrat el mode de l'ínode %d."
+msgstr "No s'ha esborrat el mode del node d'identificació %d."
 
 #: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
-msgstr "L'ínode %d no s'usa; marcat com en ús en el mapa de bits."
+msgstr ""
+"El node d'identificació %d no s'usa; s'ha marcat com a usat en el mapa de "
+"bits."
 
 #: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
-msgstr "S'està usant el ínode %d; marcat com a no en ús en el mapa de bits."
+msgstr ""
+"S'està usant el node d'identificació %d; marcat com a en desús en el mapa de "
+"bits."
 
 #: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
-msgstr "�node %d (mode = %07o), i_nlinks=%d, comptats=%d."
+msgstr "Node d'identificació %d (mode = %07o), i_nlinks=%d, comptats=%d."
 
 #: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
@@ -596,21 +612,21 @@ msgstr "Estableix i_nlinks als comptats"
 #: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
-msgstr "Zona %d: Marcada com en ús; cap fitxer no l'utilitza."
+msgstr "Zona %d: marcada com a en ús; cap fitxer no l'utilitza."
 
 #: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
-msgstr "Elimina marca"
+msgstr "Elimina la marca"
 
 #: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Zona %d: En ús, comptada=%d\n"
+msgstr "Zona %d: en ús, comptada=%d\n"
 
 #: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr "Zona %d: No en ús, comptada=%d\n"
+msgstr "Zona %d: no en ús, comptada=%d\n"
 
 #: disk-utils/fsck.minix.c:1181
 msgid "Set"
@@ -619,20 +635,20 @@ msgstr "Estableix"
 #: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
 #: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
-msgstr "mida d'ínode incorrecte"
+msgstr "mida de node d'identificació incorrecte"
 
 #: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
-msgstr "mida d'ínode v2 incorrecte"
+msgstr "mida de node d'identificació v2 incorrecte"
 
 #: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
-msgstr "es necessita una terminal per a reparacions interactives"
+msgstr "es necessita un terminal per a reparacions interactives"
 
 #: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
-msgstr "No es pot obrir '%s'"
+msgstr "no es pot obrir '%s'"
 
 #: disk-utils/fsck.minix.c:1301
 #, c-format
@@ -642,13 +658,12 @@ msgstr "%s està net; no es comprova.\n"
 #: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
-msgstr "Forçant comprovació del sistema de fitxers en %s.\n"
+msgstr "S'està forçant la comprovació del sistema de fitxers a %s.\n"
 
 #: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr ""
-"Al sistema de fitxers en %s hi han elements estranys, s'han de comprovar.\n"
+msgstr "Hi ha elements estranys al sistema de fitxers %s, s'ha de comprovar.\n"
 
 #: disk-utils/fsck.minix.c:1333
 #, c-format
@@ -657,7 +672,7 @@ msgid ""
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 "\n"
-"%6ld ínodes usats (%ld%%)\n"
+"%6ld nodes d'identificació usats (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1338
 #, c-format
@@ -701,32 +716,32 @@ msgstr ""
 #: disk-utils/isosize.c:129
 #, c-format
 msgid "%s: failed to open: %s\n"
-msgstr "%s: Error a l'obrir: %s\n"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
 
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr "%s: Error cercant en %s\n"
+msgstr "%s: s'ha produït un error en cercar a %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
 msgid "%s: read error on %s\n"
-msgstr "%s: Llegint l'errada en %s\n"
+msgstr "%s: s'ha produït un error de lectura a %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
 msgid "sector count: %d, sector size: %d\n"
-msgstr "sector número: %d, mida del sector: %d\n"
+msgstr "compte de sectors: %d, mida del sector: %d\n"
 
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr "%s: Error a l'analitzar l'opció\n"
+msgstr "%s: s'ha produït un error en analitzar l'opció\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr "Ús: %s [-x] [-d <núm>] imatge-iso9660\n"
+msgstr "Forma d'ús: %s [-x] [-d <núm>] imatge-iso9660\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -734,12 +749,12 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
-"Ús: %s [-v] [-N núm_de_ínodes] [-V nom_volumen]\n"
+"Forma d'ús: %s [-v] [-N nr_de_nodes_d'identificació] [-V nom_volum]\n"
 "       [-F nom_sis._fitx.] dispositiu [quants_blocs]\n"
 
 #: disk-utils/mkfs.bfs.c:135
 msgid "volume name too long"
-msgstr "nom del volumen massa llarg"
+msgstr "nom del volum massa llarg"
 
 #: disk-utils/mkfs.bfs.c:142
 msgid "fsname name too long"
@@ -748,7 +763,7 @@ msgstr "nom del sistema de fitxers massa llarg"
 #: disk-utils/mkfs.bfs.c:167
 #, c-format
 msgid "cannot stat device %s"
-msgstr "No es pot fer `stat' sobre el dispositiu %s"
+msgstr "no es pot fer \"stat\" al dispositiu %s"
 
 #: disk-utils/mkfs.bfs.c:171
 #, c-format
@@ -763,7 +778,7 @@ msgstr "%s no es pot obrir"
 #: disk-utils/mkfs.bfs.c:187
 #, c-format
 msgid "cannot get size of %s"
-msgstr "no es pot aconseguir la mida de %s"
+msgstr "no es pot obtenir la mida de %s"
 
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
@@ -772,14 +787,14 @@ msgstr "el nombre de blocs es massa gran, el màxim és de %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
-msgstr "masses ínodes; el màxim és de 512"
+msgstr "massa nodes d'identificació; el màxim és de 512"
 
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
 msgstr "no hi ha prou espai, com a mínim es necessiten %lu blocs"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositiu: %s\n"
@@ -787,7 +802,7 @@ msgstr "Dispositiu: %s\n"
 #: disk-utils/mkfs.bfs.c:229
 #, c-format
 msgid "Volume: <%-6s>\n"
-msgstr "Volumen: <%-6s>\n"
+msgstr "Volum: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
@@ -802,12 +817,12 @@ msgstr "MidaBloc: %d\n"
 #: disk-utils/mkfs.bfs.c:233
 #, c-format
 msgid "Inodes: %d (in 1 block)\n"
-msgstr "�nodes: %d (al 1 bloc)\n"
+msgstr "Nodes d'identificació: %d (al 1 bloc)\n"
 
 #: disk-utils/mkfs.bfs.c:236
 #, c-format
 msgid "Inodes: %d (in %ld blocks)\n"
-msgstr "�nodes: %d (als %ld blocs)\n"
+msgstr "Nodes d'identificació: %d (als %ld blocs)\n"
 
 #: disk-utils/mkfs.bfs.c:238
 #, c-format
@@ -817,56 +832,57 @@ msgstr "Blocs: %ld\n"
 #: disk-utils/mkfs.bfs.c:239
 #, c-format
 msgid "Inode end: %d, Data end: %d\n"
-msgstr "Últim ínode: %d, Dada final: %d\n"
+msgstr "Últim node d'identificació: %d, Dada final: %d\n"
 
 #: disk-utils/mkfs.bfs.c:244
 msgid "error writing superblock"
-msgstr "error escrivint superbloc"
+msgstr "s'ha produït un error en escriure el superbloc"
 
 #: disk-utils/mkfs.bfs.c:264
 msgid "error writing root inode"
-msgstr "error escrivint ínode arrel"
+msgstr "s'ha produït un error en escriure el node d'identificació arrel"
 
 #: disk-utils/mkfs.bfs.c:269
 msgid "error writing inode"
-msgstr "error escrivint ínode"
+msgstr "s'ha produït un error en escriure el node d'identificació"
 
 #: disk-utils/mkfs.bfs.c:272
 msgid "seek error"
-msgstr "error cercant"
+msgstr "s'ha produït un error en cercar"
 
 #: disk-utils/mkfs.bfs.c:278
 msgid "error writing . entry"
-msgstr "error escrivint . entrada"
+msgstr "s'ha produït un error en escriure l'entrada ."
 
 #: disk-utils/mkfs.bfs.c:282
 msgid "error writing .. entry"
-msgstr "error escrivint .. entrada"
+msgstr "s'ha produït un error en escriure l'entrada .."
 
 #: disk-utils/mkfs.bfs.c:286
 #, c-format
 msgid "error closing %s"
-msgstr "error tancant %s"
+msgstr "s'ha produït un error en tancar %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
-"Ús: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu [mida]\n"
+"Forma d'ús: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu "
+"[mida]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr "%s: Memòria esgotada\n"
+msgstr "%s: No hi ha prou memòria\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versió %s (%s)\n"
 
 #: disk-utils/mkfs.cramfs.c:124
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
 "outfile\n"
@@ -883,20 +899,22 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"ús: %s [-v] [-b blksz] [-e edició] [-i fitxer] [-n nom] nom_dir "
-"fitxer_eixida\n"
-" -h         mostra aquesta ajuda\n"
-" -v         més missatges\n"
-" -E         converteix els avisos en errors (estatus d'eixida no cero)\n"
-" -e edició  estableix el nombre d'edició (part de fsid)\n"
-" -i fitxer  insereix una imatge de fitxer al sistema de fitxers (requereix\n"
-"            >= 2.4.0)\n"
-" -n nom     estableix el nom del sistema de fitxers cramfs\n"
-" -p         desplaça %d octets per al codi d'arrencada\n"
-" -s         ordena les entrades de directori (opció antiga, ignorar)\n"
-" -z         crear buits explícits (requereix >= 2.3.39)\n"
-" nom_dir    arrel del sistema de fitxers que serà comprimit\n"
-" fit._eix.  fitxer d'eixida\n"
+"forma d'ús: %s [-h] [-v] [-b blksz] [-e edició] [-i fitxer] [-n nom] nom_dir "
+"sortida\n"
+" -h        mostra aquesta ajuda\n"
+" -v        més missatges\n"
+" -E        converteix els avisos en errors (estat de sortida no zero)\n"
+" -b        utilitza aquesta mida de bloc, ha de ser igual que la mida\n"
+"           de pàgina\n"
+" -e edició estableix el número d'edició (part de fsid)\n"
+" -i fitxer insereix una imatge de fitxer al sistema de fitxers\n"
+"           (requereix >= 2.4.0)\n"
+" -n nom    estableix el nom del sistema de fitxers cramfs\n"
+" -p        desplaça %d octets per al codi d'arrencada\n"
+" -s        ordena les entrades de directori (opció antiga, s'ignora)\n"
+" -z        crea forats explícits (requereix >= 2.3.39)\n"
+" nom_dir   arrel del sistema de fitxers que es comprimirà\n"
+" sortida   fitxer de sortida\n"
 
 #: disk-utils/mkfs.cramfs.c:335
 #, c-format
@@ -904,14 +922,14 @@ msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
-"Trobo que és massa llarg (%u octets), nom del fitxer `%s'.\n"
-" Si us plau, incrementeu MAX_INPUT_NAMELEN en mkcramfs.c i recompileu. "
-"Sortint.\n"
+"S'ha trobat un nom de fitxer '%2$s' molt llarg (%1$u octets).\n"
+" Incrementeu MAX_INPUT_NAMELEN a mkcramfs.c i recompileu-lo. S'està "
+"sortint.\n"
 
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
 msgid "filesystem too big.  Exiting.\n"
-msgstr "sistema de fitxers massa gran.  Sortint.\n"
+msgstr "el sistema de fitxers és massa gran. S'està sortint.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
@@ -919,14 +937,13 @@ msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
-"S'han excedit les MAXENTRIES. Incrementeu aquest valor en mkcramfs.c i\n"
-"recompileu.  Sortint.\n"
+"S'ha excedit MAXENTRIES. Incrementeu aquest valor a mkcramfs.c i\n"
+"recompileu. S'està sortint.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
-msgstr "CARAM: Bloc \"comprimit\" a > 2*longituddelbloc (%ld)\n"
+msgstr "Ep: bloc \"comprimit\" a > 2*longituddelbloc (%ld)\n"
 
 #: disk-utils/mkfs.cramfs.c:641
 #, c-format
@@ -939,13 +956,13 @@ msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
 "image size is %uMB.  We might die prematurely.\n"
 msgstr ""
-"atenció: S'estima que la mida requerida (cota superior) és %LdMB, però la "
-"mida màxima de la imatge és %uMB. Podria abortar prematurament.\n"
+"avís: s'estima que la mida requerida (cota superior) és d %LdMB, però la "
+"mida màxima de la imatge és %uMB. Es podria sortir prematurament.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
-msgstr "Incloguent: %s\n"
+msgstr "S'està incloent: %s\n"
 
 #: disk-utils/mkfs.cramfs.c:866
 #, c-format
@@ -960,7 +977,7 @@ msgstr "Tot: %d kilooctets\n"
 #: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
-msgstr "Super bloc: %d octets\n"
+msgstr "Súper bloc: %d octets\n"
 
 #: disk-utils/mkfs.cramfs.c:886
 #, c-format
@@ -970,47 +987,43 @@ msgstr "CRC: %x\n"
 #: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
-msgstr "no hi ha prou espai per a l'imatge ROM (assignat %Ld, emprat %d)\n"
+msgstr "no hi ha prou espai per a la imatge ROM (assignats %Ld, emprats %d)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
-msgstr "ha fallat l'escriptura de l'imatge ROM (%d %d)\n"
+msgstr "No és possible escriure la imatge ROM (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "atenció: Els noms dels fitxers es trunquen a 255 octets.\n"
+msgstr "avís: els noms de fitxer es trunquen a 255 octets.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 #, c-format
 msgid "warning: files were skipped due to errors.\n"
-msgstr "atenció: S'han saltat fitxers degut a errors.\n"
+msgstr "avís: s'han saltat fitxers degut a errors.\n"
 
 #: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
-msgstr "atenció: Les mides es trunquen a %luMB (menys 1 octet).\n"
+msgstr "avís: la mida dels fitxers es trunca a %luMB (menys 1 octet).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
-"atenció: Els uids es trunquen a %u bits,  (Podria ser un problema de "
-"seguretat).\n"
+"avís: els identificadors d'usuari (uid) es trunquen a %u bits,  (podria ser "
+"un problema de seguretat).\n"
 
 #: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
-"atenció: Els gids es trunquen a %u bits.  (Podria ser un problema de "
-"seguretat).\n"
+"avís: els identificadors de grup (gid) es trunquen a %u bits.  (Podria ser "
+"un problema de seguretat).\n"
 
 #: disk-utils/mkfs.cramfs.c:933
 #, c-format
@@ -1018,65 +1031,64 @@ msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
 "that some device files will be wrong.\n"
 msgstr ""
-"ATENCIÓ: Els nombres de dispositiu es trunquen a %u bits.  Amb seguretat "
-"que\n"
-"es deu a fitxers de dispositius erronis.\n"
+"AV�S: els nombres de dispositiu es trunquen a %u bits. És gairebé segur que\n"
+"això provocarà que alguns dispositius de fitxers siguin erronis.\n"
 
 #: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr "Ús: %s [-c | -l nom_fitxer] [-nXX] [-iXX] /dev/_nom_ [blocs]\n"
+msgstr "Forma d'ús: %s [-c | -l nom_fitxer] [-nXX] [-iXX] /dev/nom [blocs]\n"
 
 #: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
-msgstr "%s està muntat; aquí no es crearà un sistema de fitxers!"
+msgstr "%s ja està muntat; no s'hi crearà cap sistema de fitxers."
 
 #: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
-msgstr "Error cercant el bloc d'arrencada en write_tables"
+msgstr "s'ha produït un error en cercar el bloc d'arrencada a write_tables"
 
 #: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
-msgstr "No es pot esborrar el sector d'arrencada"
+msgstr "no s'ha pogut netejar el sector d'arrencada"
 
 #: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
-msgstr "Error cercant en write_tables"
+msgstr "s'ha produït un error en cercar a write_tables"
 
 #: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
-msgstr "No es pot escriure el mapa dels ínodes"
+msgstr "no s'ha pogut escriure el mapa dels nodes d'identificació"
 
 #: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
-msgstr "No es pot escriure el mapa de zones"
+msgstr "no s'ha pogut escriure el mapa de zones"
 
 #: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
-msgstr "No es poden escriure els ínodes"
+msgstr "no s'ha pogut escriure els nodes d'identificació"
 
 #: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
-msgstr "Error escrivint en write_block"
+msgstr "no s'ha pogut escriure a write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
-msgstr "Hi han masses blocs incorrectes"
+msgstr "hi ha massa blocs incorrectes"
 
 #: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
-msgstr "No hi han prous blocs correctes"
+msgstr "no hi ha prou blocs correctes"
 
 #: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
-msgstr "No es pot assignar memòria temporal per als mapes"
+msgstr "no s'ha pogut assignar memòria intermèdia per als mapes"
 
 #: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
-msgstr "No és possible assignar memòria temporal per als ínodes"
+msgstr ""
+"no s'ha pogut assignar memòria intermèdia per als nodes d'identificació"
 
 #: disk-utils/mkfs.minix.c:512
 #, c-format
@@ -1084,27 +1096,27 @@ msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
-"Midamàx.=%ld\n"
+"Mida_màx.=%ld\n"
 "\n"
 
 #: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
-msgstr "Error cercant durant la comprovació de blocs"
+msgstr "no s'ha pogut cercar durant la comprovació de blocs"
 
 #: disk-utils/mkfs.minix.c:534
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
-msgstr "Valors estranys en do_check: Probablement hi han errors\n"
+msgstr "Hi ha valors estranys a do_check: probablement hi ha errors\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
-msgstr "Error cercant en check_blocks"
+msgstr "no s'ha pogut cercar a check_blocks"
 
 #: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
-"Blocs incorrectes abans de l'àrea de dades: No es pot crear el sistema de "
-"fitxers"
+"blocs incorrectes abans de l'àrea de dades: no s'ha pogut crear el sistema "
+"de fitxers"
 
 #: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
@@ -1123,7 +1135,7 @@ msgstr "no es pot obrir el fitxer de blocs incorrectes"
 #: disk-utils/mkfs.minix.c:674
 #, c-format
 msgid "strtol error: number of blocks not specified"
-msgstr "error de strtol: No s'han especificat el nombre de blocs"
+msgstr "error a strtol: no s'han especificat el nombre de blocs"
 
 #: disk-utils/mkfs.minix.c:704
 #, c-format
@@ -1138,109 +1150,112 @@ msgstr "no es pot fer stat per a %s"
 #: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "no s'intentarà crear el sistema de fitxers en '%s'"
+msgstr "no s'intentarà crear cap sistema de fitxers a '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr "la mida de la pàgina %d especificada pel usuari es incorrecte\n"
+msgstr "La mida de la pàgina que ha especificat l'usuari, %d, no és correcte\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
-"S'utilitza la mida de la pàgina %d especificada pel usuari, en comptes dels "
-"valors del sistema %d/%d\n"
+"S'està fent servir la mida de la pàgina %d especificada per l'usuari, en "
+"comptes dels valors del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "Assumint que la mida de les pàgines és de %d (no %d)\n"
+msgstr "S'està assumint que la mida de les pàgines és de %d (i no %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
+"La mida de la capçalera d'intercanvi és errònia, no s'ha escrit cap "
+"etiqueta.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "S'ha truncat l'etiqueta.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "etiqueta"
+msgstr "sense etiqueta, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "sense uuid\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr "Ús: %s [-c] [-v0|-v1] [-pMIDA_PÀG] /dev/_nom_ [blocs]\n"
+msgstr ""
+"Forma d'ús: %s [-c] [-v0|-v1] [-pMIDAPÀG] [-L etiqueta] /dev/_nom_ [blocs]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
-msgstr "hi han masses pàgines incorrectes"
+msgstr "hi ha massa pàgines incorrectes"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
-msgstr "Memòria esgotada"
+msgstr "S'ha esgotat la memòria"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "una pàgina incorrecta\n"
 
-#: disk-utils/mkswap.c:438
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:437
+#, c-format
 msgid "%lu bad pages\n"
-msgstr "%d pàgines incorrectes\n"
+msgstr "%lu pàgines incorrectes\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
-msgstr "%s: Error: No heu especificat a on està l'espai d'intercanvi?\n"
+msgstr "%s: error: no es pot especificar l'espai d'intercanvi enlloc?\n"
 
-#: disk-utils/mkswap.c:592
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:591
+#, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
-msgstr "%s: Error: La mida %ld es superior a la mida del dispositiu %d\n"
+msgstr "%s: error: la mida %lu es més gran que a la mida del dispositiu %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
-msgstr "%s: Error: Versió desconeguda %d\n"
+msgstr "%s: error: versió desconeguda %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr "%s: Error: L'espai d'intercanvi ha de tindre com a mínim %ldkB\n"
+msgstr "%s: error: l'espai d'intercanvi ha de tenir com a mínim %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr "%s: Atenció: L'espai d'intercanvi s'ha truncat en %ldkB\n"
+msgstr "%s: avís: l'espai d'intercanvi s'ha truncat a %ldkB\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: Error: No heu especificat a on està l'espai d'intercanvi?\n"
+msgstr "%s: error: etiqueta només amb espai d'intercanvi v1\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "No s'intentarà crear el dispositiu d'intercanvi en '%s'"
+msgstr "No s'intentarà crear cap dispositiu d'intercanvi a '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
-msgstr "fatal: No es pot llegir la primera pàgina"
+msgstr "fatal: no es pot llegir la primera pàgina"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1248,128 +1263,90 @@ msgid ""
 "No swap created. If you really want to create swap v0 on that device, use\n"
 "the -f option to force it.\n"
 msgstr ""
-"%s: El dispositiu '%s' conté una etiqueta de disc Sun vàlida.\n"
-"Això probablement significa que crear un espai d'intercanvi v0 destruirà\n"
-"la taula de particions. No s'ha creat l'espai d'intercanvi. Si de veres\n"
-"desitgeu crear-lo en aquest dispositiu, useu l'opció -f per a forçar-ho.\n"
+"%s: el dispositiu '%s' conté una etiqueta de disc Sun vàlida.\n"
+"Això probablement significa que si es crea un espai d'intercanvi v0, es\n"
+"destruirà la taula de particions.\n"
+"No s'ha creat l'espai d'intercanvi. Si de realment voleu crear un espai\n"
+"d'intercanvi v0 en aquest dispositiu, useu l'opció -f per a forçar-ho.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
-msgstr "No es pot configurar l'espai d'intercanvi: No es pot llegir"
+msgstr "No s'ha pogut configurar l'espai d'intercanvi: no es pot llegir"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "Configurant l'espai d'intercanvi versió %d, mida = %llu kB\n"
+msgstr "S'està configurant l'espai d'intercanvi versió %d, mida = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
-msgstr "No es pot rebobinar el dispositiu d'intercanvi"
+msgstr "no s'ha pogut rebobinar el dispositiu d'intercanvi"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
-msgstr "no es pot escriure la pàgina de la firma"
+msgstr "no s'ha pogut escriure la pàgina de la signatura"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
-msgstr "fsync ha fallat"
-
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Número no vàlid: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Error de sintaxi: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Paràmetre no establert: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] nom del dispositiu\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] dispositiu mida sectors capçals pistes stretch interval tassa "
-"spec1 format_interval\n"
+msgstr "no s'ha pogut fer fsync"
 
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] dispositiu\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] dispositiu\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilitzable"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Espai lliure"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
-#, fuzzy
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
-msgstr "Linux XFS"
+msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
-msgstr "S'ha modificat el disc.\n"
+msgstr "El disc s'ha modificat.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
-"Reinicieu el sistema per a assegurar-vos de que la taula de particions ha "
-"estat actualitzada correctament.\n"
+"Arrenqueu de nou el sistema per a assegurar-vos de que la taula de "
+"particions s'ha actualitzat correctament.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1378,817 +1355,794 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 "\n"
-"ATENCIÓ: Si heu creat o modificat alguna de les\n"
-"particions de DOS 6.x, si us plau consulteu la pàgina\n"
-"del manual de cfdisk per a informació addicional.\n"
+"ATENCIÓ: Si heu creat o modificat alguna partició\n"
+"DOS 6.x, consulteu la pàgina del manual de cfdisk\n"
+"per a informació addicional.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERROR FATAL"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
-msgstr "Premeu una tecla per a sortir de cfdisk"
+msgstr "Premeu una tecla per a sortir del cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
-msgstr "Error accedint a la unitat de disc"
+msgstr "No s'ha pogut cercar a la unitat de disc"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
-msgstr "No es pot llegir la unitat de disc"
+msgstr "No s'ha pogut llegir la unitat de disc"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
-msgstr "No es pot escriure en la unitat de disc"
+msgstr "No s'ha pogut escriure a la unitat de disc"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
-msgstr "Hi han masses particions"
+msgstr "Hi ha massa particions"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "La partició comença abans del sector 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "La partició acaba abans del sector 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "La partició comença despres de la fí del disc"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "La partició acaba despres de la fí del disc"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partició acaba en l'últim cilindre parcial"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
-msgstr "les particions lògiques no estan en un ordre de disc"
+msgstr "les particions lògiques no estan en l'ordre del disc"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
-msgstr "solapament de particions lògiques"
+msgstr "les particions lògiques s'encavalquen"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
-msgstr "solapament de les particions lògiques ampliades"
+msgstr "les particions lògiques ampliades s'encavalquen"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!!! Error intern al crear una unitat lògica sense partició estesa !!!!"
+"!!!! Error intern en crear una unitat lògica sense partició estesa !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
-"No es pot crear una unitat lògica aquí; es crearan dos particions esteses"
+"No s'ha pogut crear cap unitat lògica; es crearan dues particions esteses"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
-msgstr "�tem del menú massa llarg; l'aspecte del menú pot ser estrany."
+msgstr "L'element del menú és massa llarg; l'aspecte del menú pot ser estrany."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "Menú sense direcció; l'opció per defecte és horitzontal."
+msgstr "El menú no té direcció; l'opció per defecte és horitzontal."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Tecla no permesa"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Premeu una tecla per a continuar"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primària"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
-msgstr "Crear una nova partició primària"
+msgstr "Crea una nova partició primària"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Lògica"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
-msgstr "Crear una nova partició lògica"
+msgstr "Crea una nova partició lògica"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
-msgstr "No crear cap partició"
+msgstr "No creïs cap partició"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Error intern !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Mida (en MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Principi"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
-msgstr "Afegir partició al principi de l'espai lliure"
+msgstr "Afegeix partició al principi de l'espai lliure"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
-msgstr "Afegir partició al final de l'espai lliure"
+msgstr "Afegeix partició al final de l'espai lliure"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
-msgstr "No hi ha espai per a crear la partició estesa"
+msgstr "No hi ha espai per crear la partició estesa"
 
-#: fdisk/cfdisk.c:1565
-#, fuzzy
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
-msgstr "no hi ha cap taula de particions.\n"
+msgstr "No hi ha cap taula de particions.\n"
 
-#: fdisk/cfdisk.c:1569
-#, fuzzy
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
-msgstr "No hi ha taula de partició o aquesta té una firma desconeguda"
+msgstr ""
+"No hi ha cap taula de particions. S'està començant amb una taula buida."
 
-#: fdisk/cfdisk.c:1579
-#, fuzzy
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
-msgstr "Sols imprimir la taula de particions"
+msgstr "La signatura a la taula de particions és errònia"
 
-#: fdisk/cfdisk.c:1583
-#, fuzzy
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
-msgstr "no hi ha cap taula de particions.\n"
+msgstr "Es desconeix el tipus de taula de particions"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Desitgeu començar amb una taula buida [s/N]?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Heu especificat més cilindres dels que caben al disc"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
-msgstr "No es pot obrir la unitat de disc"
+msgstr "No s'ha pogut obrir la unitat de disc"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
-msgstr "El disc obert és de sols lectura; no teniu permís per a escriure-hi"
+msgstr "S'ha obert un disc de només lectura; no teniu permís per a escriure-hi"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
-msgstr "No es pot obtindre la mida del disc"
+msgstr "No s'ha pogut obtenir la mida del disc"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partició primària incorrecta"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partició lògica incorrecta"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Atenció!! Això pot destruir les dades del vostre disc!"
+msgstr "Avís: Això pot destruir les dades del disc!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
-"Esteu segurs de que voleu escriure la taula de particions al disc? (si o "
-"no): "
+"Esteu segur que voleu escriure la taula de particions al disc? (sí o no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "No s'ha escrit la taula de particions al disc"
 
-#: fdisk/cfdisk.c:1872
+# FIXME: és possible que no es puga introduir l'accent. jm
+#: fdisk/cfdisk.c:1870
 msgid "yes"
-msgstr "si"
+msgstr "sí"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
-msgstr "Si us plau escriviu `si' o `no'"
+msgstr "Escriviu «sí» o «no»"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
-msgstr "Escrivint la taula de particions al disc..."
+msgstr "S'està escrivint la taula de particions al disc..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
-msgstr "Taula de particions del disc, escrita"
+msgstr "S'ha escrit la taula de particions del disc"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
-"S'ha escrit la taula de particions, però la nova lectura de la taula ha "
-"fallat.  Reinicieu per a actualitzar-la."
+"S'ha escrit la taula de particions, però no s'ha pogut rellegir.  Arrenqueu "
+"de nou per actualitzar-la."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"No hi han particions primàries marcades com a d'arrencada. Així la MBR del "
-"DOS no podrà arrencar."
+"No hi ha particions primàries marcades com a d'arrencada. La MBR del DOS no "
+"podrà arrencar."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Hi ha més d'una partició primària marcada com d'arrencada. Així la MBR del "
-"DOS no podrà arrencar."
+"Hi ha més d'una partició primària marcada com a d'arrencada. La MBR del DOS "
+"no podrà arrencar."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
-"Escriviu el nom del fitxer o premeu Intro per a visualitzar-lo en pantalla: "
+"Escriviu el nom del fitxer o premeu la tecla de retorn per visualitzar-ho en "
+"pantalla: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
-msgstr "No es pot obrir el fitxer '%s'"
+msgstr "No s'ha pogut obrir el fitxer '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unitat de disc: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Cap   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Lòg"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primària"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Lògica"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Arrencada"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Cap"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Taula de particions per a %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Primer      Últim\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
-" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
-"Flag\n"
-" # Tipus      Sector      Sector   Despl.    Long.    (ID) Sist. Fitxers   "
-"Etiqueta\n"
+" # Tipus      Sector      Sector   Despl.    Longitud  (ID) T. de sist. "
+"fitx.  Senyal.\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 msgstr ""
-"-- ------- ----------- ----------- ------ ----------- -------------------- "
-"----\n"
+"-- ------- -------- --------- ------ --------- ---------------------- "
+"---------\n"
+"\n"
+"-- -----      ------      ------   ------    --------  "
+"----------------------  ------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
-msgstr "         ---Inici---         ----Final----     Inici     Nombre de\n"
+msgstr "         ---Inici---        ----Final----      Inici     Nombre de\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
-msgstr " # Indi. Cap. Sec. Cil.  ID  Cap. Sec. Cil.   Sector     Sectors\n"
+msgstr " # Senyal Cap Sec  Cil   ID  Cap  Sec  Cil     Sector    Sectors\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ------ --- ---  ---   --  ---  ---  ---     ------    ------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
-msgstr "En cru"
+msgstr "Crues"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
-msgstr "Imprimeix la taula utilitzant el format de dades en cru"
+msgstr "Imprimeix la taula utilitzant el format de dades crues"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sectors"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Imprimeix la taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Taula"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
-msgstr "Sols imprimir la taula de particions"
+msgstr "Imprimeix només la taula de particions"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
-msgstr "No imprimir la taula"
+msgstr "No imprimeixes la taula"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla d'ajuda per a cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr "Això és el cfdisk, un programa per al particionament del disc basat en"
+msgstr "Això és el cfdisk, un programa per a la partició de discs basat en"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "curses, el qual us permetrà crear, suprimir i modificar particions en"
+msgstr "curses, que us permet crear, suprimir i modificar particions del"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
-msgstr "el vostre disc dur."
+msgstr "disc dur."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright © 1994-1999 Kevin E. Martin i aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
-msgstr "Comandament Significat"
+msgstr "Ordre       Significat"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
-msgstr "----------- ----------"
+msgstr "-----       ----------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr "  b         Fixa l'etiqueta d'arrencada en la partició actual"
+msgstr "  b          Fixa el senyalador d'arrencada a la partició actual"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
-msgstr "  d         Suprimeix l'actual partició"
+msgstr "  d          Suprimeix l'actual partició"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
-"  g         Canvia paràmetres de cilindres, capçals i sectors per pista"
+"  g          Canvia paràmetres de cilindres, capçals i sectors per pista"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
-msgstr "            ATENCIÓ: Aquesta opció sols hauria de ser usada per gent"
+msgstr "             Avís: Aquesta opció només l'hauria d'usar aquells qui"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
-msgstr "            que conegui el funcionament de la mateixa."
+msgstr "             saben el que es fan."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
-msgstr "  h         Imprimeix aquesta pantalla"
+msgstr "  h          Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
-msgstr "  m         Maximitza l'utilització de disc de la partició actual"
+msgstr "  m          Maximitza la utilització de disc de la partició actual"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
-msgstr "            Nota: Aquesta opció pot fer la partició incompatible"
+msgstr "             Nota: Aquesta opció pot fer la partició incompatible"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
-msgstr "            amb DOS, OS/2, ..."
+msgstr "             amb DOS, OS/2..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
-msgstr "  n         Crea una nova partició des de l'espai lliure"
+msgstr "  n          Crea una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
-"  p         Imprimeix la taula de particions en la pantalla o en un fitxer"
+"  p          Imprimeix la taula de particions a la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
-msgstr "            Hi han diversos formats diferents per a la partició"
+msgstr "             Hi ha diversos formats diferents per a la partició"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
-msgstr "            entre els que podeu escollir:"
+msgstr "             entre els quals podeu escollir:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr "               r - Dades en cru (exactament el que s'escriurà al disc)"
+msgstr "                r - Dades crues (exactament el que s'escriurà al disc)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
-msgstr "               s - Taula ordenada per sectors"
+msgstr "                s - Taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
-msgstr "               t - Taula en format en cru"
+msgstr "                t - Taula en format cru"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
-msgstr "  q         Surt del programa sense escriure la taula de particions"
+msgstr "  q          Surt del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
-msgstr "  t         Canvia el tipus del sistema de fitxers"
+msgstr "  t          Canvia el tipus del sistema de fitxers"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
-msgstr "  u         Canvia les unitats de la mida visualitzava de la partició"
+msgstr "  u          Canvia les unitats de la mida visualitzava de la partició"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
-msgstr "            Alterna entre MB, sectors i cilindres"
+msgstr "             Alterna entre MB, sectors i cilindres"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr "  W         Escriu la taula de particions al disc (W en majúscula)"
+msgstr "  W          Escriu la taula de particions al disc (W en majúscula)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
-msgstr "            Donat que això destruirà les dades del disc, haureu"
+msgstr "             Com que això destruirà les dades del disc, ho haureu"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "            de confirmar o denegar escrivint `si' o"
+msgstr "             de confirmar o denegar escrivint «sí» o"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
-msgstr "            `no'"
+msgstr "              «no»"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
-msgstr "Fletxa amunt  Desplaça el cursor a l'anterior partició"
+msgstr "Fletxa amunt Desplaça el cursor a l'anterior partició"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Fletxa avall  Desplaça el cursor a la següent partició"
+msgstr "Fletxa avall Desplaça el cursor a la següent partició"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
-msgstr "Ctrl-L        Redibuixa la pantalla"
+msgstr "Ctrl-L       Redibuixa la pantalla"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
-msgstr "  ?           Imprimeix aquesta pantalla"
+msgstr "  ?          Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Nota: Tots els comandaments es poden escriure en majúscules o"
+msgstr "Nota: Totes les ordres es poden escriure en majúscules o"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "minúscules (excepte W per a escriure)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cilindres"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
-msgstr "Canviar la geometria dels cilindres"
+msgstr "Canvia la geometria dels cilindres"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Capçals"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
-msgstr "Canviar la geometria dels capçals"
+msgstr "Canvia la geometria dels capçals"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
-msgstr "Canviar la geometria dels sectors"
+msgstr "Canvia la geometria dels sectors"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Fet"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "S'ha finalitzat el canvi de geometria"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
-msgstr "Escriviu el nombre de cilindres: "
+msgstr "Introduïu el nombre de cilindres: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
-msgstr "Valor dels cilindres no permes"
+msgstr "Valor dels cilindres no permès"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
-msgstr "Escriviu el nombre de capçals: "
+msgstr "Introduïu el nombre de capçals: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
-msgstr "Valor dels capçals no permes"
+msgstr "Valor dels capçals no permès"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
-msgstr "Escriviu el nombre de sectors per pista: "
+msgstr "Introduïu el nombre de sectors per pista: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
-msgstr "Valor dels sectors no permes"
+msgstr "Valor dels sectors no permès"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
-msgstr "Escriviu el tipus del sistema de fitxers: "
+msgstr "Introduïu el tipus del sistema de fitxers: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "No es pot canviar el tipus del sistema de fitxers a buit"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
-msgstr "No es pot canviar el tipus del sistema de fitxers a estes"
+msgstr "No es pot canviar el tipus del sistema de fitxers a estès"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Lòg"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconegut (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unitat de disc: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Mida: %lld octets, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Mida: %lld octets, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Capçals: %d   Sectors per pista: %d   Cilindres: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
-msgstr "Etiquetes"
+msgstr "Senyaladors"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Tipus part."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Tipus Sis.Fitx."
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Sectors"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cilindres"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Mida (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Mida (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
-msgstr "Arrencada"
+msgstr "Arrencable"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
-msgstr "Establir l'etiqueta de la partició actual com d'arrencada"
+msgstr "Commuta el senyalador d'arrencada de la partició actual"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
-msgstr "Suprimir"
+msgstr "Suprimeix"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
-msgstr "Suprimir l'actual partició"
+msgstr "Suprimeix la partició actual"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
-msgstr "Canviar la geometria del disc (sols usuaris experts)"
+msgstr "Canvia la geometria del disc (només usuaris experts)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
-msgstr "Imprimir pantalla d'ajuda"
+msgstr "Mostra la pantalla d'ajuda"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
-"Maximitzar la utilització del disc en la partició actual (sols usuaris "
+"Maximitza la utilització del disc en la partició actual (només usuaris "
 "experts)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
-msgstr "Crear una nova partició des de l'espai lliure"
+msgstr "Crea una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
-msgstr "Imprimir"
+msgstr "Imprimeix"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
-msgstr "Imprimir la taula de particions en la pantalla o en un fitxer"
+msgstr "Imprimeix la taula de particions a la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
-msgstr "Sortir"
+msgstr "Surt"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
-msgstr "Sortir del programa sense escriure la taula de particions"
+msgstr "Surt del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tipus"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Canviar el tipus del sistema de fitxers (DOS, Linux, OS/2, etc.)"
+msgstr "Canvia el tipus del sistema de fitxers (DOS, Linux, OS/2, etc.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Unitats"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "Canviar les unitats de la mida de la partició (MB, sect., cil.)"
+msgstr "Canvia les unitats de la mida de la partició (MB, sectors, cilindres)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
-msgstr "Escriure"
+msgstr "Escriu"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
-msgstr "Escriure la taula de particions al disc (això pot destruir les dades)"
+msgstr "Escriu la taula de particions al disc (això pot destruir les dades)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
-msgstr "No es pot fer aquesta partició arrencable"
+msgstr "Aquesta partició no es pot fer arrencable"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "No es pot suprimir una partició buida"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "No es pot maximitzar aquesta partició"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Aquesta partició és inutilitzable"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Aquesta partició ja està en ús"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "No es pot canviar el tipus d'una partició buida"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "No hi ha més particions"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
-msgstr "Comandament no permès"
+msgstr "Ordre no permesa"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
+msgstr "Copyright © 1994-2002 Kevin E. Martin i aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2208,17 +2162,17 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Usar:\n"
-"Imprimir la versió:\n"
+"Forma d'ús:\n"
+"Imprimeix la versió:\n"
 "        %s -v\n"
-"Imprimir la taula de particions:\n"
+"Imprimeix la taula de particions:\n"
 "        %s -P {r|s|t} [opcions] dispositiu\n"
 "Ús interactiu:\n"
 "        %s [opcions] dispositiu\n"
 "\n"
 "Opcions:\n"
-"-a:  Empra la fletxa en comptes del ressaltat.\n"
-"-z:  Comença amb una taula de particions a zero en comptes de llegir\n"
+"-a:  Utilitza la fletxa en comptes del ressaltat.\n"
+"-z:  Comença amb una taula de particions des de zero en comptes de llegir-\n"
 "     la del disc.\n"
 "-c C -h H -s S: Modifica la idea del nucli sobre el nombre de cilindres,\n"
 "                el nombre de capçals i el nombre de sectors per pista.\n"
@@ -2241,15 +2195,15 @@ msgid ""
 msgstr ""
 "\n"
 "\tEn aquest disc teniu una etiqueta AIX vàlida.\n"
-"\tActualment Linux no pot manejar aquests discs.\n"
+"\tActualment Linux no pot gestionar aquests discs.\n"
 "\tTot i això, tingueu en compte alguns consells:\n"
-"\t1. fdisk destruirà el seu contingut a l'escriure.\n"
+"\t1. fdisk en destruirà el contingut en escriure.\n"
 "\t2. Comproveu que aquest disc no sigui una part vital\n"
-"\t   d'un grup de volúmens. (En cas contrari podríeu\n"
+"\t   d'un grup de volums. (En cas contrari podríeu\n"
 "\t   esborrar els altres discs, si no estan duplicats.)\n"
-"\t3. Abans d'esborrar aquest volúmen físic, esborreu\n"
+"\t3. Abans d'esborrar aquest volum físic, esborreu\n"
 "\t   el disc lògicament de la màquina AIX.\n"
-"\t   (O us haureu de convertir en un AIXpert)."
+"\t   (O convertiu-vos en un AIXpert)."
 
 #: fdisk/fdiskbsdlabel.c:122
 #, c-format
@@ -2260,73 +2214,72 @@ msgstr ""
 "\n"
 "Etiqueta BSD per al dispositiu: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
-msgstr "Acció del comandament"
+msgstr "Acció de l'ordre"
 
 #: fdisk/fdiskbsdlabel.c:130
 msgid "   d   delete a BSD partition"
-msgstr "   d   Esborrar una partició BSD"
+msgstr "   d   esborra una partició BSD"
 
 #: fdisk/fdiskbsdlabel.c:131
 msgid "   e   edit drive data"
-msgstr "   e   Editar dades de la unitat"
+msgstr "   e   edita dades de la unitat"
 
 #: fdisk/fdiskbsdlabel.c:132
 msgid "   i   install bootstrap"
-msgstr "   i   Instal·lar carregador"
+msgstr "   i   instal·la el carregador d'arrencada"
 
 #: fdisk/fdiskbsdlabel.c:133
 msgid "   l   list known filesystem types"
-msgstr "   l   Llistar els tipus de sistemes de fitxers coneguts"
+msgstr "   l   llista els tipus de sistemes de fitxers coneguts"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
-msgstr "   m   imprimir aquest menú"
+msgstr "   m   imprimeix aquest menú"
 
 #: fdisk/fdiskbsdlabel.c:135
 msgid "   n   add a new BSD partition"
-msgstr "   n   Afegir una nova partició BSD"
+msgstr "   n   afegeix una nova partició BSD"
 
 #: fdisk/fdiskbsdlabel.c:136
 msgid "   p   print BSD partition table"
-msgstr "   p   Imprimir taula de particions BSD"
+msgstr "   p   imprimeix la taula de particions BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
-msgstr "   q   sortir sense desar els canvis"
+msgstr "   q   surt sense desar els canvis"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
-msgstr "   r   tornar al menú principal"
+msgstr "   r   torna al menú principal"
 
 #: fdisk/fdiskbsdlabel.c:139
 msgid "   s   show complete disklabel"
-msgstr "   s   Veure totes les etiquetes de disc"
+msgstr "   s   mostra totes les etiquetes del disc"
 
 #: fdisk/fdiskbsdlabel.c:140
 msgid "   t   change a partition's filesystem id"
-msgstr "   t   Canviar l'identificador del sistema de fitxers d'una partició"
+msgstr "   t   canvia l'identificador del sistema de fitxers d'una partició"
 
 #: fdisk/fdiskbsdlabel.c:141
 msgid "   u   change units (cylinders/sectors)"
-msgstr "   u   canviar unitats (cilindres/sectors)"
+msgstr "   u   canvia les unitats (cilindres/sectors)"
 
 #: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
-msgstr "   w   Escriure l'etiqueta de disc al disc"
+msgstr "   w   escriu l'etiqueta de disc al disc"
 
 #: fdisk/fdiskbsdlabel.c:144
 msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x   Enllaçar la partició BSD amb una partició no BSD"
+msgstr "   x   enllaça la partició BSD a una partició no BSD"
 
 #: fdisk/fdiskbsdlabel.c:176
 #, c-format
@@ -2336,7 +2289,7 @@ msgstr "La partició %s no és vàlida perquè comença pel sector 0.\n"
 #: fdisk/fdiskbsdlabel.c:180
 #, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Llegint l'etiqueta de disc de %s en el sector %d.\n"
+msgstr "S'està llegint l'etiqueta de disc de %s en el sector %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
@@ -2345,18 +2298,20 @@ msgstr "No hi ha cap partició *BSD en %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
-msgstr "Comandament d'etiqueta de disc BSD (m per a l'ajuda): "
+msgstr "Ordre d'etiqueta de disc BSD (m per a l'ajuda): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+# Parla d'etiquetes, segurament és femení
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
-msgstr "Primer %s"
+msgstr "Primera %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+# Parla d'etiquetes, segurament és femení
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
-msgstr "Últim %s o +mida o +midaM o +midaK"
+msgstr "Última %s o +mida o +midaM o +midaK"
 
 #: fdisk/fdiskbsdlabel.c:318
 #, c-format
@@ -2381,12 +2336,12 @@ msgstr "etiqueta: %.*s\n"
 #: fdisk/fdiskbsdlabel.c:323
 #, c-format
 msgid "flags:"
-msgstr "indicadors:"
+msgstr "senyaladors:"
 
 #: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid " removable"
-msgstr " remobible"
+msgstr " extraïble"
 
 #: fdisk/fdiskbsdlabel.c:327
 #, c-format
@@ -2398,8 +2353,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " sector dolent"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2430,16 +2383,19 @@ msgstr "cilindres: %ld\n"
 msgid "rpm: %d\n"
 msgstr "r.p.m.: %d\n"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:339
 #, c-format
 msgid "interleave: %d\n"
-msgstr "inter-fullatge: %d\n"
+msgstr "entrellaçat: %d\n"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:340
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "decalatge: %d\n"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:341
 #, c-format
 msgid "cylinderskew: %d\n"
@@ -2472,12 +2428,12 @@ msgstr ""
 #: fdisk/fdiskbsdlabel.c:356
 #, c-format
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "núm     començà    acaba     mida     sist.fitx. [fmida bmida   cpg]\n"
+msgstr "núm     inici       final    mida     sist.fitx. [fmida bmida   cpg]\n"
 
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr "Escrivint etiqueta de disc a %s.\n"
+msgstr "S'està escrivint l'etiqueta de disc a %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
 #, c-format
@@ -2500,8 +2456,8 @@ msgstr "sectors/pista"
 msgid "tracks/cylinder"
 msgstr "pistes/cilindre"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cilindres"
 
@@ -2518,14 +2474,17 @@ msgstr "Ha de ser <= sectors/pista * pistes/cilindre (valor per defecte).\n"
 msgid "rpm"
 msgstr "r.p.m."
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:484
 msgid "interleave"
-msgstr "inter-fullatge"
+msgstr "entrellaçat"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:485
 msgid "trackskew"
 msgstr "decalatge de les pistes"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:486
 msgid "cylinderskew"
 msgstr "decalatge dels cilindres"
@@ -2536,7 +2495,7 @@ msgstr "canvi de capçal"
 
 #: fdisk/fdiskbsdlabel.c:488
 msgid "track-to-track seek"
-msgstr "recerca pista a pista"
+msgstr "cerca pista a pista"
 
 #: fdisk/fdiskbsdlabel.c:529
 #, c-format
@@ -2546,19 +2505,19 @@ msgstr "Carregador: %sboot -> boot%s (%s): "
 #: fdisk/fdiskbsdlabel.c:554
 #, c-format
 msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Carregador solapat amb una etiqueta de disc!\n"
+msgstr "El carregador s'encavalca amb l'etiqueta de disc.\n"
 
 #: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
 #, c-format
 msgid "Bootstrap installed on %s.\n"
-msgstr "Carregador instal·lat en %s.\n"
+msgstr "S'ha instal·lat el carregador a %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:599
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Partició (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "S'ha creat el màxim nombre de particions\n"
@@ -2571,7 +2530,7 @@ msgstr "Aquesta partició ja existeix.\n"
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Atenció: Masses particions (%d, el màxim són %d).\n"
+msgstr "Avís: hi ha massa particions (%d, el màxim són %d).\n"
 
 #: fdisk/fdiskbsdlabel.c:804
 #, c-format
@@ -2580,9 +2539,9 @@ msgid ""
 "Syncing disks.\n"
 msgstr ""
 "\n"
-"Sincronitzant els discs.\n"
+"S'estan sincronitzant els discs.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2593,16 +2552,15 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
-"Ús: fdisk [-b SSZ] [-u] DISK      Canvia la taula de particions\n"
-"    fdisk -l [-b SSZ] [-u] DISK   Llista la(es) taula(es) de partició(ons)\n"
-"    fdisk -s PARTICIÓ             Augmenta l'espai en blocs\n"
-"    fdisk -v                      Dona la versió del fdisk\n"
-"Aquest DISC estarà sota /dev/hdb o /dev/sda i la PARTICIÓ serà quelcom\n"
-"a /dev/hda7\n"
-"-u: Dona el principi i final de la unitat en sectors (no en cilindres)\n"
+"Forma d'ús: fdisk [-b SSZ] [-u] DISC Canvia la taula de particions\n"
+"      fdisk -l [-b SSZ] [-u] DISC    Llista les taules de particions\n"
+"      fdisk -s PARTICIÓ              Mostra la mida de la parcició en blocs\n"
+"      fdisk -v                       Mostra la versió de fdisk\n"
+"DISC és del tipus /dev/hdb o /dev/sda i PARTICIÓ és del tipus /dev/hda7\n"
+"-u: Mostra l'inici i el final de la unitat en sectors (no en cilindres)\n"
 "-b 2048: (per als discs MO) usa 2048 octets per sector\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2611,7 +2569,7 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"Ús: fdisk [-l] [-b SSZ] [-u] dispositiu\n"
+"Forma d'ús: fdisk [-l] [-b SSZ] [-u] dispositiu\n"
 "P.ex.: fdisk /dev/hda  (per al primer disc IDE)\n"
 "    o: fdisk /dev/sdc  (per al tercer disc SCSI)\n"
 "    o: fdisk /dev/eda  (per a la primera unitat PS/2 ESDI)\n"
@@ -2619,198 +2577,185 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
-msgstr "No es pot obrir %s\n"
+msgstr "No s'ha pogut obrir %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
-msgstr "No es pot llegir %s\n"
+msgstr "No s'ha pogut llegir %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
-msgstr "No es pot cercar en %s\n"
+msgstr "No s'ha pogut cercar en %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
-msgstr "No es pot escriure %s\n"
+msgstr "No s'ha pogut escriure %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
-msgstr "El ioctl BLKGETSIZE ha fallat en %s\n"
+msgstr "No s'ha pogut executar ioctl BLKGETSIZE a %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
-msgstr "No es pot assignar més memòria\n"
+msgstr "No s'ha pogut assignar més memòria\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Error fatal\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
-msgstr "   a   establir un indicador de sols lectura"
+msgstr "   a   estableix un senyalador de només lectura"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
-msgstr "   b   editar etiqueta de disc bsd"
+msgstr "   b   edita l'etiqueta de disc bsd"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
-msgstr "   c   establir indicatiu de muntable"
+msgstr "   c   estableix senyalador de muntable"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
-msgstr "   d   suprimir una partició"
+msgstr "   d   suprimeix una partició"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
-msgstr "   l   llistar els tipus de particions conegudes"
+msgstr "   l   llista els tipus de particions conegudes"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
-msgstr "   n   afegir una nova partició"
+msgstr "   n   afegeix una nova partició"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
-msgstr "   o   crear una nova taula de particions DOS buida"
+msgstr "   o   crea una nova taula de particions DOS buida"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
-msgstr "   p   imprimir la taula de particions"
+msgstr "   p   imprimeix la taula de particions"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
-msgstr "   s   crear una etiqueta de disc Sun nova"
+msgstr "   s   crea una etiqueta de disc Sun nova"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
-msgstr "   t   canviar l'identificador del sistema d'una partició"
+msgstr "   t   canvia l'identificador del sistema d'una partició"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
-msgstr "   u   canviar les unitats de visualització/entrada"
+msgstr "   u   canvia les unitats de visualització/entrada"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
-msgstr "   v   verificar la taula de particions"
+msgstr "   v   verifica la taula de particions"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
-msgstr "   w   escriure la taula al disc i sortir"
+msgstr "   w   escriu la taula al disc i surt"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
-msgstr "   x   funcions addicionals (sols experts)"
+msgstr "   x   funcions addicionals (només experts)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
-msgstr "   a   seleccionar partició d'arrencada"
+msgstr "   a   selecciona la partició d'arrencada"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
-msgstr "   b   editar l'entrada del fitxer d'arrencada"
+msgstr "   b   edita l'entrada del fitxer d'arrencada"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
-msgstr "   c   seleccionar partició d'intercanvi sgi"
+msgstr "   c   selecciona la partició d'intercanvi sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
-msgstr "   a   establir un indicatiu d'arrencada"
+msgstr "   a   estableix un senyalador d'arrencada"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
-msgstr "   c   establir l'indicatiu de compatibilitat amb DOS"
+msgstr "   c   estableix el senyalador de compatibilitat amb DOS"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
-msgstr "   a   canviar el nombre de cilindres alternatius"
+msgstr "   a   canvia el nombre de cilindres alternatius"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
-msgstr "   c   canviar el nombre de cilindres"
+msgstr "   c   canvia el nombre de cilindres"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
-msgstr "   d   imprimir les dades en cru en la taula de particions"
+msgstr "   d   imprimeix les dades crues a la taula de particions"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
-msgstr "   e   canviar el nombre de sectors addicionals per cilindre"
+msgstr "   e   canvia el nombre de sectors addicionals per cilindre"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
-msgstr "   h   canviar el nombre de capçals"
+msgstr "   h   canvia el nombre de capçals"
 
-#: fdisk/fdisk.c:403
+# FIXME
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
-msgstr "   i   canviar factor d'inter-fullatge"
+msgstr "   i   canvia el factor d'entrellaçat"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
-msgstr "   o   canviar velocitat de rotació (r.p.m.)"
+msgstr "   o   canvia velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
-msgstr "   s   canviar el nombre de sectors per pista"
+msgstr "   s   canvia el nombre de sectors per pista"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
-msgstr "   y   canviar el nombre de cilindres físics"
+msgstr "   y   canvia el nombre de cilindres físics"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
-msgstr "   b   desplaçar al començament les dades d'una partició"
+msgstr "   b   desplaça les dades d'una partició a l'inici"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
-msgstr "   e   llistar particions esteses"
+msgstr "   e   llista les particions esteses"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
-msgstr "   g   crear una taula de particions IRIX (SGI)"
+msgstr "   g   crea una taula de particions IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
-msgstr "   f   fixar un ordre de particions"
+msgstr "   f   arregla l'ordre de les particions"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Heu de definir els"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "capçals"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sectors"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2819,11 +2764,11 @@ msgstr ""
 "%s%s.\n"
 "Podeu fer això des del menú de funcions addicionals.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
-msgstr " y "
+msgstr " i "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2836,37 +2781,40 @@ msgid ""
 msgstr ""
 "\n"
 "El nombre de cilindres per a aquest disc està establert en %d.\n"
-"Això no és desencertat, però va més enllà del 1024 i podríeu\n"
-"tindre problemes amb certes configuracions de:\n"
-"1) Programari executat en temps d'arrencada (p.e., versions\n"
-"   antigues de LILO)\n"
-"2) Arrencar i particionar des d'un altre SO\n"
-"   (p.e., DOS FDISK, OS/2 FDISK)\n"
+"Això no és incorrecte, però és més gran que 1024 i podríeu\n"
+"tenir problemes amb certes configuracions de:\n"
+"1) Programari que s'executa durant d'arrencada (p.ex., versions\n"
+"   antigues del LILO)\n"
+"2) En arrencar i particionar des d'un altre SO\n"
+"   (p.ex., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplaçament incorrecte en particions primàries esteses\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
+"Avís: s'estan ometent les particions posteriors a la #%d.\n"
+"S'eliminaran si deseu aquesta taula de particions.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "Atenció: Enllaç d'apuntador addicional en la taula de particions %d\n"
+msgstr ""
+"Avís: hi ha un punter d'enllaç addicional a la taula de particions %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
-"Atenció: S'ignoren les dades addicionals en la taula de particions %d\n"
+"Avís: s'està ignorant les dades addicionals de la taula de particions %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2874,144 +2822,146 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"S'està creant una etiqueta de disc DOS nova. Els canvis sols\n"
-"romandran a la memòria, fins que decidiu escriure-los. Després\n"
-"d'aquesta operació, l'anterior contingut no podrà ser recuperat.\n"
+"S'està creant una etiqueta de disc DOS nova. Els canvis només\n"
+"romandran a la memòria fins que decidiu escriure'ls. Després\n"
+"d'aquesta operació, l'anterior contingut no es podrà recuperar.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
-msgstr "Nota: La mida del sector és %d (no %d)\n"
+msgstr "Nota: la mida del sector és %d (no %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "No podreu escriure la taula de particions.\n"
 
-#: fdisk/fdisk.c:952
+# NO només es va fer una traducció a partir de la versió
+# espanyola, sinó que a més a més es va fer malament.
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
-"Aquest disc té tanta màgia DOS com BSD.\n"
-"Empreu el comandament 'b' per anar al mode BSD.\n"
+"Aquest disc té tan màgia DOS com BSD.\n"
+"Empreu l'ordre «b» per anar al mode BSD.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
-"El dispositiu no conté una taula de particions DOS vàlida, així com tampoc "
-"una etiqueta de disc Sun, SGI o OSF\n"
+"El dispositiu no conté ni taula de particions DOS vàlida, ni cap etiqueta de "
+"disc Sun, SGI o OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Error intern\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr "S'ignorarà la partició estesa addicional %d\n"
+msgstr "S'està ignorant la partició estesa addicional %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
-"Atenció: Etiqueta 0x%04x no vàlida de la taula de particions %d serà "
-"corregida amb w(rite)\n"
+"Avís: el senyalador 0x%04x invàlid de la taula de particions %d es corregirà "
+"amb w(escriu)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 "\n"
-"s'ha aconseguit un EOF tres vegades - sortint...\n"
+"s'ha obtingut EOF tres vegades - s'està sortint...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
-msgstr "Codi hex. (escriviu L per a veure la llista de codis): "
+msgstr "Codi hex. (escriviu L per veure la llista de codis): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
-msgstr "Usant el valor per defecte %u\n"
+msgstr "S'està utilitzant el valor per defecte %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "El valor està fora del rang.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Nombre de partició"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
-msgstr "Atenció: La partició %d és del tipus buit\n"
+msgstr "Avís: la partició %d no té tipus\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "S'ha seleccionat la partició %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
-msgstr "No hi ha cap partició definida!\n"
+msgstr "Encara no hi ha cap partició definida.\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
-msgstr "Ja s'han definit totes les particions primàries!\n"
+msgstr "Ja s'han definit totes les particions primàries.\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cilindre"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr "Canviant les unitats de visualització/entrada a %s\n"
+msgstr "S'està canviant les unitats de visualització/entrada a %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr "ATENCIÓ: La partició %d és una partició estesa\n"
+msgstr "Avís: la partició %d és una partició estesa\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
-msgstr "L'etiqueta de compatibilitat amb DOS està establerta\n"
+msgstr "S'ha establert el senyalador de compatibilitat amb DOS\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
-msgstr "L'etiqueta de compatibilitat amb DOS no està establerta\n"
+msgstr "No s'ha establert el senyalador de compatibilitat amb DOS\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr "La partició %d encara no existeix!\n"
+msgstr "La partició %d encara no existeix.\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3020,117 +2970,117 @@ msgid ""
 "a partition using the `d' command.\n"
 msgstr ""
 "El tipus 0 significa espai lliure per a molts sistemes\n"
-"(però no per a Linux). Probablement no sigui sensat\n"
-"tindre particions del tipus 0. Podeu suprimir-les\n"
-"amb el comandament `d'.\n"
+"(però no per a Linux). No és aconsellable tenir\n"
+"particions del tipus 0. Les podeu suprimir amb\n"
+"l'ordre «d».\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
-"No podeu convertir una partició en estesa ni viceversa primer\n"
-"haureu d'esborrar-la.\n"
+"No podeu convertir una partició a estesa, o al revés, primer\n"
+"cal que l'esborreu.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
-"Es recomana deixar la partició 3 com a disc complet (5), donat\n"
+"Es recomana deixar la partició 3 com a disc complet (5), ja\n"
 "que així ho espera SunOS/Solaris i fins i tot és adequat per a\n"
 "Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
-"Es recomana deixar la partició 9 com a capçalera de volumen (0)\n"
-"i la partició 11 com a volumen complet (6) donat que IRIX així ho\n"
+"Es recomana deixar la partició 9 com a capçalera de volum (0)\n"
+"i la partició 11 com a volum complet (6) ja que IRIX així ho\n"
 "espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "La partició %d té diferents començaments físics/lògics (no Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     físic=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lògic=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partició %d té diferents finals físics/lògics:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partició %i no comença en el límit del cilindre:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "ha de ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partició %i no acaba en un límit de cilindre.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "ha de ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 "\n"
-"Disc %s: %ld MiB, %lld octets\n"
+"Disc %s: %ld MB, %lld octets\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 "\n"
-"Disc %s: %ld.%ld GiB, %lld octets\n"
+"Disc %s: %ld.%ld GB, %lld octets\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d capçals, %d sectors/pista, %d cilindres"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", total %llu sectors"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3139,42 +3089,44 @@ msgstr ""
 "Unitats = %s de %d * %d = %d octets\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
-"Res a fer. L'ordre és correcte.\n"
+"Res a fer. L'ordenament ja és correcte.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
 "Probably you selected the wrong device.\n"
 "\n"
 msgstr ""
+"Això no sembla cap taula de particions\n"
+"Probablement heu seleccionat un dispositiu incorrecte.\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
-msgstr "%*s Arrenc.   Comença       Acaba    Blocs    Id  Sistema\n"
+msgstr "%*s Arrenc.   Inici         Final    Blocs    Id  Sistema\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Dispositiu"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 "\n"
-"Les entrades en la taula de particions no estan en ordre al disc\n"
+"Les entrades a la taula de particions no estan en l'ordre del disc\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3185,83 +3137,83 @@ msgstr ""
 "Disc %s: %d capçals, %d sectors, %d cilindres\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
-msgstr "Núm IA Cab Sect Cil Cap Sect Cil    Comença    Mida ID\n"
+msgstr "N. IA Cap Sect Cil Cap Sect Cil     Inici      Mida ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
-msgstr "Atenció: La partició %d conté el sector 0\n"
+msgstr "Avís: la partició %d conté el sector 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Partició %d: El capçal %d supera el màxim %d\n"
+msgstr "Partició %d: el capçal %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
-msgstr "Partició %d: El sector %d supera el màxim %d\n"
+msgstr "Partició %d: el sector %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
-msgstr "Partició %d: El cilindre %d supera el màxim %d\n"
+msgstr "Partició %d: el cilindre %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
-msgstr "Partició %d: Sectors anteriors %d difereixen del total %d\n"
+msgstr "Partició %d: sectors anteriors %d difereixen del total %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
-msgstr "Atenció: Inici de dades incorrecte en la partició %d\n"
+msgstr "Avís: inici de dades incorrecte en la partició %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "Atenció: La partició %d es solapa amb la partició %d.\n"
+msgstr "Avís: la partició %d cavalca amb la partició %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Atenció: La partició %d està buida\n"
+msgstr "Avís: la partició %d està buida\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partició lògica %d no està integrada en la partició %d\n"
 
-#: fdisk/fdisk.c:1900
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1902
+#, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
-msgstr "El total de sectors assignats %d supera el màxim de %d\n"
+msgstr "El total de sectors assignats %d supera el màxim de %lld\n"
 
-#: fdisk/fdisk.c:1903
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1905
+#, c-format
 msgid "%lld unallocated sectors\n"
-msgstr "%d sectors no assignats\n"
+msgstr "%lld sectors no assignats\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partició %d ja està definida. Esborreu-la abans de tornar-la a afegir.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "No hi ha cap sector lliure disponible\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3269,65 +3221,65 @@ msgid ""
 "\ta new empty DOS partition table first. (Use o.)\n"
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
-"\tHo sento - aquest fdisk no pot manejar etiquetes de disc AIX.\n"
+"\tAquest fdisk no pot gestionar etiquetes de disc AIX.\n"
 "\tSi desitgeu afegir particions DOS, creeu una nova taula de\n"
 "\t particions DOS (Useu o).\n"
-"\tATENCIÓ: Això destruirà l'actual contingut del disc.\n"
+"\tAvís: Això destruirà el contingut actual del disc.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Primer heu de suprimir alguna partició i afegir-ne una d'estesa\n"
 
-#: fdisk/fdisk.c:2093
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2095
+#, c-format
 msgid "All logical partitions are in use\n"
-msgstr "les particions lògiques no estan en un ordre de disc"
+msgstr "S'usen totes les particions lògiques\n"
 
-#: fdisk/fdisk.c:2094
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2096
+#, c-format
 msgid "Adding a primary partition\n"
-msgstr "Partició primària incorrecta"
+msgstr "S'està afegint una partició primària\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
 "   %s\n"
 "   p   primary partition (1-4)\n"
 msgstr ""
-"Acció del comandament\n"
+"Acció de l'ordre\n"
 "%s\n"
-"   p   Partició primària (1-4)\n"
+"   p   partició primària (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   lògica (5 o superior)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   estesa"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Nombre de partició no vàlid per al tipus `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
-"Ja s'ha modificat la taula de particions!\n"
+"S'ha modificat la taula de particions.\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
-msgstr "Cridant a ioctl() per a rellegir la taula de particions.\n"
+msgstr "S'està cridant ioctl() per rellegir la taula de particions.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3336,11 +3288,12 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 "\n"
-"ATENCIÓ: El rellegir la taula de particions ha fallat amb l'error %d: %s.\n"
+"Avís: No s'ha pogut rellegir la taula de particions, s'ha produït l'error %"
+"d: %s.\n"
 "El nucli encara usa l'antiga taula.\n"
-"La taula nova s'usarà després de reiniciar.\n"
+"La taula nova s'usarà després d'arrencar de nou.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3349,102 +3302,103 @@ msgid ""
 "information.\n"
 msgstr ""
 "\n"
-"ATENCIÓ: Si heu creat o modificat qualsevol de les\n"
-"particions DOS 6.x, mireu la pàgina del manual del fdisk\n"
+"Avís: Si heu creat o modificat alguna partició\n"
+"DOS 6.x, mireu la pàgina del manual de fdisk\n"
 "per a informació addicional.\n"
 
-#: fdisk/fdisk.c:2197
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2199
+#, c-format
 msgid ""
 "\n"
 "Error closing file\n"
-msgstr "Error tancant %s\n"
+msgstr ""
+"\n"
+"S'ha produït un error en tancar el fitxer\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
-msgstr "Sincronitzant els discs.\n"
+msgstr "S'estan sincronitzant els discs.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
-msgstr "La partició %d no té cap àrea amb dades\n"
+msgstr "La partició %d no té cap àrea de dades\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nou començament de dades"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
-msgstr "Comandament expert (m per a l'ajuda): "
+msgstr "Ordre d'expert (m per a obtenir ajuda): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Nombre de cilindres"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Nombre de capçals"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Nombre de sectors"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
-"Atenció: Establint desplaçament del sector per a la compatibilitat amb DOS\n"
+"Avís: s'està establint el desplaçament del sector per a la compatibilitat "
+"amb DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "El disc %s no conté una taula de particions vàlida\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "no es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
-msgstr "%c: Comandament desconegut\n"
+msgstr "%c: ordre desconeguda\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
-"Aquest nucli cerca la mida del sector por si mateix; l'opció -b serà "
-"ignorada\n"
+"Aquest nucli troba la mida del sector automàtiament; s'ignorarà l'opció -b\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
-"Atenció: L'opció -b (estableix la mida del sector) ha de ser usada amb un "
+"Avís: l'opció -b (estableix la mida del sector) s'ha d'usar amb un "
 "dispositiu específic\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
-"A l'entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en %"
+"En entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en %"
 "s.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
-msgstr "Comandament (m per a l'ajuda): "
+msgstr "Ordre (m per a obtenir ajuda): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3453,16 +3407,16 @@ msgstr ""
 "\n"
 "L'actual fitxer d'arrencada és: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
-msgstr "Si us plau entreu el nom del nou fitxer d'arrencada: "
+msgstr "Entreu el nom del nou fitxer d'arrencada: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "No s'ha modificat el fitxer d'arrencada\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3470,8 +3424,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"\tHo sento, no hi ha menú d'usuaris experts per a les taules de particions "
-"SGI.\n"
+"\tNo hi ha menú d'usuari expert per a les taules de particions SGI.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:80
@@ -3488,7 +3441,7 @@ msgstr "SGI secrepl"
 
 #: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
-msgstr "SGI raw"
+msgstr "SGI cru"
 
 #: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
@@ -3500,7 +3453,7 @@ msgstr "SGI sysv"
 
 #: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
-msgstr "Volúmen SGI"
+msgstr "Volum SGI"
 
 #: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
@@ -3530,21 +3483,21 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Intercanvi Linux"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
 #: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
-msgstr "Linux RAID"
+msgstr "RAID Linux"
 
 #: fdisk/fdisksgilabel.c:163
 #, c-format
@@ -3552,17 +3505,19 @@ msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
-"Segons la MIPS Computer Systems, Inc. l'etiqueta no pot contindre més de 512 "
+"Segons MIPS Computer Systems, Inc. l'etiqueta no pot contenir més de 512 "
 "octets\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr ""
-"Detectada una etiqueta de disc sgi amb una suma de comprovació incorrecta.\n"
+"S'ha detectat una etiqueta de disc sgi amb una suma de comprovació "
+"incorrecta.\n"
 
+# FIXME
 #: fdisk/fdisksgilabel.c:200
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors\n"
@@ -3575,13 +3530,13 @@ msgstr ""
 "\n"
 "Disc %s (etiqueta de disc SGI): %d capçals, %d sectors\n"
 "%d cilindres, %d cilindres físics\n"
-"%d sectors per cilindre addicionals, inter-fullatge %d:1\n"
+"%d sectors per cilindre addicionals, entrellaçat %d:1\n"
 "%s\n"
-"Unitats = %s de %d * 512 octets\n"
+"Unitats = %s de %d * %d octets\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
@@ -3590,7 +3545,7 @@ msgid ""
 msgstr ""
 "\n"
 "Disc %s (etiqueta de disc SGI): %d capçals, %d sectors, %d cilindres\n"
-"Unitats = %s de %d * 512 octets\n"
+"Unitats = %s de %d * %d octets\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:220
@@ -3600,7 +3555,7 @@ msgid ""
 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
 "----- particions -----\n"
-"Pt# %*s  Info     Comença    Acaba  Sectors  Id  Sistema\n"
+"Pt# %*s  Info     Inici       Final Sectors  Id  Sistema\n"
 
 #: fdisk/fdisksgilabel.c:242
 #, c-format
@@ -3618,7 +3573,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sector%5u mida%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3628,8 +3582,8 @@ msgid ""
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
 "\n"
-"Fitxer d'arrencada no vàlid!\n"
-"\tEl fitxer d'arrencada ha de ser un nom de ruta absolut\n"
+"El fitxer d'arrencada no és vàlid!\n"
+"\tEl fitxer d'arrencada ha de ser un camí absolut\n"
 "\tdiferent de zero, p.e. \"/unix\" o \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:310
@@ -3639,7 +3593,7 @@ msgid ""
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
 "\n"
-"\tNom del fitxer d'arrencada massa llarg: Màxim de 16 octets.\n"
+"\tEl nom del fitxer d'arrencada és massa llarg: màxim de 16 octets.\n"
 
 #: fdisk/fdisksgilabel.c:315
 #, c-format
@@ -3648,8 +3602,7 @@ msgid ""
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
 "\n"
-"\tEl fitxer d'arrencada ha de tindre un nom de ruta completament "
-"qualificat.\n"
+"\tEl fitxer d'arrencada ha de tenir un camí completament qualificat.\n"
 
 #: fdisk/fdisksgilabel.c:322
 #, c-format
@@ -3670,14 +3623,14 @@ msgid ""
 "\tBootfile is changed to \"%s\".\n"
 msgstr ""
 "\n"
-"\tEs canvia el fitxer d'arrencada a \"%s\".\n"
+"\tS'ha canviat el fitxer d'arrencada a \"%s\".\n"
 
 #: fdisk/fdisksgilabel.c:438
 #, c-format
 msgid "More than one entire disk entry present.\n"
-msgstr "Hi ha present més d'una entrada de disc completa.\n"
+msgstr "Hi ha present més d'una entrada de disc complet.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "No hi han particions definides\n"
@@ -3703,12 +3656,12 @@ msgid ""
 "but the disk is %d diskblocks long.\n"
 msgstr ""
 "La partició de disc sencer sols té un mida de %d blocs,\n"
-"mentres que el disc té una longitud de %d blocs.\n"
+"mentre que el disc té una longitud de %d blocs.\n"
 
 #: fdisk/fdisksgilabel.c:465
 #, c-format
 msgid "One Partition (#11) should cover the entire disk.\n"
-msgstr "Una partició (11) haurà d'abastar el disc sencer.\n"
+msgstr "Una partició (#11) hauria d'abastar el disc sencer.\n"
 
 #: fdisk/fdisksgilabel.c:475
 #, c-format
@@ -3728,7 +3681,7 @@ msgstr "Les particions %d i %d es solapen en %d sectors.\n"
 #: fdisk/fdisksgilabel.c:496 fdisk/fdisksgilabel.c:514
 #, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Espai no usat de %8u sectors - sectors %8u-%u\n"
+msgstr "Hi ha un buit que no s'usa de %8u sectors - sectors %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:525
 #, c-format
@@ -3762,11 +3715,10 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tHeu escollit un nom de fitxer d'arrencada inusual.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Ho sento sols podeu canviar l'etiqueta de les particions no buides.\n"
+msgstr "Podeu canviar l'etiqueta de les particions no buides.\n"
 
 #: fdisk/fdisksgilabel.c:550
 msgid ""
@@ -3777,36 +3729,34 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 "Està altament recomenat que la partició en el desplaçament 0\n"
-"sigui del tipus \"SGI volhdr\"; el sistema IRIX l'usarà per a\n"
-"recuperar des del seu directori utilitats com sash i fx.\n"
-"Sols la secció de disc sencer \"Volúmen SGI\" pot infringir això.\n"
-"Escriviu SI si esteu segur sobre tornar a etiquetar aquesta partició.\n"
+"sigui del tipus \"SGI volhdr\"; el sistema IRIX l'usarà per\n"
+"recuperar des del seu directori d'utilitats com ara sash i fx.\n"
+"Només l'entrada de disc sencer \"Volum SGI\" pot infringir això.\n"
+"Escriviu S� si esteu segur que voleu tornar a etiquetar aquesta partició.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
-msgstr "SI\n"
+msgstr "S�\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
-msgstr "Sabeu si heu produït un solapament de partició en el disc?\n"
+msgstr "Ja sabeu que hi ha un encavalcament de particions al disc?\n"
 
 #: fdisk/fdisksgilabel.c:637
 #, c-format
 msgid "Attempting to generate entire disk entry automatically.\n"
-msgstr "S'intenta generar una entrada de disc sencer automàticament.\n"
+msgstr "S'està intentant generar una entrada de disc sencer automàticament.\n"
 
 #: fdisk/fdisksgilabel.c:642
 #, c-format
 msgid "The entire disk is already covered with partitions.\n"
-msgstr "El disc sencer ja està cobert amb particions.\n"
+msgstr "El disc sencer ja està cobert de particions.\n"
 
 #: fdisk/fdisksgilabel.c:646
 #, c-format
 msgid "You got a partition overlap on the disk. Fix it first!\n"
-msgstr ""
-"S'ha produït un solapament de particions en el disc. Corregiu això primer!\n"
+msgstr "S'ha produït un encavalcament de particions al disc. Corregiu-ho.\n"
 
 #: fdisk/fdisksgilabel.c:655 fdisk/fdisksgilabel.c:684
 #, c-format
@@ -3814,14 +3764,13 @@ msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
-"Es altament recomenat que la partició onze cobreixi\n"
-"el disc sencer i que sigui del tipus `Volúmen SGI'\n"
+"Es recomana especialment que la onzena partició\n"
+"cobreixi el disc sencer i sigui del tipus 'volum SGI'\n"
 
 #: fdisk/fdisksgilabel.c:671
 #, c-format
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
-msgstr ""
-"Es produirà un solapament de particions en el disc. Corregiu això primer!\n"
+msgstr "Es produirà un encavalcament de particions al disc. Corregiu-ho.\n"
 
 #: fdisk/fdisksgilabel.c:676
 #, c-format
@@ -3836,9 +3785,9 @@ msgid ""
 "content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Construint una nova etiqueta de disc SGI. Els canvis sols romandran\n"
-"en la memòria, fins que decidiu escriure-los. Després d'això, l'anterior\n"
-"contingut serà irrecuperable.\n"
+"S'està construint una nova etiqueta de disc SGI. Els canvis només romandran\n"
+"a la memòria fins que decidiu escriure'ls. Després d'això, no es podrà\n"
+"recuperar l'anterior contingut.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:728
@@ -3848,59 +3797,57 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
-"ATENCIÓ:  BLKGETSIZE el ioctl ha fallat sobre %s.  S'esta usant el valor %d "
-"per a\n"
-"la geometria del cilindre. Aquest valor es podria tuncar per a dispositius > "
-"33,8 GB.\n"
+"Avís: no s'ha pogut executar ioctl BLKGETSIZE a %s. S'està utilitzant el "
+"valor de la geometria del cilindre %d.\n"
+"Aquest valor es pot truncar per a dispositius > 33.8 GB.\n"
 
 #: fdisk/fdisksgilabel.c:741
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
-msgstr "S'intenten mantindre els paràmetres de la partició %d.\n"
+msgstr "S'està intentant mantenir els paràmetres de la partició %d.\n"
 
 #: fdisk/fdisksgilabel.c:743
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
-msgstr "ID=%02x\tCOMENÇAMENT=%d\tLONGITUD=%d\n"
+msgstr "ID=%02x\tINICI=%d\tLONGITUD=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Buida"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
-msgstr "SunOS root"
+msgstr "SunOS arrel"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS d'intercanvi"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disc sencer"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS estàndard"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
-msgstr "Autodetecció Linux raid"
+msgstr "Autodetecció RAID Linux"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3909,16 +3856,16 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 "S'ha detectat una etiqueta de disc amb una suma de comprovació incorrecta.\n"
-"Probablement tindreu que establir tots els valors,\n"
-"p.e. capçals, sectors, cilindres i particions, o forçar\n"
-"una nova etiqueta (comandament s al menú principal)\n"
+"Probablement haureu d'establir tots els valors,\n"
+"p.ex. capçals, sectors, cilindres i particions, o forçar\n"
+"una nova etiqueta (ordre s del menú principal)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "La configuració automàtica ha trobat un %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3926,12 +3873,12 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Construint una nova etiqueta de disc sun. Els canvis sols romandran\n"
-"en la memòria, fins que decidiu escriure-los. Després d'això, l'anterior\n"
+"S'està construint una nova etiqueta de disc sun. Els canvis només romandran\n"
+"a la memòria fins que decidiu escriure'ls. Després d'això, l'anterior\n"
 "contingut serà irrecuperable.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3939,83 +3886,84 @@ msgid ""
 msgstr ""
 "Tipus d'unitat\n"
 "   ?   Amb configuració automàtica\n"
-"   0   Personalitzada (amb valors per defecte detectats pel maquinari)"
+"   0   Personalitzada (amb valors per defecte que detecti el maquinari)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
-msgstr "Seleccionar tipus (? automàtica, 0 personalitzada): "
+msgstr "Seleccioneu el tipus (? automàtica, 0 personalitzada): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
-msgstr "Falla en la configuració automàtica.\n"
+msgstr "No s'ha pogut fer la configuració automàtica.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sectors/pista"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cilindres alternatius"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cilindres físics"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+# FIXME
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
-msgstr "Factor d'inter-fullatge"
+msgstr "Factor d'entrellaçat"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Sectors addicionals per cilindre"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
-msgstr "Podeu canviar tots els paràmetres de disc des del menú x"
+msgstr "Podeu canviar tots els paràmetres del disc des del menú x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
-msgstr "Disquet de 3,5 polsades"
+msgstr "Disquet de 3,5 polzades"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
-msgstr "Linux personalitzat"
+msgstr "Linux personalitzada"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partició %d no acaba en un límit de cilindre\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
-msgstr "La partició %d es solapa amb d'altres en els sectors %d-%d\n"
+msgstr "La partició %d encavalca amb d'altres en els sectors %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
-msgstr "Espai no usat - sectors 0-%d\n"
+msgstr "Buit no usat - sectors 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
-msgstr "Espai no usat - sectors %d-%d\n"
+msgstr "Buit no usat - sectors %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
-"D'altres particions estan cobrint el disc sencer.\n"
+"Altres particions cobreixen el disc sencer.\n"
 "Abans de tornar-hi esborreu-ne o reduïu-ne la seva mida.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4023,20 +3971,19 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 "No heu cobert el disc sencer amb la tercera partició, però el\n"
-"valor %d %s es solapa amb d'altres particions. La vostra entrada\n"
-"s'ha canviat per %d %s\n"
+"valor %d %s encavalca amb d'altres particions. S'ha canviat l'entrada\n"
+"per %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
-"Si desitgeu mantindre la compatibilitat amb SunOS/Solaris, considereu el "
-"deixar\n"
+"Si desitgeu mantenir la compatibilitat amb SunOS/Solaris, considereu deixar\n"
 "aquesta partició com a Disc sencer (5), començant en 0, amb %u sectors\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4044,13 +3991,14 @@ msgid ""
 "Type YES if you're very sure you would like that partition\n"
 "tagged with 82 (Linux swap): "
 msgstr ""
-"És altament recomenat que la partició en el desplaçament 0\n"
-"sigui UFS, EXT2FS o SunOS d'intercanvi. El posar Linux\n"
-"d'intercanvi pot destruir la taula de particions i el bloc d'arrencada.\n"
-"Escriviu SI si n'esteu segur de que desitgeu que la partició sigui\n"
-"etiquetada amb 82 (Linux d'intercanvi): "
+"Es recomana especialment que la partició en el desplaçament 0\n"
+"sigui UFS, EXT2FS o SunOS d'intercanvi. Si es posa Linux\n"
+"d'intercanvi, es pot destruir la taula de particions i el bloc d'arrencada.\n"
+"Escriviu S� si esteu segur que desitgeu que s'etiqueti la partició\n"
+"amb el 82 (Linux d'intercanvi): "
 
-#: fdisk/fdisksunlabel.c:659
+# FIXME
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4064,12 +4012,12 @@ msgstr ""
 "\n"
 "Disc %s (etiqueta de disc Sun): %d capçals, %d sectors, %d r.p.m.\n"
 "%d cilindres, %d cilindres alternatius, %d cilindres físics\n"
-"%d sectors per cilindre addicionals, inter-fullatge %d:1\n"
+"%d sectors per cilindre addicionals, entrellaçat %d:1\n"
 "%s\n"
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4082,16 +4030,16 @@ msgstr ""
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr "%*s Etiqu.  Comença   Acaba    Blocs  Id  Sistema\n"
+msgstr "%*s Senyal.  Inici      Final   Blocs   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cilindres alternatius"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Nombre de cilindres físics"
 
@@ -4101,7 +4049,7 @@ msgstr "FAT12"
 
 #: fdisk/i386_sys_types.c:8
 msgid "XENIX root"
-msgstr "XENIX root"
+msgstr "XENIX arrel"
 
 #: fdisk/i386_sys_types.c:9
 msgid "XENIX usr"
@@ -4115,32 +4063,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Estesa"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX arrencable"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "Gestor d'arrencada OS/2"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4149,14 +4091,13 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
 msgid "W95 Ext'd (LBA)"
-msgstr "W95 estesa (LBA)"
+msgstr "W95 Estesa (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -4184,7 +4125,7 @@ msgstr "HPFS/NTFS oculta"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
-msgstr "SmartSleep de AST"
+msgstr "SmartSleep d'AST"
 
 #: fdisk/i386_sys_types.c:28
 msgid "Hidden W95 FAT32"
@@ -4208,7 +4149,7 @@ msgstr "Plan 9"
 
 #: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
-msgstr "Recuperar PartitionMagic"
+msgstr "Recuperació PartitionMagic"
 
 #: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
@@ -4242,12 +4183,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4268,8 +4207,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4279,7 +4216,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD o SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4300,33 +4236,29 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Minix antic"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / antic Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
-#, fuzzy
 msgid "Linux swap / Solaris"
-msgstr "Intercanvi Linux"
+msgstr "Intercanvi Linux / Solaris"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
-msgstr "Unitat C: oculta de OS/2"
+msgstr "Unitat C: oculta d'OS/2"
 
 #: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
-msgstr "Linux estes"
+msgstr "Linux estesa"
 
 #: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
-msgstr "Joc de volúmens NTFS"
+msgstr "Joc de volums NTFS"
 
 #: fdisk/i386_sys_types.c:62
-#, fuzzy
 msgid "Linux plaintext"
-msgstr "Linux ext3"
+msgstr "Linux text"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4336,21 +4268,18 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
-msgstr "Hivernació de IBM Thinkpad"
+msgstr "Hivernació d'IBM Thinkpad"
 
 #: fdisk/i386_sys_types.c:68
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4377,7 +4306,7 @@ msgstr "S.f. BSDI"
 
 #: fdisk/i386_sys_types.c:75
 msgid "BSDI swap"
-msgstr "BSDI d'intercanvi"
+msgstr "Intercanvi de BSDI"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Boot Wizard hidden"
@@ -4388,9 +4317,8 @@ msgid "Solaris boot"
 msgstr "Arrencada Solaris"
 
 #: fdisk/i386_sys_types.c:78
-#, fuzzy
 msgid "Solaris"
-msgstr "Arrencada Solaris"
+msgstr "Solaris"
 
 #: fdisk/i386_sys_types.c:79
 msgid "DRDOS/sec (FAT-12)"
@@ -4416,30 +4344,22 @@ msgstr "Dades sense S.F."
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Utilitat Dell"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "Accés DOS"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "Sis. Fitx. BeOS"
@@ -4448,153 +4368,152 @@ msgstr "Sis. Fitx. BeOS"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Arrencada Linux/PA-RISC"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "Secundària DOS"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
-msgstr "error cercant en %s - no es pot cercar a %lu\n"
+msgstr "s'ha produït un error en cercar a %s - no es pot cercar a %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr "error cercant: S'esperava 0x%08x%08x, s'ha obtingut 0x%08x%08x\n"
+msgstr ""
+"s'ha produït un error en cercar: s'esperava 0x%08x%08x, s'ha obtingut 0x%08x%"
+"08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
-msgstr "memòria esgotada - abandonant\n"
+msgstr "s'ha esgotat la memòria - s'està abandonant\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
-msgstr "error de lectura en %s - no es pot llegir el sector %lu\n"
+msgstr ""
+"s'ha produït un error de lectura a %s - no s'ha pogut llegir el sector %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
-msgstr "ERROR: El sector %lu no té una signatura msdos\n"
+msgstr "ERROR: el sector %lu no té cap signatura msdos\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
-msgstr "error d'escriptura en %s - no es pot escriure el sector %lu\n"
+msgstr ""
+"s'ha produït un error d'escriptura a %s - no s'ha pogut escriure el sector %"
+"lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
-msgstr "no es pot obrir el sector de la partició desat al fitxer (%s)\n"
+msgstr "no s'ha pogut obrir el sector de la partició del fitxer desat (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
-msgstr "error d'escriptura en %s\n"
+msgstr "s'ha produït un error d'escriptura a %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
-msgstr "no es pot fer stat al fitxer de restaurar la partició (%s)\n"
+msgstr ""
+"no s'ha pogut executar stat al fitxer de restauració de la partició (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
-"mida incorrecte del fitxer de restitució de la partició - no es restituirà\n"
+"el fitxer de restauració de la partició té una mida incorrecta - no es "
+"restaurarà\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
-msgstr "memòria esgotada?\n"
+msgstr "s'ha esgotat la memòria?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
-msgstr "no es pot obrir el fitxer de restituir la partició (%s)\n"
+msgstr "no es pot obrir el fitxer de restauració de la partició (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
-msgstr "error llegint %s\n"
+msgstr "s'ha produït un error en llegir %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
-msgstr "no es pot obrir per a escriptura el dispositiu %s\n"
+msgstr "no s'ha pogut obrir per a escriptura el dispositiu %s\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
-msgstr "error escrivint el sector %lu en %s\n"
+msgstr "s'ha produït un error en escriure el sector %lu en %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
-msgstr "Disc %s: No es pot obtindre la geometria\n"
+msgstr "Disc %s: no s'ha pogut obtenir la geometria\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr "Disc %s : No es pot obtrindre'n la mida.\n"
+msgstr "Disc %s : no s'ha pogut obtenir la mida.\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Atenció: Començament=%lu - això sembla ser una partició\n"
-"en comptes del disc sencer. Usar el fdisk amb aquesta\n"
-"probablement no tingui cap sentit.\n"
-"[Useu l'opció --force si de veres ho desitgeu.]\n"
+"Avís: inici=%lu - sembla una partició i no un disc sencer.\n"
+"No té sentit que hi executeu fdisk.[Useu l'opció --force si realment ho "
+"desitgeu.]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr "Atenció: HDIO_GETGEO indica que hi han %lu capçals\n"
+msgstr "Avís: HDIO_GETGEO indica que hi ha %lu capçals\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr "Atenció: HDIO_GETGEO indica que hi han %lu sectors\n"
+msgstr "Avís: HDIO_GETGEO indica que hi ha %lu sectors\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr "Atenció: HDIO_GETGEO indica que hi han %lu cilindres\n"
+msgstr "Avís: HDIO_GETGEO indica que hi ha %lu cilindres\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Atenció: Improbable nombre de sectors (%lu); normalment com a molt 63\n"
-"Això donarà problemes amb el programari que usi adreces Cil./Capç./Sector\n"
+"Avís: el nombre de sectors és improbable (%lu); normalment com a molt 63\n"
+"Això donarà problemes amb el programari que usi adreces C/H/S\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4603,33 +4522,33 @@ msgstr ""
 "\n"
 "Disc %s: %lu cilindres, %lu capçals, %lu sectors/pista\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
-"%s de partició %s té un valor imposible per al capçal: %lu (hauria d'estar "
+"%s de partició %s té un valor impossible per al capçal: %lu (hauria d'estar "
 "entre 0 i %lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
-"%s de partició %s té un valor imposible per al sector: %lu (hauria d'estar "
+"%s de partició %s té un valor impossible per al sector: %lu (hauria d'estar "
 "entre 1 i %lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
-"%s de partició %s té un valor imposible per als cilindres: %lu (hauria "
+"%s de partició %s té un valor impossible per als cilindres: %lu (hauria "
 "d'estar entre 0 i %lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4638,44 +4557,44 @@ msgstr ""
 "Id  Nom\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
-msgstr "Rellegint la taula de particions...\n"
+msgstr "S'està rellegint la taula de particions...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
-"El comandament per a rellegir la taula de particions ha fallat\n"
-"Reinicieu el sistema ara, avans d'usar mkfs\n"
+"L'ordre per a tornar a llegir la taula de particions ha fallat\n"
+"Torneu a iniciar el sistema ara, abans d'usar mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
-msgstr "Error tancant %s\n"
+msgstr "S'ha produït un error en tancar %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
-msgstr "%s: Aquesta partició no existeix\n"
+msgstr "%s: aquesta partició no existeix\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
-msgstr "Format no reconegut; usant els sectors\n"
+msgstr "format no reconegut; s'està usant els sectors\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# taula de particions de %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr "format no implementat; usant %s\n"
+msgstr "format no implementat; s'està usant %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4684,12 +4603,12 @@ msgstr ""
 "Unitats = cilindres de %lu octets, blocs de 1024 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
-msgstr "   Disp. Arr.  Comença   Acaba #cil.    #blocs    Id  Sistema\n"
+msgstr "   Disp. Arr.  Inici     Final #cil.    #blocs    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4698,12 +4617,12 @@ msgstr ""
 "Unitats = sectors de 512 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
-msgstr "   Disp. Arr      Comença     Acaba #sectors  Id  Sistema\n"
+msgstr "   Disp. Arr      Inici       Final #sectors  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4712,393 +4631,388 @@ msgstr ""
 "Unitats = blocs de 1024 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
-msgstr "   Disp. Arr.    Comença    Acaba   #blocs   Id  Sistema\n"
+msgstr "   Disp. Arr.    Inici       Final   #blocs   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unitats = MiB de 1048576 octets, blocs de 1024 octets, comptant des de %d\n"
+"Unitats = mebibytes de 1048576 octets, blocs de 1024 octets, comptant des de "
+"%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
-msgstr "   Disp. Arr.  Comen.  Acaba  MB     #blocs    Id  Sistema\n"
+msgstr "   Disp. Arr.  Inici   Final  MiB    #blocs    Id. sistema\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tcomença: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"\t\tacaba: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
+"\t\tfinal: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
-"la partició cava en el cilindre %ld, més enllà de l'acabament del disc\n"
+msgstr "la partició acaba en el cilindre %ld, més enllà del final del disc\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "No s'han trobat particions\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
 "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 "For this listing I'll assume that geometry.\n"
 msgstr ""
-"Atenció: La taula de particions sembla haber-se creat\n"
-"  per a Cil./Capç./Sect.=*/%ld/%ld (en comptes de %ld/%ld/%ld).\n"
+"Avís: La taula de particions sembla haver-se creat\n"
+"  per a C/H/S=*/%ld/%ld (en comptes de %ld/%ld/%ld).\n"
 "Per a aquest llistat s'assumirà aquesta geometria.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "no hi ha cap taula de particions.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
-msgstr "estranyament, sols hi han definides %d particions.\n"
+msgstr "és estrany, només hi ha definides %d particions.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr ""
-"Atenció: La partició %s té una mida 0 però no està marcada com a buida\n"
+msgstr "Avís: la partició %s té una mida 0 però no està marcada com a buida\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "Atenció: La partició %s té una mida 0 i és d'arrencada\n"
+msgstr "Avís: la partició %s té una mida 0 i és arrencable\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
-msgstr "Atenció: La partició %s té una mida 0 i no comença en el zero\n"
+msgstr "Avís: la partició %s té una mida 0 i no comença en zero\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
-msgstr "Atenció: La partició %s "
+msgstr "Avís: la partició %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "no està contingut a dins de la partició %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
-msgstr "Atenció: Les particions %s "
+msgstr "Avís: les particions %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
-msgstr "i %s es solapen\n"
+msgstr "i %s encavalquen\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
-"Atenció: La partició %s conté part de la taula de particions\n"
-"(sector %lu) i la destruirà en quant s'ompli\n"
+"Avís: la partició %s conté part de la taula de particions\n"
+"(sector %lu) i la destruirà quan s'ompli\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
-msgstr "Atenció: La partició %s comença en el sector 0\n"
+msgstr "Avís: la partició %s comença en el sector 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
-msgstr "Atenció: La partició %s acaba més enllà de l'acabament del disc\n"
+msgstr "Avís: la partició %s s'extén més enllà del final del disc\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 "Entre les particions primàries, almenys una pot ser estesa\n"
-" (encara que això no és un problema sota Linux)\n"
+" (encara que això no és un problema en Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
-msgstr "Atenció: La partició %s no comença en al límit d'un cilindre\n"
+msgstr "Avís: la partició %s no comença al límit d'un cilindre\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
-msgstr "Atenció: La partició %s no acaba al límit d'un cilindre\n"
+msgstr "Avís: la partició %s no acaba al límit d'un cilindre\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Atenció: Hi ha més d'una partició primària marcada com d'arrencada (activa)\n"
-"Això no és problema per al LILO, però el MBR del DOS no arrencarà aquest "
+"Avís: hi ha més d'una partició primària marcada com d'arrencada (activa)\n"
+"Això no és problema per al LILO, però l'MBR del DOS no arrencarà aquest "
 "disc.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"Atenció: Usualment sols es pot arrencar des de particions primàries.\n"
-"El LILO no tindrà en compte l'etiqueta `d'arrencada'.\n"
+"Avís: normalment només es pot arrencar des de particions primàries.\n"
+"El LILO no tindrà en compte el senyalador d'«arrencada».\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Atenció: No hi ha cap partició primària marcada com d'arrencada (activa).\n"
+"Avís: no hi ha cap partició primària marcada com d'arrencada (activa).\n"
 "Això no és problema per al LILO, però el MBR de DOS no arrencarà aquest "
 "disc.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
-msgstr "començament"
+msgstr "inici"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"partició %s: Començament: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha "
-"trobat (%ld,%ld,%ld)\n"
+"partició %s: inici: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trobat "
+"(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
-msgstr "acaba"
+msgstr "final"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"partició %s: Acaba: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trovat "
+"partició %s: final: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trobat "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
-"La partició %s acaba en el cilindre %ld, més enllà de l'acabament del disc\n"
+"La partició %s acaba en el cilindre %ld, més enllà del final del disc\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
-"Atenció: Es desplaça el començament de la partició estesa de %ld a %ld\n"
-"(Sols amb el propòsit de llistar-la. No es canviarà el seu contingut).\n"
+"Avís: s'ha desplaçat l'inici de la partició estesa de %ld a %ld\n"
+"(Només per al llistat, no en canvia el contingut.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
-"Atenció: La partició estesa no comença al límit d'un cilindre.\n"
-"El DOS i Linux interpretaran el contingut d'un mode diferent.\n"
-"\n"
+"Avís: la partició estesa no comença al límit d'un cilindre.\n"
+"El DOS i Linux interpretaran el contingut de manera diferent.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
-msgstr "masses particions - s'ignoran les anteriors al núm: (%d)\n"
+msgstr "hi ha massa particions - s'ignoraran les posteriors a la: (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "l'arbre de particions?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
-msgstr "detectat Gestor de Disc - no es pot tractar això\n"
+msgstr "s'ha detectat el gestor de disc - no s'ha pogut gestionar\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
-msgstr "signatura DM6 trobada - abandonant\n"
+msgstr "s'ha trobat una signatura DM6 - s'està deixant còrrer\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estrany..., una partició estesa de mida 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estrany..., una partició BSD de mida 0?\n"
 
-#: fdisk/sfdisk.c:1624
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1622
+#, c-format
 msgid " %s: unrecognized partition table type\n"
-msgstr " %s: Partició no reconeguda\n"
+msgstr " %s: no s'ha pogut reconèixer el tipus de la taula de particions\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
-msgstr "s'ha especificat l'etiqueta -n: No s'ha canviat res\n"
+msgstr "s'ha especificat el senyalador -n: No s'ha canviat res\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
-msgstr "Falla al desar els antics sectors - avortant\n"
+msgstr "No s'ha pogut desar els sector antics - s'està avortant\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
-msgstr "Falla a l'escriure la partició en %s\n"
+msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
-msgstr "línia d'entrada llarga o incompleta - abandonant\n"
+msgstr "línia d'entrada llarga o incompleta - s'està sortint\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
-msgstr "error d'entrada: S'esperava `=' després del camp %s\n"
+msgstr ""
+"s'ha produït un error en l'entrada: s'esperava `=' després del camp %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
-msgstr "error d'entrada: Caràcter inesperat %c després del camp %s\n"
+msgstr ""
+"s'ha produït un error en l'entrada: no s'esperava el caràcter %c després del "
+"camp %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
-msgstr "entrada desconeguda: %s\n"
+msgstr "no s'ha pogut reconèixer l'entrada: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
-msgstr "número massa gran\n"
+msgstr "el nombre és massa gran\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
-msgstr "dades estranyes després del número\n"
+msgstr "dades estranyes després del nombre\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "no hi ha espai per al descriptor de partició\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
-msgstr "no es pot crear una partició estesa adjunta\n"
+msgstr "no s'ha pogut crear una partició estesa adjunta\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
-msgstr "masses camps a l'entrada\n"
+msgstr "hi ha massa camps a l'entrada\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "No queda més espai\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
-msgstr "Tipus no permés\n"
+msgstr "Tipus no permès\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr ""
-"Atenció: La mida aconseguida (%lu) excedeix la màxima acceptable de (%lu)\n"
+msgstr "Avís: la mida indicada (%lu) excedeix la màxima acceptable (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
-msgstr "Atenció: Partició buida\n"
+msgstr "Avís: partició buida\n"
 
-#: fdisk/sfdisk.c:2141
+# DUBTE
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
-msgstr "Atenció: Començament de la partició incorrecte (abans %lu)\n"
+msgstr "Avís: l'inici de la partició no és correcte (mínim %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
-msgstr "Etiqueta d'arrencada desconeguda - escolliu - o *\n"
+msgstr "no s'ha pogut reconèixer el senyalador d'arrencada - escolliu - o *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
-msgstr "especificació parcial de cil,capç,sect?\n"
+msgstr "especificació parcial de c,h,s?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
-msgstr "Partició estesa a on no s'esperava\n"
+msgstr "La partició estesa no és on s'esperava\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "entrada dolenta\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
-msgstr "masses particions\n"
+msgstr "hi ha massa particions\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
-"Entrada en el següent format; els camps absents tenen un valor per defecte.\n"
-"<començament> <mida> <tipus [E,S,L,X,hex]> <arrencada [-,*]> <cil,capç,sec> "
-"<cil,capç,sec>\n"
-"Normalment sols necessitarieu especificar <començament> i <mida> (i potser "
-"<tipus>).\n"
+"Entrada en el següent format; els camps absents obtenen un valor per "
+"defecte.\n"
+"<inici> <mida> <tipus [E,S,L,X,hex]> <arrencable [-,*]> <c,h,s> <c,h,s>\n"
+"Normalment només cal especificar <inici> i <mida> (i potser <tipus>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versió"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "Ús: %s [opcions] dispositiu ...\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
-msgstr "dispositiu: Semblant a /dev/hda o /dev/sda"
+msgstr "dispositiu: semblant a /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "opcions útils:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]:  Mostra la mida d'una partició"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprimeix o canvia l'identificador de la partició"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Mostra les particions de cada dispositiu"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
-"    -d [o --dump]:       Igual, però amb un format adequat per l'entrada "
-"posterior"
+"    -d [o --dump]:       El mateix, però amb un format adequat per a una\n"
+"                         entrada posterior"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]:  Nombre de cilindres, etc. des de 1 en comptes de 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5106,185 +5020,185 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Accepta/reporta en unitats de sectors/blocs/"
 "cilindres/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Llista els tipus de particions conegudes"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
-"    -D [o --DOS]:        Per compatibilitat amb DOS: Es perd una mica d'espai"
+"    -D [o --DOS]:        Per compatibilitat amb DOS: es perd una mica d'espai"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:    Fa que el nucli rellegeixi la taula de particions"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
-msgstr "    -N# :                Sols canvia la partició amb el número #"
+msgstr "    -N# :                Només canvia la partició amb el número #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
-msgstr "    -n :                 No escriu realment al disc"
+msgstr "    -n :                 No escrigues realment al disc"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fitxer :          Desa els sectors que es sobreescriuran en un fitxer"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fitxer:           Restaura aquests sectors altra vegada"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprimeix la versió"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprimeix aquest missatge"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "opcions perilloses:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
-"    -g [o --show-geometry]:  Imprimeix la idea del nucli de la geometria"
+"    -g [o --show-geometry]:  Imprimeix la idea que té el nucli de la "
+"geometria"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
-"    -g [o --show-geometry]:  Imprimeix la idea del nucli de la geometria"
+"    -G [o --show-pt-geometry]: Imprimeix la geometria que s'ha endevinat\n"
+"                               partir de la taula de particions"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [o --show-extended]:  També mostra en l'eixida les particions "
-"esteses\n"
-"                             o espera els seus descriptors en l'entrada"
+"    -x [o --show-extended]:  També llista les particions esteses a la "
+"sortida\n"
+"                             o els descriptors esperats en l'entrada"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
-"    -L  [o --Linux]:       No mostra avisos sobre aspectes irrellevants per "
-"a Linux"
+"    -L  [o --Linux]:       No mostra avisos sobre aspectes irrellevants per\n"
+"                           a Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
-msgstr "    -q  [o --quiet]:       Suprimeix els missatges d'advertència"
+msgstr "    -q  [o --quiet]:       Suprimeix els avisos"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Podeu modificar la geometria detectada usant:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [o --cylinders #]: Estableix el nombre de cilindres que s'usaran"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [o --heads #]:     Estableix el nombre de capçals que s'usaran"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [o --sectors #]:   Estableix el nombre de sectors que s'usaran"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Podeu desactivar tota comprovació de consistència amb:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [o --force]:       Farà el que li digueu, encara que sigui estúpid"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
-msgstr "Ús:"
+msgstr "Forma d'ús:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositiu\t\t enumera les particions actives del dispositiu\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr ""
-"%s dispositiu n1 n2 ... activar particions n1 ..., desactivar la resta\n"
+msgstr "%s dispositiu n1 n2 ... activa particions n1 ..., desactiva la resta\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -Un perifèric\t activa la partició n, desactiva la resta\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
-msgstr "cap comandament?\n"
+msgstr "cap ordre?\n"
 
-#: fdisk/sfdisk.c:2639
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2635
+#, c-format
 msgid "total: %llu blocks\n"
-msgstr "total: %d blocs\n"
+msgstr "total: %llu blocs\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "ús: sfdisk --print-id dispositiu partició_número\n"
+msgstr "forma d'ús: sfdisk --print-id dispositiu número_partició\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr "ús: sfdisk --change-id dispositiu número_partició Id\n"
+msgstr "forma d'ús: sfdisk --change-id dispositiu número_partició Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "ús: sfdisk --id dispositiu partició_número [Id]\n"
+msgstr "forma d'ús: sfdisk --id dispositiu partició_número [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
-msgstr "sols podeu especificar un dispositiu (excepte amb -l o -s)\n"
+msgstr "només podeu especificar un dispositiu (excepte amb -l o -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "no es pot obrir %s per a lectura-escriptura\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "no es pot obrir %s per a lectura\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcte\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s : %ld cilindres, %ld capçals, %ld sectors/pista\n"
 
-#: fdisk/sfdisk.c:2807
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2803
+#, c-format
 msgid "Cannot get size of %s\n"
-msgstr "no es pot aconseguir la mida de %s"
+msgstr "No s'ha pogut obtenir la mida de %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "octet actiu incorrecte: 0x%x en comptes de 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5292,44 +5206,45 @@ msgstr ""
 "Fet\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 "Teniu %d particions primàries actives. Això no és important per al LILO,\n"
-"però el MBR del DOS sols pot arrencar discs amb una partició activa.\n"
+"però l'MBR del DOS només pot arrencar discs amb una partició activa.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partició %s té l'identificador %x i no està oculta\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador dolent %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Aquest disc està actualment en ús.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr "Error fatal: No es pot trobar %s\n"
+msgstr "S'ha produït un error fatal: no s'ha pogut trobar %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
-msgstr "Atenció: %s no és un dispositiu de blocs\n"
+msgstr "Avís: %s no és un dispositiu de blocs\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
-msgstr "Comprovant que en aquest moment ningú estigui usant aquest disc...\n"
+msgstr ""
+"S'està comprovant que en aquest moment ningú estigui usant aquest disc...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5338,74 +5253,75 @@ msgid ""
 msgstr ""
 "\n"
 "Aquest disc està actualment en ús; reparticionar-lo probablement sigui\n"
-"una mala idea. Desmunteu tots els sistemes de fitxers i efectueu un\n"
+"una mala idea. Desmunteu tots els sistemes de fitxers i executeu\n"
 "swapoff en totes les particions d'intercanvi del disc.\n"
-"Useu l'etiqueta --no-reread per a suprimir aquesta comprovació.\n"
+"Useu el senyalador --no-reread per a suprimir aquesta comprovació.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
-msgstr "Useu l'etiqueta --force per a obviar totes les comprovacions.\n"
+msgstr "Useu el senyalador --force per a obviar totes les comprovacions.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "Correcte\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Antiga situació:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
-msgstr "La partició %d no existeix; no es pot canviar\n"
+msgstr "La partició %d no existeix; no s'ha pogut canviar\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nova situació:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
-"No veig aquestes particions adequades - no he canviat res.\n"
+"Aquestes particions no em semblen bé - no s'ha canviat res.\n"
 "(Si realment desitgeu fer això, useu l'opció --force).\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
-msgstr "No veig això adequat - probablement hagueu de respondre No\n"
+msgstr "No em sembla bé - probablement hagueu de respondre No\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Esteu satisfet amb això? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Desitgeu escriure això al disc? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 "\n"
-"sfdisk: Final prematur de l'entrada\n"
+"sfdisk: final prematur de l'entrada\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
-msgstr "Sortint - no s'ha canviat res\n"
+msgstr "S'està sortint - no s'ha canviat res\n"
 
-#: fdisk/sfdisk.c:3083
+# FIXME: 'y', 'n', 'q'. Are they translatable?
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
-msgstr "Si us plau responeu amb una: y,n,q\n"
+msgstr "Respongueu amb una: y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5414,7 +5330,7 @@ msgstr ""
 "S'ha escrit correctament la nova taula de particions\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5427,7 +5343,7 @@ msgstr ""
 
 #: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
-msgstr "Escolliu `getopt --help' per a obtindre més informació.\n"
+msgstr "Escolliu `getopt --help' per obtenir més informació.\n"
 
 #: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
@@ -5435,31 +5351,29 @@ msgstr "opció llarga buida després de l'argument -l o --long"
 
 #: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
-msgstr ""
-"intèrpret de comandaments desconegut després de l'argument -s o --shell"
+msgstr "intèrpret d'ordres desconegut després de l'argument -s o --shell"
 
 #: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr "ús: getopt cadena_d'opcions paràmetres\n"
+msgstr "Forma d'ús: getopt cadena_opcions paràmetres\n"
 
 #: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
-msgstr "      getopt [opcions] [--] cadena_d'opcions paràmetres\n"
+msgstr "       getopt [opcions] [--] cadena_opcions paràmetres\n"
 
 #: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-msgstr "      getopt [opcions] -o|--options cadena_d'opcions [opcions] [--]\n"
+msgstr "       getopt [opcions] -o|--options cadena_opcions [opcions] [--]\n"
 
 #: getopt/getopt.c:327
 msgid "              parameters\n"
-msgstr "             paràmetres\n"
+msgstr "              paràmetres\n"
 
 #: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
-"  -a, --alternative            Permet opcions llargues amb un sol "
-"començament -\n"
+"  -a, --alternative            Permet opcions llargues amb només un -\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
@@ -5467,42 +5381,41 @@ msgstr "  -h, --help                   Aquesta petita guia d'ús\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr ""
-"  -l, --longoptions=opc_llarg  Opcions llargues per a ser reconegudes\n"
+msgstr "  -l, --longoptions=opc_llarg   Opcions llargues a reconèixer\n"
 
 #: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
-"  -n, --name=nom_programa      El nom sota el qual s'informa dels errors\n"
+"  -n, --name=nom_programa      El nom amb el que s'informa dels errors\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
-msgstr "  -o, --options=cadena_opcions Opcions curtes per a ser reconegudes\n"
+msgstr "  -o, --options=cadena_opcions Opcions curtes a reconèixer\n"
 
 #: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
-"  -q, --quiet                  Deshabilita els informes d'error mitjançant\n"
+"  -q, --quiet                  Inhabilita els informes d'error mitjançant\n"
 "                               getopt(3)\n"
 
 #: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
-msgstr "  -Q, --quiet-output           No hi ha eixida normal\n"
+msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
 
 #: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
-"  -s, --shell=shell            Estableix les convencions amb que es crida a\n"
-"                               l'interpret de comandaments\n"
+"  -s, --shell=intèrpret_ordres Estableix els mateixos convenis quant a les\n"
+"                               cometes que l'interpret d'ordres indicat\n"
 
 #: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
-msgstr "  -T, --test                   Provar per a la versió getopt(1)\n"
+msgstr "  -T, --test                   Prova la versió del getopt(1)\n"
 
 #: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -u, --unqote                 No posa entre cometes l'eixida\n"
+msgstr "  -u, --unqote                 No es posarà la sortida entre cometes\n"
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
@@ -5519,195 +5432,199 @@ msgstr "getopt (millorat) 1.1.3\n"
 
 #: getopt/getopt.c:450
 msgid "internal error, contact the author."
-msgstr "error intern; contacteu amb l'autor."
+msgstr "s'ha produït un error intern; contacteu amb l'autor."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
-msgstr "arrencant des de MILO\n"
+msgstr "s'ha arrencat des de MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Rellotge BCD Ruffian\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
-msgstr "port del rellotge ajustat a 0x%x\n"
+msgstr "s'ha ajustat el port del rellotge a 0x%x\n"
 
-#: hwclock/cmos.c:214
+# FIXME: what the heck is this supposed to tell?
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+# FIXME: atomic what?
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: Comprovació de %s atòmic ha fallat per 1000 iteracions!"
+msgstr "%s: comprovació de %s atòmic ha fallat per 1000 iteracions!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr "No es pot obrir /dev/port: %s"
+msgstr "No s'ha pogut obrir /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
-msgstr "Ha fallat l'obtenció del permís perque no s'ha intentat.\n"
+msgstr "No s'ha pogut obtenir el permís perquè no s'ha intentat.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
-"%s no pot aconseguir l'accés al port de E/S: La crida iopl(3) ha fallat.\n"
+"%s no pot aconseguir l'accés al port d'E/S: la crida iopl(3) ha fallat.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
-msgstr "Probablement necessitareu privilegis de root.\n"
+msgstr "Probablement necessiteu privilegis de root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
-msgstr "Assumint que el rellotge del maquinari té l'hora %s.\n"
+msgstr "S'està assumint que el rellotge del maquinari manté l'hora %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "local"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr "%s: Atenció: Tercera línia desconeguda al fitxer adjtime\n"
+msgstr "%s: Avís: no s'ha reconegut la tercera línia del fitxer adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(S'esperava: `UTC', `LOCAL' o res).\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr "Fet l'últim ajust de desfasament, %ld segons després de 1969\n"
+msgstr "L'últim ajust de desfasament es va fer %ld segons després de 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr "Feta la última calibració, %ld segons després de 1969\n"
+msgstr "L'última calibració es va fer %ld segons després de 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr "El rellotge de maquinari té l'hora %s\n"
+msgstr "El rellotge del maquinari té l'hora %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "desconegut"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
-msgstr "Esperant la senyal del rellotge...\n"
+msgstr "S'està esperant el tic del rellotge...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
-msgstr "...rebuda la senyal del rellotge\n"
+msgstr "...s'ha rebut el tic del rellotge\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Valors incorrectes en el rellotge del maquinari: %4d/%.2d/%.2d %.2d:%.2d:"
 "%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hora del maquinari : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segons després de "
 "1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr "Hora llegida des del maquinari : %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr ""
+"Hora llegida del rellotge del maquinari : %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
-"Establint l'hora del maquinari en %.2d:%.2d:%.2d = %ld segons des de 1969\n"
+"S'està establint l'hora del maquinari en %.2d:%.2d:%.2d = %ld segons des de "
+"1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
-msgstr "El rellotge no s'ha modificat - sols s'ha provat.\n"
+msgstr "El rellotge no s'ha modificat - només s'ha provat.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
 "El temps transcorregut des de l'hora de referència és de %.6f segons.\n"
-"Augmentant el retard fins al següent segon complet.\n"
+"S'ha endarrerit el moment en què s'arribarà al següent segon complet.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
-"Els registres del rellotge del maquinari conté valors no vàlids (p.e. dia 50 "
-"del mes) o excedeixen el rang que poden usar (p.e. l'any 2095).\n"
+"Els registres del rellotge del maquinari contenen valores invàlids (p.ex. "
+"dia 50 del mes) o excedeixen el rang que poden usar (p.e. l'any 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f segons\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "No s'ha especificat l'opció --date.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "argument --date massa llarg\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
 "El valor de l'opció --date no és una data vàlida.\n"
-"En concret, aquesta conté cometes.\n"
+"En concret, conté cometes.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr "Emetent les dades del comandament: %s\n"
+msgstr "S'està executant l'ordre date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
-"No es pot executar el programa 'date' en l'interpret de comandaments /bin/"
-"sh. popen() ha fallat"
+"No s'ha pogut executar el programa «date» en l'interpret d'ordres /bin/sh. "
+"popen() ha fallat"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
-msgstr "resposta del comandament date = %s\n"
+msgstr "resposta de l'ordre date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5716,13 +5633,13 @@ msgid ""
 "The response was:\n"
 "  %s\n"
 msgstr ""
-"El comandament date executat per %s retorna resultats inesperats.\n"
-"El comandament fou:\n"
+"L'ordre date executada per %s ha retornat resultats inesperats.\n"
+"L'ordre era:\n"
 "  %s\n"
-"La resposta fou:\n"
+"La resposta ha estat:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5732,19 +5649,19 @@ msgid ""
 "The response was:\n"
 " %s\n"
 msgstr ""
-"El comandament date executat per %s retorna quelcom altre a un valor enter "
-"quan s'esperava el valor de l'hora convertida.\n"
-"El comandament fou:\n"
+"L'ordre date executada per %s no ha tornat cap valor enter tot i que "
+"s'esperava el valor de l'hora convertida.\n"
+"L'ordre era:\n"
 "  %s\n"
-"La resposta fou:\n"
+"La resposta ha estat:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "la cadena de la data %s equival a %ld segons des de 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5753,66 +5670,66 @@ msgstr ""
 "El rellotge de maquinari no conté una hora vàlida, pel que no es pot "
 "establir l'hora del sistema a partir d'aquest valor.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Cridant a settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
-"No configuro el rellotge del sistema donat que l'execució és en mode de "
-"prova.\n"
+"No s'està configurant el rellotge del sistema perquè s'està executant en "
+"mode de prova.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
-msgstr "Heu de ser superusuari per a configurar rellotge del sistema.\n"
+msgstr "Heu de ser el superusuari per configurar rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ha fallat"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
-"No s'ajusta el factor de desfase donat que el rellotge del maquinari "
-"contenia prèviament desperdicis.\n"
+"No s'ha ajustat el factor de desfasament perquè el rellotge del maquinari "
+"contenia valors despreciables.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"No s'ajusta el factor de desfase degut a que la data de l'última\n"
-"calibració és cero, així que l'historial és dolent i es necessària\n"
+"No s'ha ajustat el factor de desfasament perquè la data de l'última\n"
+"calibració és zero, així que l'historial és dolent, i és necessària\n"
 "una calibració des del començament.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
-"No s'ajusta el factor de desfase donat que fa menys d'un dia de la la última "
+"No s'ajusta el factor de desfasament perquè fa menys d'un dia de l'última "
 "calibració.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5820,71 +5737,69 @@ msgid ""
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 "El rellotje s'ha desfasat %.1f segons en els últims %d segons, tot i emprar "
-"un factor de desfase de %f segons diaris.\n"
-"Ajustan el factor de desfase en %f segons diaris\n"
+"un factor de desfasament de %f segons diaris.\n"
+"S'està ajustant el factor de desfasament a %f segons diaris\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "El temps des de l'últim ajust és de %d segons\n"
+msgstr "Han transcorregut %d segons des de l'últim ajust\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
-"Necessiteu inserir %d segons i refer la referència de l'hora tants %.6f "
-"segons enradera\n"
+"S'han d'inserir %d segons i referir el temps anterior a fa %.6f segons\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr "No s'actualitza el fitxer adjtime degut al mode de prova.\n"
+msgstr ""
+"No s'actualitzarà el fitxer adjtime perquè s'executa en mode de prova.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
-"S'hauria d'escriure el següent en %s:\n"
+"S'hauria escrit el següent a %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
-msgstr "Paràmetres d'ajustament del desfase no actualitzats.\n"
+msgstr "No s'han actualitzat els paràmetres d'ajustament del desfasament.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
-"El rellotje de maquinari no conté una hora vàlida, pel que no es pot "
-"ajustar.\n"
+"El rellotje de maquinari no conté una hora vàlida, i no es pot ajustar.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
-"L' ajustament necessari és inferior a un segon, pel que no s'estableix al "
-"rellotge.\n"
+"L'ajustament necessari és inferior a un segon, no s'ajustarà el rellotge.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Usant %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "No s'ha trobat cap interfície de rellotge usable.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "No es pot establir el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5892,41 +5807,47 @@ msgid ""
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
-"El nucli té un valor de època per al rellotge de maquinari sols en les "
+"El nucli només té un valor d'època per al rellotge del maquinari en les "
 "màquines Alpha.\n"
 "Aquesta còpia de hwclock es va compilar per a una màquina no Alpha (pel que\n"
-"possiblement ara no s'executa en una màquina Alpha). No es pren cap acció.\n"
+"possiblement ara no s'executi en cap màquina Alpha). No s'ha executat cap "
+"acció.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
-msgstr "No es pot obtindre el valor de època des del nucli.\n"
+msgstr "No es pot obtenir el valor d'època del nucli.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
-msgstr "El nucli assumeix un valor de època de %lu\n"
+msgstr "El nucli assumeix un valor d'època de %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
-"Per a establir el valor de època, haureu d'usar l'opció 'epoch' per a "
-"indicar a quin valor s'ha d'establir.\n"
+"Per establir el valor d'època, haureu d'usar l'opció 'epoch' per a indicar a "
+"quin valor s'ha d'establir.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
-msgstr "No s'estableix el valor de època en %d - sols es prova.\n"
+msgstr "No s'establirà el valor de l'època a  %d - només s'està provant.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
-msgstr "No es pot establir el valor de època en el nucli.\n"
+msgstr "No es pot establir el valor d'època en el nucli.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s des de %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5959,168 +5880,169 @@ msgid ""
 msgstr ""
 "hwclock - Consulta i configura el rellotge de maquinari (RTC)\n"
 "\n"
-"Ús: hwclock [funció] [opcions...]\n"
+"Forma d'ús: hwclock [funció] [opcions...]\n"
 "\n"
 "Funcions:\n"
 "  --help        Mostra aquesta ajuda\n"
-"  --show        Llegeix el RTC i imprimeix el resultat\n"
-"  --set         Estableix el RTC en l'hora proporcionada amb --date\n"
+"  --show        Llegeix el RTC i n'imprimeix el resultat\n"
+"  --set         Estableix el RTC a l'hora proporcionada amb --date\n"
 "  --hctosys     Estableix l'hora del sistema a partir del RTC\n"
-"  --systohc     Estableix el RTC en l'hora actual del sistema\n"
-"  --adjust      Ajusta el RTC per a compensar el desfàs sistemàtic des de \n"
-"                la última vegada que s'establi o ajustà el rellotge\n"
-"  --getepoch    Imprimeix el valor de època del RTC del nucli\n"
-"  --setepoch    Estableix el valor de època del RTC del nucli \n"
-"                en el valor proporcionat en --epoch\n"
-"  --version     Imprimeix la versió de hwclock en l'eixida estàndard\n"
+"  --systohc     Estableix el RTC a l'hora actual del sistema\n"
+"  --adjust      Ajusta el RTC per a compensar el desfasament sistemàtic des "
+"de \n"
+"                la última vegada que es va establir o ajustar el rellotge\n"
+"  --getepoch    Imprimeix el valor de l'època del RTC del nucli\n"
+"  --setepoch    Estableix el valor de l'època del RTC del nucli \n"
+"                al valor proporcionat amb --epoch\n"
+"  --version     Imprimeix la versió de hwclock a la sortida estàndard\n"
 "\n"
 "Opcions: \n"
 "  --utc         El RTC està en temps universal coordinat\n"
 "  --localtime   El RTC té l'hora local\n"
-"  --directisa   Accedeix al bus ISA directament en comptes de a %s\n"
+"  --directisa   Accedeix al bus ISA directament en comptes de %s\n"
 "  --badyear     Ignora l'any del RTC ja que el BIOS no funciona\n"
-"  --date        Especifica el temps en que es desitja establir el RTC\n"
+"  --date        Especifica el temps en què es desitja establir el RTC\n"
 "  --epoch=any   Especifica l'any que correspon al començament del valor de\n"
 "                l'època del RTC\n"
-"  --noadjfile   No accedir a /etc/adjtime. Requereix l'ús de --utc o --"
-"localtime\n"
+"  --noadjfile   No accedeixis a /etc/adjtime. Requereix l'ús de --utc o bé\n"
+"                --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
-"                Indica al RTC el tipus de Alpha (veure hwclock(8))\n"
+"                Indica al RTC el tipus d'Alpha que teniu (vegeu hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s no admet arguments que no siguin opcions. Heu especificat %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 "Heu especificat múltiples funcions.\n"
-"Sols podeu fer-ne una cada vegada.\n"
+"Només podeu fer-ne una a la vegada.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
-"%s: Les opcions --utc i --localtime s'exclouen mutuament. Les heu "
+"%s: Les opcions --utc i --localtime s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
-"%s: Les opcions --adjust i --noadjfile s'exclouen mutuament. Les heu "
+"%s: Les opcions --adjust i --noadjfile s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Amb --noadjfile, haureu d'especificar --utc o --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr "Hora establerta no usable. No es pot establir el rellotge.\n"
+msgstr ""
+"L'hora indicada per establir no és usable. No s'ha tocat el rellotge.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr "Ho sento, sols el superusuari pot canviar el rellotge de maquinari.\n"
+msgstr "Només el superusuari pot canviar el rellotge del maquinari.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr "Ho sento, sols el superusuari port canviar el rellotge del sistema.\n"
+msgstr "Només el superusuari port canviar el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
-"Ho sento, sols el superusuari pot canviar el valor de època del rellotge de "
+"Només el superusuari pot canviar el valor de l'època del rellotge del "
 "maquinari en el nucli.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
-"No es pot accedir al rellotge de maquinari mitjançant un dels mètodes "
+"No s'ha pogut accedir al rellotge del maquinari mitjançant cap dels mètodes "
 "coneguts.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
-"Useu l'opció --debug per a veure els detalls de la recerca d'un mètode "
+"Useu l'opció --debug per veure els detalls de la recerca d'un mètode "
 "d'accés.\n"
 
 #: hwclock/kd.c:55
 #, c-format
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr "Esperant en bucle a que canviï l'hora de KDGHWCLK\n"
+msgstr "S'està esperant en bucle a que canviï l'hora de KDGHWCLK\n"
 
 #: hwclock/kd.c:58
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr "Falla de ioctl KDGHWCLK al llegir l'hora"
+msgstr "No s'ha pogut executar ioctl KDGHWCLK per llegir l'hora"
 
 #: hwclock/kd.c:79 hwclock/rtc.c:188
 #, c-format
 msgid "Timed out waiting for time change.\n"
-msgstr "Temps excedit durant l'espera del canvi d'hora.\n"
+msgstr "S'ha excedit el temps d'espera per a què canviés l'hora.\n"
 
 #: hwclock/kd.c:83
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "Falla de ioctl KDGHWCLK al llegir l'hora en el bucle"
+msgstr "No s'ha pogut executar ioctl KDGHWCLK per llegir l'hora en el bucle"
 
 #: hwclock/kd.c:105
 #, c-format
 msgid "ioctl() failed to read time from %s"
-msgstr "La comprovació de ioctl() no ha llegit l'hora des de %s"
+msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
 #: hwclock/kd.c:141
 msgid "ioctl KDSHWCLK failed"
-msgstr "Falla de ioctl KDGHWCLK"
+msgstr "No s'ha pogut executar ioctl KDGHWCLK"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr "No es pot obrir /dev/tty1 o /dev/vc/1"
+msgstr "No s'ha pogut obrir /dev/tty1 o /dev/vc/1"
 
 #: hwclock/kd.c:181
 msgid "KDGHWCLK ioctl failed"
-msgstr "Falla de ioctl KDGHWCLK"
+msgstr "No s'ha pogut executar ioctl KDGHWCLK"
 
 #: hwclock/rtc.c:116 hwclock/rtc.c:209
 #, c-format
 msgid "open() of %s failed"
-msgstr "Falla de open() de %s"
+msgstr "No s'ha pogut executar open() de %s"
 
 #: hwclock/rtc.c:150
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
-msgstr "La comprovació de ioctl() en %s ha fallat al llegir l'hora.\n"
+msgstr "No s'ha pogut executar ioctl() a %s per llegir l'hora.\n"
 
 #: hwclock/rtc.c:172
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
-msgstr "Esperant en bucle per a canviar l'hora des de %s\n"
+msgstr "S'està esperant en bucle per a canviar l'hora de %s\n"
 
 #: hwclock/rtc.c:227
 #, c-format
@@ -6130,49 +6052,48 @@ msgstr "%s no té funcions d'interrupció.  "
 #: hwclock/rtc.c:238
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr ""
-"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+msgstr "No s'ha pogut executar read() a %s per esperar el tic del rellotge."
 
 #: hwclock/rtc.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick failed"
-msgstr ""
-"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+msgstr "No s'ha pogut executar select() a %s per esperar el tic del rellotge."
 
 #: hwclock/rtc.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick timed out\n"
 msgstr ""
-"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+"S'ha excedit el temps d'espera en executar select() a %s en esperar\n"
+"el tic del rellotge.\n"
 
 #: hwclock/rtc.c:268
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
-"La comprovació de ioctl() en %s ha fallat al desactivar les interrupcions "
+"No s'ha pogut executar ioctl() a %s per desactivar les interrupcions\n"
 "d'actualització"
 
 #: hwclock/rtc.c:271
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"La comprovació de ioctl() en %s ha fallat inesperadament a l'activar les "
-"interrupcions d'actualització"
+"No s'ha pogut executar ioctl() a %s per activar les interrupcions\n"
+"d'actualització, ha fallat inesperadament"
 
 #: hwclock/rtc.c:330
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr "La comprovació de ioctl() en %s ha fallat a l'establir l'hora.\n"
+msgstr "No s'ha pogut executar ioctl() a %s per establir l'hora.\n"
 
 #: hwclock/rtc.c:336
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr "La comprovació de ioctl(%s) ha finalitzat correctament.\n"
+msgstr "S'ha executat ioctl(%s) satisfactòriament.\n"
 
 #: hwclock/rtc.c:365
 #, c-format
 msgid "Open of %s failed"
-msgstr "Error obrint %s"
+msgstr "S'ha produït un error en obrir %s"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
@@ -6181,8 +6102,8 @@ msgid ""
 "device driver via the device special file %s.  This file does not exist on "
 "this system.\n"
 msgstr ""
-"Per a modificar el valor de època del nucli, heu d'accedir al controlador "
-"del dispositiu 'rtc' de Linux mitjançant el fitxer especial de dispositiu %"
+"Per a modificar el valor de l'època del nucli, heu d'accedir al controlador "
+"del dispositiu «rtc» de Linux mitjançant el fitxer especial de dispositiu %"
 "s. Aquest fitxer no existeix en aquest sistema.\n"
 
 #: hwclock/rtc.c:388 hwclock/rtc.c:434
@@ -6193,26 +6114,22 @@ msgstr "No es pot obrir %s"
 #: hwclock/rtc.c:395
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr "La comprovació de ioctl(RTC_EPOCH_READ) en %s ha fallat"
+msgstr "No s'ha pogut executar ioctl(RTC_EPOCH_READ) a %s"
 
 #: hwclock/rtc.c:401
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
-"s'ha llegit el valor de època %ld des de %s amb ioctl RTC_EPOCH_READ.\n"
+msgstr "s'ha llegit el valor de l'època %ld de %s amb ioctl RTC_EPOCH_READ.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr "El valor de època no pot ser inferior a 1900. Heu requerit %ld\n"
+msgstr "El valor d'època no pot ser inferior a 1900. Heu indicat %ld\n"
 
 #: hwclock/rtc.c:439
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr "establint la època a %ld amb ioctl RTC_EPOCH_SET en %s.\n"
+msgstr "s'està establint l'època a %ld amb ioctl RTC_EPOCH_SET a %s.\n"
 
 #: hwclock/rtc.c:444
 #, c-format
@@ -6225,48 +6142,45 @@ msgstr ""
 #: hwclock/rtc.c:447
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr "La comprovació de ioctl(RTC_EPOCH_SET) de %s ha fallat"
+msgstr "No s'ha pogut executar ioctl(RTC_EPOCH_SET) a %s"
 
 #: login-utils/agetty.c:312
 msgid "calling open_tty\n"
-msgstr "cridant open_tty\n"
+msgstr "s'està cridant open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
-msgstr "cridant termio_init\n"
+msgstr "s'està cridant termio_init\n"
 
 #: login-utils/agetty.c:330
 msgid "writing init string\n"
-msgstr "escrivint la cadena inicial\n"
+msgstr "s'està escrivint la cadena inicial\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "abans del mode autobaud\n"
 
 #: login-utils/agetty.c:352
 msgid "waiting for cr-lf\n"
-msgstr "esperant durant cr-lf\n"
+msgstr "s'està esperant cr-lf\n"
 
 #: login-utils/agetty.c:356
 #, c-format
 msgid "read %c\n"
-msgstr "llegit %c\n"
+msgstr "s'ha llegit %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
-msgstr "llegint el nom d'accés\n"
+msgstr "s'està llegint el nom d'entrada\n"
 
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "%s: No pot executar %s: %m"
+msgstr "%s: no s'ha pogut executar %s: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
-msgstr "no es pot executar malloc() per la cadena d'inicialització"
+msgstr "no s'ha pogut executar malloc() per a la cadena d'inicialització"
 
 #: login-utils/agetty.c:471
 #, c-format
@@ -6279,11 +6193,11 @@ msgstr "després del bucle getopt\n"
 
 #: login-utils/agetty.c:530
 msgid "exiting parseargs\n"
-msgstr "traient parseargs\n"
+msgstr "s'està traient parseargs\n"
 
 #: login-utils/agetty.c:542
 msgid "entered parse_speeds\n"
-msgstr "entrant parse_speeds\n"
+msgstr "s'ha entrat parse_speeds\n"
 
 #: login-utils/agetty.c:545
 #, c-format
@@ -6292,11 +6206,11 @@ msgstr "velocitat incorrecta: %s"
 
 #: login-utils/agetty.c:547
 msgid "too many alternate speeds"
-msgstr "masses velocitats alternatives"
+msgstr "massa velocitats alternatives"
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
-msgstr "traient parsespeeds\n"
+msgstr "s'està traient parsespeeds\n"
 
 #: login-utils/agetty.c:649
 #, c-format
@@ -6306,9 +6220,8 @@ msgstr "/dev: chdir() ha fallat: %m"
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr "/dev/%s: No és un dispositiu de caràcter"
+msgstr "/dev/%s: no és un dispositiu de caràcter"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6316,23 +6229,21 @@ msgstr "open(2)\n"
 #: login-utils/agetty.c:662
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr "/dev/%s: No es pot obrir-lo com a entrada estàndard: %m"
+msgstr "/dev/%s: no es pot obrir com a entrada estàndard: %m"
 
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
-msgstr "%s: No obert per a lectura/escriptura"
+msgstr "%s: no s'ha obert per a lectura/escriptura"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "dup() en curs\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr "%s: Problema de dup: %m"
+msgstr "%s: problema de dup: %m"
 
 #: login-utils/agetty.c:752
 msgid "term_io 2\n"
@@ -6351,12 +6262,12 @@ msgstr "usuaris"
 #: login-utils/agetty.c:1025
 #, c-format
 msgid "%s: read: %m"
-msgstr "%s: Lectura: %m"
+msgstr "%s: lectura: %m"
 
 #: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr "%s: Desbordament de l'entrada"
+msgstr "%s: desbordament de l'entrada"
 
 #: login-utils/agetty.c:1195
 #, c-format
@@ -6366,92 +6277,85 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"Ús: %s [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
-"cadena_inicialització] [-H màquina_d'accés] velocitat_baudis,... línia "
+"Forma d'ús: %s [-hiLmw] [-l programa_accés] [-t temps_espera] [-I "
+"cadena_inicialització] [-H ordinador_accés] velocitat_bauds,... línia "
 "[tipus_terminal]\n"
 "o bé\n"
-"\t  [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
-"cadena_inicialització] [-H màquina_d'accés] línia velocitat_baudis,... "
-"[tipus_terminal]\n"
+"\t[-hiLmw] [-l programa_accés] [-t temps_espera] [-I cadena_inicialització] "
+"[-H ordinador_accés] línia velocitat_bauds,... [tipus_terminal]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
-msgstr "login: Poca memòria; l'accés podria fallar\n"
+msgstr "login: poca memòria; l'accés podria fallar\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "no es pot executar malloc() per a ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
-msgstr "malloc per a grplist és impossible"
+msgstr "no es pot executar malloc per a grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr "Accés a %s des de %s denegat per defecte.\n"
+msgstr "Per defecte, s'ha denegat l'accés a %s des de %s.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr "Accés a %s des de %s denegat.\n"
+msgstr "S'ha denegat l'accés a %s des de %s.\n"
 
 #: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr "%s: El vostre (usuari %d) no existeix.\n"
+msgstr "%s: aquest usuari (%d) no existeix.\n"
 
 #: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: L'usuari \"%s\" no existeix.\n"
+msgstr "%s: l'usuari \"%s\" no existeix.\n"
 
 #: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
-msgstr "%s: Sols put modificar entrades locals; useu yp%s.\n"
+msgstr "%s: només es poden modificar entrades locals; useu yp%s.\n"
 
 #: login-utils/chfn.c:151 login-utils/chsh.c:136
-#, fuzzy
 msgid "Unknown user context"
-msgstr "error desconegut en la clau"
+msgstr "Es desconeix el context de l'usuari"
 
 #: login-utils/chfn.c:152
 #, c-format
 msgid "%s: %s is not authorized to change the finger info of %s\n"
-msgstr ""
+msgstr "%s: %s no està autoritzat a canviar la informació del finger de %s\n"
 
 #: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: No s'ha pogut establir el context per defecte per a /etc/passwd"
 
 #: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr "Canviant informació del finger per a %s.\n"
+msgstr "S'està canviant la informació del finger per a l'usuari %s.\n"
 
 #: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
 #: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
 #: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
-msgstr "Error de contrasenya."
+msgstr "S'ha produït un error en la contrasenya."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Contrasenya: "
 
 #: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
-msgstr "Contrasenya incorrecta."
+msgstr "La contrasenya no és correcta."
 
 #: login-utils/chfn.c:217
 #, c-format
@@ -6461,7 +6365,7 @@ msgstr "No s'ha canviat la informació del finger.\n"
 #: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Ús: %s [ -f nom_complet ] [ -o oficina ] "
+msgstr "Forma d'ús: %s [ -f nom_complet ] [ -o oficina ] "
 
 #: login-utils/chfn.c:320
 #, c-format
@@ -6484,7 +6388,7 @@ msgid ""
 "Aborted.\n"
 msgstr ""
 "\n"
-"Abortada.\n"
+"S'ha avortat.\n"
 
 #: login-utils/chfn.c:425
 #, c-format
@@ -6494,7 +6398,7 @@ msgstr "el camp és massa llarg.\n"
 #: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr "'%c' no està permes.\n"
+msgstr "«%c» no està permès.\n"
 
 #: login-utils/chfn.c:438
 #, c-format
@@ -6505,21 +6409,23 @@ msgstr "Els caràcters de control no estan permesos.\n"
 #, c-format
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
-"*NO* s'ha canviat la informació del finger. Probeu-ho altra vegada després.\n"
+"*NO* s'ha canviat la informació del finger. Intenteu-ho de nou més "
+"endavant.\n"
 
 #: login-utils/chfn.c:506
 #, c-format
 msgid "Finger information changed.\n"
-msgstr "Informació del finger modificada.\n"
+msgstr "S'ha canviat la informació del finger.\n"
 
 #: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:322
 msgid "malloc failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
 #: login-utils/chsh.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: \"%s\" no està llistat en /etc/shells.\n"
+msgstr ""
+"%s: %s no està autoritzat a canviar l'intèrpret d'ordres de l'usuari %s\n"
 
 #: login-utils/chsh.c:157
 #, c-format
@@ -6527,37 +6433,40 @@ msgid ""
 "%s: Running UID doesn't match UID of user we're altering, shell change "
 "denied\n"
 msgstr ""
+"%s: L'UID en execució no coincideix amb l'UID de l'usuari que s'està "
+"alterant, s'ha denegat el canvi d'intèrpret d'ordres\n"
 
 #: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
-"%s: El vostre intèrpret de comandaments no està en /etc/shells; canvi de "
-"l'intèrpret de comandaments denegat\n"
+"%s: El vostre intèrpret d'ordres no està a /etc/shells; s'ha denegat el "
+"canvi d'intèrpret d'ordres\n"
 
 #: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr "Canviant l'intèrpret de comandaments per a %s.\n"
+msgstr "S'està canviant l'intèrpret d'ordres per %s.\n"
 
 #: login-utils/chsh.c:211
 msgid "New shell"
-msgstr "Nou intèrpret de comandaments"
+msgstr "Nou intèrpret d'ordres"
 
 #: login-utils/chsh.c:218
 #, c-format
 msgid "Shell not changed.\n"
-msgstr "L'intèrpret de comandaments no ha canviat.\n"
+msgstr "No s'ha canviat l'intèrpret d'ordres.\n"
 
 #: login-utils/chsh.c:225
 #, c-format
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr "L'intèrpret de comandaments *NO* ha canviat. Proveu-ho més endavant.\n"
+msgstr ""
+"No s'ha canviat l'intèrpret d'ordres. Intenteu-ho de nou més endavant.\n"
 
 #: login-utils/chsh.c:228
 #, c-format
 msgid "Shell changed.\n"
-msgstr "S'ha canviat l'intèrpret de comandaments.\n"
+msgstr "S'ha canviat l'intèrpret d'ordres.\n"
 
 #: login-utils/chsh.c:293
 #, c-format
@@ -6565,14 +6474,14 @@ msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
-"Ús: %s [ -s intèrpret_de_comandaments ] [ --list-shells ] [ --help ] [ --"
+"Forma d'ús: %s [ -s intèrpret_d'ordres ] [ --list-shells ] [ --help ] [ --"
 "version ]\n"
-"     [ nom_d'usuari ]\n"
+"\t[ nom_usuari ]\n"
 
 #: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr "%s: L'intèrpret de comandaments ha de ser un nom de ruta complet.\n"
+msgstr "%s: l'intèrpret d'ordres ha de ser un camí complet.\n"
 
 #: login-utils/chsh.c:340
 #, c-format
@@ -6587,7 +6496,7 @@ msgstr "%s: \"%s\" no és executable.\n"
 #: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s: '%c' no està permes.\n"
+msgstr "%s: '%c' no està permès.\n"
 
 #: login-utils/chsh.c:355
 #, c-format
@@ -6597,75 +6506,48 @@ msgstr "%s: Els caràcters de control no estan permesos.\n"
 #: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr "Atenció: \"%s\" no està llistat en /etc/shells\n"
+msgstr "Avís: \"%s\" no està llistat a /etc/shells\n"
 
 #: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr "%s: \"%s\" no està llistat en /etc/shells.\n"
+msgstr "%s: \"%s\" no està llistat a /etc/shells.\n"
 
 #: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr "%s: useu l'opció -l per a veuren la llista\n"
+msgstr "%s: useu l'opció -l per veure'n la llista\n"
 
 #: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr "Atenció: \"%s\" no està llistat en /etc/shells.\n"
+msgstr "Avís: \"%s\" no està llistat a /etc/shells.\n"
 
 #: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr "Useu %s -l per a veuren la llista.\n"
+msgstr "Useu %s -l per veure'n la llista.\n"
 
 #: login-utils/chsh.c:393
 #, c-format
 msgid "No known shells.\n"
-msgstr "No conec intèrprets de comandaments.\n"
-
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "no es pot obrir /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "no es pot llegir les dades aleatòries des de /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "no es pot obrir %s per a lectura"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "no es pot fer stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s no té els modes de fitxer correctes"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "no es pot llegir dades des de %s"
+msgstr "No es coneix cap intèrpret d'ordres.\n"
 
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr "no es pot llegir %s; sortint."
+msgstr "No s'ha pogut llegir %s; s'està sortint."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr "ús: last [-#] [-f fitxer] [-t tty] [-h nom_màquina] [usuari ...]\n"
+msgstr ""
+"forma d'ús: last [-#] [-f fitxer] [-t tty] [-h nom_ordinador] [usuari ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  encara teniu una sessió en el sistema"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6674,15 +6556,15 @@ msgstr ""
 "\n"
 "wtmp comença %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
-msgstr "last: Falla del malloc.\n"
+msgstr "last: no ha estat possible executar malloc.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
-msgstr "last: Obtindre el nom de la màquina"
+msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6691,486 +6573,330 @@ msgstr ""
 "\n"
 "interromput %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "Error FATAL: No es pot reobrir tty: %s"
+msgstr "S'ha produït un error fatal: no s'ha pogut reobrir tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
-msgstr "ERROR FATAL: Terminal errònia"
+msgstr "S'ha produït un error fatal: terminal erroni"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
-msgstr "login: -h sols per al superusuari.\n"
+msgstr "login: només el superusuari pot fer servir -h.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
-msgstr "ús: login [-fp] [nom_usuari]\n"
+msgstr "forma d'ús: login [-fp] [nom_usuari]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr "login: PAM ha fallat; avortant: %s\n"
+msgstr "login: PAM ha fallat; s'està avortant: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
-msgstr "No es pot inicialitzar PAM: %s"
-
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+msgstr "No s'ha pogut inicialitzar PAM: %s"
+
+#: login-utils/login.c:494
 msgid "login: "
-msgstr "accés: "
+msgstr "entrada: "
 
-#: login-utils/login.c:597
+# FIXME, please describe parameters
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "ACCÉS INFRUCTUÓS %d DES DE %s PER A %s, %s"
+msgstr "S'HA INTENTAT ACCEDIR SENSE ÈXIT %d VEGADES DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
-"Accés incorrecte\n"
+"L'entrada no és correcta\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr "MASSES INTENTS D'ACCÉS (%d) DES DE %s PER A %s, %s"
+msgstr "S'HA INTENTAT ENTRAR MASSA VEGADES (%d) DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr "SESSIONS D'ACCÉS FALLIDES DES DE %s PER A %s, %s"
+msgstr "NO S'HA POGUT INICIAR LA SESSIÓ DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 "\n"
-"Accés incorrecte\n"
+"Entrada incorrecta\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 "\n"
-"Problema a l'iniciar la sessió, avortat.\n"
+"S'ha produït un problema en iniciar la sessió, s'avortarà.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr "Nom d'usuari NUL en %s:%d. Avortat."
+msgstr "Nom d'usuari NUL a %s:%d. S'avortarà."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr "Nom d'usuari no vàlid \"%s\" en %s:%d. Avortat."
+msgstr "Nom d'usuari invàlid \"%s\" a %s:%d. S'avortarà."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
-msgstr "login: Memòria esgotada\n"
+msgstr "login: No hi ha prou memòria\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
-msgstr "Nom d'usuari ilegal"
+msgstr "Nom d'usuari il·legal"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr "Accés %s refusat en aquest terminal.\n"
+msgstr "S'ha refusat l'entrada de %s en aquest terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr "ACCÉS %s REFUSAT DES DE %s EN LA TTY %s"
+msgstr "S'HA REFUSAT L'ENTRADA DE %s DES DE %s A LA TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr "ACCÉS %s REFUSAT EN LA TTY %s"
+msgstr "S'HA REFUSAT L'ENTRADA DE %s A LA TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
-msgstr "Accés incorrecte\n"
+msgstr "Entrada incorrecta\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Masses usuaris en actiu en el sistema.\n"
-"Probeu-ho més tard.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Teniu masses processos en execució.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr "DIALUP EN %s PER %s"
+msgstr "MARCATGE DIRECTE A %s PER %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "ACCÉS DE ROOT EN %s DES DE %s"
+msgstr "ENTRADA DEL ROOT A %s DES DE %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr "ACCÉS DE ROOT EN %s"
+msgstr "ENTRADA DEL ROOT A %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
-msgstr "ACCCÉS EN %s PER %s DES DE %s"
+msgstr "ENTRADA A %s PER %s DES DE %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr "ACCÉS EN %s PER %s"
+msgstr "ENTRADA A %s PER %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Teniu correu nou.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Teniu correu.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
-msgstr "login: Falla l'establiment del canvi: %s"
+msgstr "login: s'ha produït un error en bifurcar: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ha fallat: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ha fallat"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hi ha cap directori %s\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
-msgstr "Accedint amb el directori inicial = \"/\".\n"
+msgstr "S'està entrant amb el directori inicial = «/».\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
-"login: Memòria esgotada per a l'script de l'intèrpret de comandaments.\n"
+"login: no hi ha prou memòria per a la seqüència de l'intèrpret d'ordres.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
-"login: No s'ha pogut executar l'script de l'intèrpret de comandaments: %s.\n"
+"login: no s'ha pogut executar la seqüènca de l'intèrpret d'ordres: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
-msgstr "login: No hi ha intèrpret de comandaments: %s.\n"
+msgstr "login: no hi ha l'intèrpret d'ordres: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 "\n"
-"Accés de %s: "
+"Entrada a %s: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
-msgstr "nom d'accés massa llarg.\n"
+msgstr "el nom d'entrada és massa llarg.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
-msgstr "NOM massa llarg"
+msgstr "NOM és massa llarg"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
-msgstr "els noms d'accés no poden començar per '-'.\n"
+msgstr "els noms d'entrada no poden començar per «-».\n"
 
-#: login-utils/login.c:1257
+# FIXME
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
-msgstr "masses salts de pàgina solitaris.\n"
+msgstr "massa salts de pàgina solitaris.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
-msgstr "MASSES salts de pàgina"
+msgstr "MASSA salts de pàgina"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr "L'intent d'accés ha esgotat el temps d'espera després de %d segons\n"
+msgstr "S'ha excedit el temps d'espera per a l'entrada al cap de %d segons.\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
-msgstr "Últim accés: %.*s "
+msgstr "Última entrada: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "des de %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
-msgstr "en %.*s\n"
+msgstr "a %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr "ACCÉS FALLIT DES DE %s, %s"
+msgstr "HA FALLAT L'ENTRADA DE %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr "ACCÉS FALLIT EN %s, %s"
+msgstr "HA FALLAT L'ENTRADA A %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr "%d FALLES EN L'ACCÉS DES DE %s, %s"
+msgstr "HA FALLAT %d VEGADES L'ENTRADA DES DE %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr "%d FALLES EN L'ACCÉS EN %s, %s"
+msgstr "HA FALLAT %d VEGADES L'ENTRADA A %s, %s"
 
+# FIXME 'y' untranslateable?
 #: login-utils/mesg.c:89
 #, c-format
 msgid "is y\n"
 msgstr "és y\n"
 
+# FIXME 'n' untranslateable?
 #: login-utils/mesg.c:92
 #, c-format
 msgid "is n\n"
 msgstr "és n\n"
 
+# FIXME 'y', 'n' untranslateable?
 #: login-utils/mesg.c:112
 #, c-format
 msgid "usage: mesg [y | n]\n"
-msgstr "ús: mesg [y | n]\n"
+msgstr "forma d'ús: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Qui sou?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
-msgstr "newgrp: No existeix tal grup."
+msgstr "newgrp: Aquest grup no existeix."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
-msgstr "newgrp: Permís denegat"
+msgstr "newgrp: S'ha denegat el permís"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
-msgstr "No hi ha intèrpret de comandaments"
-
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
-"La contrasenya ha de tindre com a mínim 6 caràcters, probeu-ho altra "
-"vegada.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"La contrasenya ha de contindre caràcters d'almenys de les següents clases:\n"
-"lletres majúscules i minúscules, dígits i no alfanumèrics.\n"
-"Per a més informació mireu passwd(1).\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "No podeu tornar a usar l'antiga contrasenya.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"Si us plau, no useu tal com el vostre nom d'usuari com a contrasenya.\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Si us plau, no useu tal com el vostre nom real com a contrasenya.\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Ús: passwd [nom_usuari [contrasenya]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Sols l'usuari root pot usar les formes d'un i dos arguments.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Ús: passwd [-foqsvV] [usuari [contrasenya]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "No es pot executar %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "No es pot trobar el nom d'accés"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Sols l'usuari root pot canviar la contrasenya d'altres usuaris.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Masses arguments.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "No es pot trobar enlloc el nom d'usuari. `%s' és realment un usuari?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Ho sento, sols es poden canviar les contrasenyes locals. Useu yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "El UID i el nom d'usuari no coincideixen, impostor!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Canviant la contrasenya per a %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Entreu l'antiga contrasenya: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Contrasenya ilegal, impostor."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Entreu la nova contrasenya: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "No s'ha canviat la contrasenya."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Reescriviu la nova contrasenya: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "L'heu escrit malament. No s'ha canviat."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "contrasenya canviada, usuari %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "CONTRASENYA DEL ROOT CANVIADA"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "contrasenya canviada per al root; usuari %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "cridant a setpwnam per a establir la contrasenya.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "*NO* s'ha canviat la contrasenya. Proveu-ho més tard.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Contrasenya canviada.\n"
+msgstr "No hi ha intèrpret d'ordres"
 
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Ús: shutdown [-h|-r] [-fqs] [now|hh:ss|+minuts]\n"
+msgstr "Forma d'ús: shutdown [-h|-r] [-fqs] [now|hh:ss|+minuts]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
-msgstr "Procés de shutdown avortat"
+msgstr "S'ha avortat el procés d'aturada"
 
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr "%s: Sols l'usuari root pot aturar un sistema.\n"
+msgstr "%s: Només l'usuari root pot aturar un sistema.\n"
 
 #: login-utils/shutdown.c:256
 #, c-format
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Això serà demà: Podeu esperar fins llavors?\n"
+msgstr "Això ha de ser demà, no us podeu esperar fins llavors?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
@@ -7183,30 +6909,29 @@ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr "El sistema s'aturarà dintre de 5 minuts"
+msgstr "El sistema s'aturarà d'aquí a 5 minuts"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr "Pel que l'accés està prohibit."
+msgstr "Per tant no es permet l'entrada."
 
 #: login-utils/shutdown.c:362
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr "reiniciat per %s: %s"
+msgstr "%s ha arrencat de nou: %s"
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "halted by %s: %s"
-msgstr "aturat per %s: %s"
+msgstr "%s ha aturat: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
 "\n"
-"Perquè teniu el procés actiu després de l'operació de reinici?"
+"Com és que encara estic actiu després d'arrencar de nou?"
 
 #: login-utils/shutdown.c:431
 msgid ""
@@ -7214,53 +6939,52 @@ msgid ""
 "Now you can turn off the power..."
 msgstr ""
 "\n"
-"Ara podeu desconectar la font d'alimentació..."
+"Ara podeu desconnectar la font d'alimentació..."
 
 #: login-utils/shutdown.c:447
 #, c-format
 msgid "Calling kernel power-off facility...\n"
-msgstr "Cridant a l'aturada del nucli...\n"
+msgstr "S'està cridant el sistema d'apagada del nucli...\n"
 
 #: login-utils/shutdown.c:450
 #, c-format
 msgid "Error powering off\t%s\n"
-msgstr "Error l'aturar\t%s\n"
+msgstr "S'ha produït un error en apagar\t%s\n"
 
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr "Executant el programa \"%s\" ...\n"
+msgstr "S'està executant el programa \"%s\" ...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr "Error executant \t%s\n"
+msgstr "S'ha produït un error en executar \t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "URGENT: Missatge de difusió des de %s:"
+msgstr "URGENT: missatge de difusió de %s:"
 
 #: login-utils/shutdown.c:494
 #, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr "El sistema s'aturarà en %d hores i %d minuts"
+msgstr "El sistema s'aturarà d'aquí a %d hores i %d minuts"
 
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr "El sistema s'aturara en 1 hora i %d minuts"
+msgstr "El sistema s'aturara d'aquí a 1 hora i %d minuts"
 
 #: login-utils/shutdown.c:500
 #, c-format
 msgid "System going down in %d minutes\n"
-msgstr "El sistema s'aturarà en %d minuts\n"
+msgstr "El sistema s'aturarà d'aquí a %d minuts\n"
 
 #: login-utils/shutdown.c:503
 #, c-format
 msgid "System going down in 1 minute\n"
-msgstr "El sistema s'aturarà en 1 minut\n"
+msgstr "El sistema s'aturarà d'aquí a 1 minut\n"
 
 #: login-utils/shutdown.c:505
 #, c-format
@@ -7274,65 +6998,61 @@ msgstr "\t... %s ...\n"
 
 #: login-utils/shutdown.c:567
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr "No es pot establir un canvi per a swapoff. Vaja!"
+msgstr "No s'ha pogut bifurcar swapoff."
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr "No es pot executar swapoff, s'espera que umount ho faci."
+msgstr "No s'ha pogut executar swapoff, esperem que umount ho faci."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr "No es pot establir un canvi per a umount, provar-ho manualment."
+msgstr "No s'ha pogut bufurcar umount, s'està provant manualment."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "No es pot executar %s, es prova umount.\n"
+msgstr "No s'ha pogut executar %s, s'està provant umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr "No es pot executar executar umount, abandonant l'operació umount."
+msgstr "No s'ha pogut executar umount, s'està abandonant l'operació umount."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
-msgstr "Desmuntant els sistemes de fitxers restants..."
+msgstr "S'està desmuntant els sistemes de fitxers restants..."
 
 #: login-utils/shutdown.c:659
 #, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr "shutdown: No es pot desmuntar %s: %s\n"
+msgstr "shutdown: No s'ha pogut desmuntar %s: %s\n"
 
 #: login-utils/simpleinit.c:132
 msgid "Booting to single user mode.\n"
-msgstr "Arrencant en mode d'un sol usuari.\n"
+msgstr "S'està arrencant en el mode d'un sol usuari.\n"
 
 #: login-utils/simpleinit.c:136
 msgid "exec of single user shell failed\n"
-msgstr ""
-"l'execució de l'intèrpret de comandaments en mode d'usuari únic ha fallat\n"
+msgstr "l'execució de l'intèrpret d'ordres en mode d'un sol usuari ha fallat\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
-msgstr ""
-"l'establiment del canvi a un sol usuari a l'intèrpret de comandaments ha "
-"fallat\n"
+msgstr "no s'ha pogut bifurcar l'intèrpret d'ordres d'un sol usuari\n"
 
 #: login-utils/simpleinit.c:208
 msgid "error opening fifo\n"
-msgstr "error obrint fifo\n"
+msgstr "s'ha produït un error en obrir fifo\n"
 
 #: login-utils/simpleinit.c:212
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr "error d'inicialització close-on-exec sobre /dev/initctl"
+msgstr "s'ha produït un error en inicialitzar close-on-exec a /dev/initctl"
 
 #: login-utils/simpleinit.c:259
 msgid "error running finalprog\n"
-msgstr "error executant finalprog\n"
+msgstr "s'ha produït un error en executar finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
-msgstr "error establint un canvi per a finalprog\n"
+msgstr "s'ha produït un error en bifurcar finalprog\n"
 
 #: login-utils/simpleinit.c:345
 msgid ""
@@ -7344,55 +7064,55 @@ msgstr ""
 
 #: login-utils/simpleinit.c:418
 msgid "lstat of path failed\n"
-msgstr "El `lstat' de la ruta ha fallat\n"
+msgstr "no s'ha pogut executar «lstat» al camí\n"
 
 #: login-utils/simpleinit.c:426
 msgid "stat of path failed\n"
-msgstr "el 'stat' de la ruta ha fallat\n"
+msgstr "no s'ha pogut executar «stat» al camí\n"
 
 #: login-utils/simpleinit.c:434
 msgid "open of directory failed\n"
-msgstr "l'obertura del directori ha fallat.\n"
+msgstr "no s'ha pogut obrir el directori\n"
 
 #: login-utils/simpleinit.c:508
 msgid "fork failed\n"
-msgstr "l'establiment del canvi ha fallat\n"
+msgstr "no s'ha pogut bifurcar\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
-msgstr "l'execució (exec) ha fallat\n"
+msgstr "no s'ha pogut executar exec\n"
 
 #: login-utils/simpleinit.c:563
 msgid "cannot open inittab\n"
-msgstr "no es pot obrir inittab\n"
+msgstr "no s'ha pogut obrir inittab\n"
 
 #: login-utils/simpleinit.c:630
 msgid "no TERM or cannot stat tty\n"
-msgstr "sense TERM o no es pot fer stat a la tty\n"
+msgstr "no hi ha TERM o no s'ha pogut executar stat a la tty\n"
 
 #: login-utils/simpleinit.c:936
 #, c-format
 msgid "error stopping service: \"%s\""
-msgstr "error aturant el servei: \"%s\""
+msgstr "s'ha produït un error en aturar el servei: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr "masses iov (modificar el codi en wall/ttymsg.c)"
+msgstr "massa iov (modifiqueu el codi a wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 #, c-format
 msgid "excessively long line arg"
-msgstr "línia d'arguments massa llarga"
+msgstr "la línia d'arguments és massa llarga"
 
 #: login-utils/ttymsg.c:139
 #, c-format
 msgid "cannot fork"
-msgstr "no es pot establir el canvi"
+msgstr "no s'ha pogut bifurcar"
 
 #: login-utils/ttymsg.c:143
 #, c-format
 msgid "fork: %s"
-msgstr "canvi (fork): %s"
+msgstr "bifurcació: %s"
 
 #: login-utils/ttymsg.c:171
 #, c-format
@@ -7402,43 +7122,42 @@ msgstr "%s: ERROR DOLENT"
 #: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
-msgstr "%s: El fitxer password està ocupat.\n"
+msgstr "%s: el fitxer password està ocupat.\n"
 
 #: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr "%s: El fitxer group està ocupat.\n"
+msgstr "%s: el fitxer group està ocupat.\n"
 
 #: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr "%s: El fitxer %s està ocupat (presenta %s).\n"
+msgstr "%s: el fitxer %s està ocupat (presenta %s).\n"
 
 #: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr "%s: No es pot enllaçar %s: %s\n"
+msgstr "%s: no s'ha pogut enllaçar %s: %s\n"
 
 #: login-utils/vipw.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't get context for %s"
-msgstr "No es pot obtindre el temps d'espera per a %s: %s\n"
+msgstr "%s: No s'ha pogut obtenir el context per a %s"
 
 #: login-utils/vipw.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't set context for %s"
-msgstr "No es pot obtindre el temps d'espera per a %s: %s\n"
+msgstr "%s: No s'ha pogut establir el context per a %s"
 
 #: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
-msgstr ""
-"%s: No es pot desbloquejar %s: %s (els vostres canvis encara estan en %s)\n"
+msgstr "%s: no s'ha pogut desblocar %s: %s (els canvis encara estan a %s)\n"
 
 #: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
-msgstr "%s: No es pot establir el canvi\n"
+msgstr "%s: No s'ha pogut bifurcar\n"
 
 #: login-utils/vipw.c:276
 #, c-format
@@ -7448,18 +7167,20 @@ msgstr "%s: %s no s'ha modificat\n"
 #: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
-msgstr "%s: No s'ha fet cap canvi\n"
+msgstr "%s: no s'ha fet cap canvi\n"
 
+# shadow paswords -> contrasenyes ocultes (fedora)
 #: login-utils/vipw.c:352
 #, c-format
 msgid "You are using shadow groups on this system.\n"
-msgstr "Esteu usant grups shadow en aquest sistema.\n"
+msgstr "Aquest sistema utilitza grups ocults.\n"
 
 #: login-utils/vipw.c:353
 #, c-format
 msgid "You are using shadow passwords on this system.\n"
-msgstr "Esteu usant contrasenyes shadow en aquest sistema.\n"
+msgstr "Aquest sistema utilitza contrasenyes ocultes.\n"
 
+# FIXME here we have 'y' and 'n' translated, is it translateable?
 #: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
@@ -7468,91 +7189,84 @@ msgstr "Desitgeu editar %s ara? [s/n] "
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "ús: %s [fitxer]\n"
+msgstr "forma d'ús: %s [fitxer]\n"
 
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr "%s: No es pot obrir el fitxer temporal.\n"
+msgstr "%s: no s'ha pogut obrir el fitxer temporal.\n"
 
 #: login-utils/wall.c:186
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr "Missatge de difusió general des de %s@%s"
+msgstr "Missatge de difusió de %s@%s"
 
 #: login-utils/wall.c:204
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr "%s: No es pot llegir %s; usant l'entrada estàndard.\n"
+msgstr "%s: no es llegirà de %s; s'utilitzarà l'entrada estàndard.\n"
 
 #: login-utils/wall.c:209
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr "%s: No es pot llegir %s.\n"
+msgstr "%s: no s'ha pogut llegir %s.\n"
 
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: No es pot executar stat al fitxer temporal.\n"
+msgstr "%s: no s'ha pogut executar stat al fitxer temporal.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr "%s: No es pot llegir el fitxer temporal.\n"
+msgstr "%s: no s'hapogut llegir el fitxer temporal.\n"
 
 #: misc-utils/cal.c:327
 msgid "illegal month value: use 1-12"
-msgstr "valor de més no permes: Usar 1-12"
+msgstr "el valor del mes és il·legal: utilitzeu 1-12"
 
 #: misc-utils/cal.c:331
 msgid "illegal year value: use 1-9999"
-msgstr "valor de més no permes: Usar 1-9999"
-
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
+msgstr "el valor de l'any no és legal: utilitzeu 1-9999"
+
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
-msgstr "%s de %d"
+msgstr "%2$d de %1$s"
 
 #: misc-utils/cal.c:780
 #, c-format
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr "ús: cal [-13smjyV] [[mes] any]\n"
+msgstr "forma d'ús: cal [-13smjyV] [[mes] any]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr "ús: %s [+format] [dia mes any]\n"
+msgstr "forma d'ús: %s [+format] [dia mes any]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Dia de Sant Tibb"
 
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
-msgstr "%s: Senyal desconeguda %s\n"
+msgstr "%s: senyal desconegut %s\n"
 
 #: misc-utils/kill.c:270
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s: No es pot trobar el proces \"%s\"\n"
+msgstr "%s: no s'ha pogut trobar el procés \"%s\"\n"
 
 #: misc-utils/kill.c:314
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
-msgstr "%s: Senyal desconeguda %s; senyals vàlides:\n"
+msgstr "%s: senyal desconegut %s; senyals vàlids:\n"
 
 #: misc-utils/kill.c:354
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "ús: %s [ -s senyal | -p ] [ -a ] pid ...\n"
+msgstr "forma d'ús: %s [ -s senyal | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:355
 #, c-format
@@ -7567,384 +7281,384 @@ msgstr "logger: %s: %s.\n"
 #: misc-utils/logger.c:248
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr "logger: Nom facilitat desconegut: %s.\n"
+msgstr "logger: no es coneix el nom de la facilitat: %s.\n"
 
 #: misc-utils/logger.c:260
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr "logger: Nom amb prioritat desconeguda: %s.\n"
+msgstr "logger: nom amb prioritat desconeguda: %s.\n"
 
 #: misc-utils/logger.c:287
 #, c-format
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
-"ús: logger [-is] [-f fitxer] [-p pri] [-t etiqueta] [-u connector] "
-"[ missatge ... ]\n"
+"forma d'ús: logger [-is] [-f fitxer] [-p pri] [-t etiqueta] [-u sòcol]\n"
+"\t[ missatge ... ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr "ús: look [-dfa] [-t caràcter] cadena [fitxer]\n"
+msgstr "forma d'ús: look [-dfa] [-t caràcter] cadena [fitxer]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
 msgid "Could not open %s\n"
-msgstr "No es pot obrir %s\n"
+msgstr "No s'ha pogut obrir %s\n"
 
 #: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
 #, c-format
 msgid "Got %d bytes from %s\n"
-msgstr "S'han obtingut %d octets des de %s\n"
+msgstr "S'han obtingut %d octets de %s\n"
 
 #: misc-utils/namei.c:103
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr "namei: No es pot obtindre l'actual directori - %s\n"
+msgstr "namei: no s'ha pogut obtenir el directori actual - %s\n"
 
 #: misc-utils/namei.c:116
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei: No es pot executar chdir per a %s - %s (%d)\n"
+msgstr "namei: no s'ha pogut executar chdir a %s - %s (%d)\n"
 
 #: misc-utils/namei.c:126
 #, c-format
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "ús: namei [-mx] nom_ruta [nom_ruta ...]\n"
+msgstr "forma d'ús: namei [-mx] camí [camí ...]\n"
 
 #: misc-utils/namei.c:151
 #, c-format
 msgid "namei: could not chdir to root!\n"
-msgstr "namei: No es pot executar chdir al directori arrel\n"
+msgstr "namei: no s'ha pogut executar chdir al directori arrel\n"
 
 #: misc-utils/namei.c:158
 #, c-format
 msgid "namei: could not stat root!\n"
-msgstr "namei: No es pot executar stat al directori arrel\n"
+msgstr "namei: no s'ha pogut executar stat al directori arrel\n"
 
 #: misc-utils/namei.c:172
 #, c-format
 msgid "namei: buf overflow\n"
-msgstr "namei: Desbordament de la memòria intermèdia\n"
+msgstr "namei: desbordament de la memòria intermèdia\n"
 
 #: misc-utils/namei.c:218
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr " ? no es pot executar chdir a %s - %s (%d)\n"
+msgstr " ? no s'ha pogut executar chdir a %s - %s (%d)\n"
 
 #: misc-utils/namei.c:247
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr " ? problemes llegint l'enllaç simbòlic %s - %s (%d)\n"
+msgstr " ? hi ha hagut problemes en llegir l'enllaç simbòlic %s - %s (%d)\n"
 
 #: misc-utils/namei.c:257
 #, c-format
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-msgstr "  *** EXCEDIT EL L�MIT D'ENLLAÇOS SIMBÒLICS DE UNIX ***\n"
+msgstr "  *** S'HA EXCEDIT EL L�MIT D'ENLLAÇOS SIMBÒLICS DE UNIX ***\n"
 
 #: misc-utils/namei.c:294
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
-msgstr "namei: Tipus de fitxer desconegut 0%06o en el fitxer %s\n"
+msgstr "namei: tipus de fitxer desconegut 0%06o en el fitxer %s\n"
 
 #: misc-utils/rename.c:38
 #, c-format
 msgid "%s: out of memory\n"
-msgstr "%s: Memòria esgotada\n"
+msgstr "%s: no hi ha prou memòria\n"
 
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "%s: Falla al reanomenar de %s a %s: %s\n"
+msgstr "%s: no s'ha pogut reanomenar %s a %s: %s\n"
 
+# FIXME "from to"????
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
 msgstr "crida: %s des dels fitxers...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
 "Use `%s [options] %s' if you really want to use it.\n"
 "Script not started.\n"
 msgstr ""
-"Atenció: `%s' és un enllaç.\n"
-"Useu `%s [opcions] %s' si realment desitgeu usar-lo.\n"
-"Script no executat.\n"
+"Avís: «%s» és un enllaç.\n"
+"Useu «%s [opcions] %s» si realment desitgeu usar-lo.\n"
+"No s'ha executat script.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "ús: script [-a] [-f] [-q] [-t] [fitxer]\n"
+msgstr "forma d'ús: script [-a] [-f] [-q] [-t] [fitxer]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr "Script executat, el fitxer és %s\n"
+msgstr "S'ha iniciat l'execució de script, el fitxer és %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
-msgstr "Script executat sobre (%s)"
+msgstr "S'ha iniciat l'execució de script a %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 "\n"
-"Script finalitzat (%s)"
+"S'ha finalitzat l'execució de script a %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr "Script finalitzat, el fitxer és %s\n"
+msgstr "S'ha fet la seqüència, el fitxer és %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
-msgstr "openpty ha fallat\n"
+msgstr "no ha estat possible executar openpty\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "No queden pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
-msgstr "%s: Argument erroni, usant\n"
+msgstr "%s: Argument erroni, forma d'ús\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nom_terminal ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NÚM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NÚM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
-msgstr "  [ -file nom_fitxer_abocar ]\n"
+msgstr "  [ -file nom_fitxer_bolcat ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq número_freqüència ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "no es pot (des)activar el mode d'estalvi d'energia\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
-msgstr "Error de klogctl: %s\n"
+msgstr "s'ha produït un error a klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
-msgstr "Error llegint %s\n"
+msgstr "s'ha produït un error en llegir %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
-msgstr "Error escrivint un abocat de pantalla\n"
+msgstr "S'ha produït un error en escriure un bolcat de pantalla\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr "no es pot llegir %s, i no es pot efectuar un abocat de ioctl\n"
+msgstr "no s'ha pogut llegir %s, i no s'ha pogut efectuar un bolcat d'ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no està definit.\n"
@@ -7957,27 +7671,27 @@ msgstr "whereis [ -sbmu ] [ -SBM directori ... -f ] nom...\n"
 #: misc-utils/write.c:99
 #, c-format
 msgid "write: can't find your tty's name\n"
-msgstr "write: No es pot trobar el nom de la vostra tty\n"
+msgstr "write: no s'ha pogut trobar el nom de la vostra tty\n"
 
 #: misc-utils/write.c:110
 #, c-format
 msgid "write: you have write permission turned off.\n"
-msgstr "write: Teniu el permís d'escriptura desactivat.\n"
+msgstr "write: teniu el permís d'escriptura desactivat.\n"
 
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr "write: %s no te una sessió iniciada en %s.\n"
+msgstr "write: %s no ha entrat a %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr "write: %s té els missatges deshabilitats en %s\n"
+msgstr "write: %s té els missatges inhabilitats a %s\n"
 
 #: misc-utils/write.c:146
 #, c-format
 msgid "usage: write user [tty]\n"
-msgstr "ús: write usuari [tty]\n"
+msgstr "forma d'ús: write usuari [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
@@ -7987,76 +7701,72 @@ msgstr "write: %s no està connectat\n"
 #: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr "write: %s té els missatges deshabilitats\n"
+msgstr "write: %s té els missatges inhabilitats\n"
 
 #: misc-utils/write.c:247
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
-msgstr "write: %s està connectat més d'una vegada; escrivint a %s\n"
+msgstr "write: %s està connectat més d'una vegada; s'està escrivint a %s\n"
 
 #: misc-utils/write.c:313
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr "Missatge des de %s@%s (com a %s) el %s a les %s ..."
+msgstr "Missatge de %s@%s (com a %s) el %s a les %s ..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr "Missatge des de %s@%s el %s a les %s ..."
+msgstr "Missatge de %s@%s el %s a les %s ..."
 
 #: mount/fstab.c:136
 #, c-format
 msgid "warning: error reading %s: %s"
-msgstr "advertència: Error al llegir %s: %s"
+msgstr "avís: s'ha produït un error en llegir %s: %s"
 
 #: mount/fstab.c:164 mount/fstab.c:189
 #, c-format
 msgid "warning: can't open %s: %s"
-msgstr "advertència: No es pot obrir %s: %s"
+msgstr "avís: no s'ha pogut obrir %s: %s"
 
 #: mount/fstab.c:169
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr "mount: No es pot obrir %s; en el seu lloc s'usarà %s\n"
+msgstr "mount: no s'ha pogut obrir %s; s'usarà %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
-"no es pot crear el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
+"no s'ha pogut crear el fitxer de blocat %s: %s (useu el senyalador -n per a "
 "modificar aquest valor)"
 
 #: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
-"no es pot enllaçar el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
-"modificar aquest valor)"
+"no s'ha pogut enllaçar el fitxer de blocat %s: %s (useu el senyalador -n per "
+"a modificar aquest valor)"
 
 #: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
-"no es pot obrir el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
+"no s'ha pogut obrir el fitxer de blocat %s: %s (useu el senyalador -n per a "
 "modificar aquest valor)"
 
 #: mount/fstab.c:526
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr "No es pot blocar al fitxer de blocat %s: %s\n"
+msgstr "No s'ha pogut blocar el fitxer de blocat %s: %s\n"
 
 #: mount/fstab.c:538
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr "no es pot blocar al fitxer de blocat %s: %s"
+msgstr "no s'ha pogut blocar al fitxer de blocat %s: %s"
 
 #: mount/fstab.c:540
 msgid "timed out"
-msgstr "temps d'espera excedit"
+msgstr "s'ha exhaurit el temps d'espera"
 
 #: mount/fstab.c:547
 #, c-format
@@ -8064,33 +7774,33 @@ msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
-"No es pot crear l'enllaç %s\n"
-"Potser hi hagi un fitxer de blocat obsolet?\n"
+"No s'ha pogut crear l'enllaç %s\n"
+"Potser hi ha un fitxer de blocat obsolet?\n"
 
 #: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr "no es pot obrir %s (%s) - mtab no actualitzat"
+msgstr "no s'ha pogut obrir %s (%s) - no s'ha actualitzat mtab"
 
 #: mount/fstab.c:633
 #, c-format
 msgid "error writing %s: %s"
-msgstr "error escrivint %s: %s"
+msgstr "s'ha produït un error en escriure %s: %s"
 
 #: mount/fstab.c:643
 #, c-format
 msgid "error changing mode of %s: %s\n"
-msgstr "error al canviar el mode de %s: %s\n"
+msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
 #: mount/fstab.c:661
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "no es pot reanomenar %s per %s: %s\n"
+msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
 
 #: mount/lomount.c:73
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr "loop: No es pot obrir el dispositiu %s: %s\n"
+msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
 #: mount/lomount.c:89
 #, c-format
@@ -8100,12 +7810,12 @@ msgstr ", desplaçament %lld"
 #: mount/lomount.c:92
 #, c-format
 msgid ", sizelimit %lld"
-msgstr ", mida límit %lld"
+msgstr ", límit de mida %lld"
 
 #: mount/lomount.c:100
 #, c-format
 msgid ", encryption %s (type %d)"
-msgstr ", xifrat %s (tipus %d)"
+msgstr ", xifratge %s (tipus %d)"
 
 #: mount/lomount.c:114
 #, c-format
@@ -8115,65 +7825,65 @@ msgstr ", desplaçament %d"
 #: mount/lomount.c:117
 #, c-format
 msgid ", encryption type %d\n"
-msgstr ", tipus de xifrat %d\n"
+msgstr ", tipus de xifratge %d\n"
 
 #: mount/lomount.c:126
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: No es pot obtindre informació sobre el dispositiu %s: %s\n"
+msgstr "loop: no s'ha pogut obtenir informació sobre el dispositiu %s: %s\n"
 
 #: mount/lomount.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any device /dev/loop#"
-msgstr "mount: No es pot trobar cap dispositiu /dev/loop#"
+msgstr "%s: no s'ha trobat cap dispositiu /dev/loop#"
 
 #: mount/lomount.c:181
 #, c-format
 msgid "%s: no permission to look at /dev/loop#"
-msgstr ""
+msgstr "%s: no teniu permisos per llegir /dev/loop#"
 
 #: mount/lomount.c:184
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: No es pot trobar cap dispositiu loop. Podria ser que el nucli no el\n"
-"       reconeguès?. (Si es això, recompileu o feu `modprobe loop')."
+"%s: No s'ha pogut trobar cap dispositiu loop. És possible que aquest nucli\n"
+"       no reconegui els dispositius loop? (Si es així, recompileu-lo o feu\n"
+"       «modprobe loop».)"
 
 #: mount/lomount.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any free loop device"
-msgstr "mount: No es pot trobar cap dispositiu loop lliure"
+msgstr "%s: no s'ha trobat cap dispositiu loop lliure"
 
 #: mount/lomount.c:287
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
-msgstr "No es pot blocar en memòria, sortint.\n"
+msgstr "No s'ha pogut blocar en memòria, s'està sortint.\n"
 
 #: mount/lomount.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
-msgstr "set_loop(%s,%s,%d): Correcte\n"
+msgstr "set_loop(%s,%s,%llu): èxit\n"
 
 #: mount/lomount.c:351
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: No es pot suprimir el dispositiu %s: %s\n"
+msgstr "loop: no s'ha pogut suprimir el dispositiu %s: %s\n"
 
 #: mount/lomount.c:361
 #, c-format
 msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): Correcte\n"
+msgstr "del_loop(%s): èxit\n"
 
 #: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-"Aquest mount s'ha compilat sense suport loop. Si us plau, recompileu-lo.\n"
+msgstr "Aquest mount s'ha compilat sense suport per a loop. Recompileu-lo.\n"
 
 #: mount/lomount.c:406
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage:\n"
 "  %s loop_device                                       # give info\n"
@@ -8181,10 +7891,11 @@ msgid ""
 "  %s -f                                                # find unused\n"
 "  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
 msgstr ""
-"ús:\n"
-"  %s dispositiu_loop                                 # dona informació\n"
-"  %s -d dispositiu_loop                              # elimina\n"
-"  %s [ -e xifrat ] [ -o desplaça. ] disp_loop fitxer # configura\n"
+"forma d'ús:\n"
+"  %s dispositiu_loop                                   # dona informació\n"
+"  %s -d dispositiu_loop                                # elimina\n"
+"  %s -f                                                # cerca no usats\n"
+"  %s [ -e xifratge ] [ -o desplaçament ] {-f|disp_loop} fitxer # configura\n"
 
 #: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
@@ -8195,380 +7906,371 @@ msgstr "no hi ha prou memòria"
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
-"Quan es va compilar el suport loop no estava disponible. Si us plau, "
-"recompileu.\n"
+"Quan es va compilar el suport per a loop no estava disponible. Recompileu-"
+"lo.\n"
 
 #: mount/mntent.c:166
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr "[mntent]: Atenció: No hi ha cap nova línia al final de %s\n"
+msgstr "[mntent]: avís: no hi ha cap nova línia al final de %s\n"
 
 #: mount/mntent.c:217
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr "[mntent]: La línia %d de %s és incorrecta%s\n"
+msgstr "[mntent]: la línia %d de %s no és correcta%s\n"
 
 #: mount/mntent.c:220
 msgid "; rest of file ignored"
-msgstr "; la resta del fitxer s'ignorarà"
+msgstr "; s'ignorarà la resta del fitxer"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: L'etiqueta %s apareix en %s i %s\n"
+msgstr "%s: error: l'etiqueta %s apareix a %s i %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: Muntant %s per %s\n"
+msgstr "mount: es muntarà %s per UUID\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: Muntant %s per %s\n"
+msgstr "mount: es muntarà %s per etiqueta\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount : No es pot obrir %s, donat que la conversió UUID i LABEL no s'ha "
-"fet.\n"
+"%s: no s'ha pogut obrir %s, ja que no es pot fer la conversió UUID i LABEL.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: UUID incorrecte"
+msgstr "%s: UUID erroni"
 
 #: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount: Segons mtab, %s ja està muntat en %s"
+msgstr "mount: segons mtab, %s ja està muntat a %s"
 
 #: mount/mount.c:387
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount: Segons mtab, %s està muntat en %s"
+msgstr "mount: segons mtab, %s està muntat a %s"
 
 #: mount/mount.c:407
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr "mount: No es pot obrir %s per a escriptura: %s"
+msgstr "mount: no s'ha pogut obrir %s per a escriptura: %s"
 
 #: mount/mount.c:424 mount/mount.c:677
 #, c-format
 msgid "mount: error writing %s: %s"
-msgstr "mount: Error escrivint %s: %s"
+msgstr "mount: s'ha produït un error en escriure %s: %s"
 
 #: mount/mount.c:432
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr "mount: Error al canviar el mode de %s: %s"
+msgstr "mount: s'ha produït un error en canviar el mode de %s: %s"
 
 #: mount/mount.c:483
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr "%s sembla espai d'intercanvi - no muntat"
+msgstr "%s sembla espai d'intercanvi - no s'ha muntat"
 
 #: mount/mount.c:570
 msgid "mount failed"
-msgstr "el muntatge ha fallat"
+msgstr "no s'ha estat possible muntar"
 
 #: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: Sols l'usuari root pot muntar %s en %s"
+msgstr "mount: només l'usuari root pot muntar %s a %s"
 
 #: mount/mount.c:600
 msgid "mount: loop device specified twice"
-msgstr "mount: El dispositiu loop està especificat dues vegades"
+msgstr "mount: el dispositiu loop està especificat dues vegades"
 
 #: mount/mount.c:605
 msgid "mount: type specified twice"
-msgstr "mount: El tipus està especificat dues vegades"
+msgstr "mount: el tipus està especificat dues vegades"
 
 #: mount/mount.c:617
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
-msgstr "mount: Saltant-se la configuració d'un dispositiu loop\n"
+msgstr "mount: s'està ometent la configuració d'un dispositiu loop\n"
 
 #: mount/mount.c:626
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr "mount: S'usarà el dispositiu loop %s\n"
+msgstr "mount: s'usarà el dispositiu loop %s\n"
 
 #: mount/mount.c:631
 #, c-format
 msgid "mount: failed setting up loop device\n"
-msgstr "mount: Falla al configurar el dispositiu loop\n"
+msgstr "mount: no ha estat possible configurar el dispositiu loop\n"
 
 #: mount/mount.c:635
 #, c-format
 msgid "mount: setup loop device successfully\n"
-msgstr "mount: Configuració correcta del dispositiu loop\n"
+msgstr "mount: s'ha configurat el dispositiu loop amb èxit\n"
 
 #: mount/mount.c:672
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr "mount: No es pot obrir %s: %s"
+msgstr "mount: no s'ha pogut obrir %s: %s"
 
 #: mount/mount.c:693
 msgid "mount: argument to -p or --pass-fd must be a number"
-msgstr "mount: L'argument per a -p o --pass-fd hauria de ser un número"
+msgstr "mount: l'argument a -p o --pass-fd ha de ser un nombre"
 
 #: mount/mount.c:706
 #, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr "mount: No es pot obrir %s per a establir-ne la velocitat"
+msgstr "mount: no s'ha pogut obrir %s per establir-ne la velocitat"
 
 #: mount/mount.c:709
 #, c-format
 msgid "mount: cannot set speed: %s"
-msgstr "mount: No es pot establir la velocitat de: %s"
+msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr "mount: No es pot establir el canvi: %s"
+msgstr "mount: no s'ha pogut bifurcar: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: Aquesta versió ha estat compilada sense suport per al tipus `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
-msgstr "mount : Falla al muntar la versió 4 de nfs, escolliu la 3...\n"
+msgstr ""
+"mount : no ha estat possible muntar la versió 4 de nfs, s'està intentant "
+"3...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
-"mount: No es pot determinar el tipus del sistema de fitxers i no n'heu "
+"mount: no s'ha pogut determinar el tipus de sistema de fitxers i no n'heu "
 "especificat cap"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
-msgstr "mount: Haureu d'especificar el tipus del sistema de fitxers"
+msgstr "mount: haureu d'especificar el tipus del sistema de fitxers"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
-msgstr "mount: El muntatge ha fallat"
+msgstr "mount: no ha estat possible muntar"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr "mount: El punt de muntatge %s no és un directori"
+msgstr "mount: el punt de muntatge %s no és un directori"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
-msgstr "mount: Permís denegat"
+msgstr "mount: s'ha denegat el permís"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
-msgstr "mount: Haureu de ser un superusuari per a usar mount"
+msgstr "mount: haureu de ser un superusuari per a usar mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s està ocupat"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ja està muntat"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ja està muntat o %s està ocupat"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
-msgstr "mount: El punt de muntatge %s no existeix"
+msgstr "mount: el punt de muntatge %s no existeix"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount: El punt de muntatge %s és un enllaç simbòlic sense destí"
+msgstr "mount: el punt de muntatge %s és un enllaç simbòlic sense destí"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
-msgstr "mount: El dispositiu especial %s no existeix"
+msgstr "mount: el dispositiu especial %s no existeix"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
-"mount: El dispositiu especial %s no existeix\n"
-"       (una ruta prefixada no és un directori)\n"
+"mount: el dispositiu especial %s no existeix\n"
+"       (un prefix de camí no és un directori)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s encara no està muntat o una opció és incorrecta"
 
-#: mount/mount.c:966
-#, fuzzy, c-format
+#: mount/mount.c:959
+#, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
-"mount: Tipus del sistema de fitxers incorrecte, opció incorrecta,\n"
-"       superbloc incorrecte en %s o masses sistemes de fitxers muntats"
+"mount: el tipus de sistema de fitxers o és correcte, la opció no és "
+"correcta,\n"
+"       superbloc incorrecte a %s, manca la pàgina de codis o algun altre "
+"error"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
+"        (podria ser que aquest fos el dispositiu IDE on utilitzeu ide-scsi\n"
+"        de manera que sr0 o sda o siguin necessaris?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
+"        (no esteu intentant muntar una partició estesa,\n"
+"        en comptes d'alguna partició lògica de dins?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"        En alguns casos, es pot trobar informació útil a syslog,\n"
+"        proveu dmesg | tail o així\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
-msgstr "taula de dispositius muntats completa"
+msgstr "la taula de dispositius muntats està plena"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
-msgstr "mount: %s: No es pot llegir el superbloc"
+msgstr "mount: %s: no s'ha pogut llegir el superbloc"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
-msgstr "umount: %s: Dispositiu desconegut"
+msgstr "umount: %s: dispositiu desconegut"
 
-#: mount/mount.c:1016
-#, fuzzy, c-format
+#: mount/mount.c:1009
+#, c-format
 msgid "mount: unknown filesystem type '%s'"
-msgstr "   l   Llistar els tipus de sistemes de fitxers coneguts"
+msgstr "mount: no es reconeix el sitema de fitxers «%s»"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr "mount: Probablement volíeu referir-vos a %s"
+msgstr "mount: probablement volíeu dir %s"
 
-#: mount/mount.c:1030
-#, fuzzy
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
-msgstr "mount: Potser volíeu referir-vos a iso9660 ?"
+msgstr "mount: potser volíeu dir «iso9660»?"
 
-#: mount/mount.c:1032
-#, fuzzy
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
-msgstr "mount: Potser volíeu referir-vos a iso9660 ?"
+msgstr "mount: potser volíeu dir «vfat»?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
-"mount: %s té un número de dispositiu incorrecte o el tipus del sistema de "
-"fitxers %s no està suportat"
+"mount: %s té un número de dispositiu incorrecte o el tipus de sistema de "
+"fitxers %s no està implementat"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s no és un dispositiu de blocs, i stat falla?"
+msgstr "mount: %s no és cap dispositiu de blocs, i stat falla?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
-"mount: El nucli no reconeix %s com a un dispositiu de blocs\n"
-"       (potser fent `insmod controlador'?)"
+"mount: el nucli no reconeix %s com a dispositiu de blocs\n"
+"       (potser fent «insmod controlador»?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s no és un dispositiu de blocs (proveu amb `-o loop')"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no és un dispositiu de blocs"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s no és un dispositiu de blocs vàlid"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "dispositiu de blocs "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "mount : No es pot muntar %s%s com a sols lectura"
+msgstr "mount : no s'ha pogut muntar %s%s com a només de lectura"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount : %s%s està protegit contra escriptura però se li ha donat l'etiqueta "
-"explicita `-w'"
+"mount : %s%s està protegit contra escriptura però se li ha donat el "
+"senyalador explícit «-w»"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
-"mount: %s%s està protegit contra escriptura; es muntarà en sols lectura"
+"mount: %s%s està protegit contra escriptura; es muntarà en només lectura"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
-"mount: No s'ha especificat cap tipus; s'assumeix nfs per als dos punts\n"
+"mount: no s'ha especificat cap tipus; s'assumirà nfs per als dos punts\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
-"mount: No s'ha especificat cap tipus - s'assumeix smbfs per al prefix //\n"
+"mount: no s'ha especificat cap tipus; s'assumirà smb a causa del prefix //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr "mount: Executant en segon plà \"%s\"\n"
+msgstr "mount: s'està executant «%s» en segon plà\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
-msgstr "mount: Abandonant \"%s\"\n"
+msgstr "mount: s'està abandonant «%s»\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
-msgstr "mount: %s ja està muntat en %s\n"
+msgstr "mount: %s ja està muntat a %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8593,74 +8295,78 @@ msgid ""
 "Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
-"Ús: mount -V                 : mostra la versió\n"
-"    mount -h                 : mostra aquesta ajuda\n"
-"    mount                    : llista els sistemes de fitxers muntats\n"
-"    mount -l                 : ídem, incloguen les etiquetes de volumen\n"
-"Fins aquí la part informativa. Seguim amb el muntatge.\n"
-"El comandament és `mount [-t tipus_sis._fitx.] alguna_cosa lloc'.\n"
-"Els detalls en /etc/fstab es poden ometre.\n"
-"    mount -a [-t|-O]         : munta tot l'indicat en /etc/fstab\n"
-"    mount dispositiu         : munta el dispositiu en el lloc conegut\n"
-"    mount directori          : munta el dispositiu conegut aquí\n"
-"    mount -t tipus disp dir  : comandament mount ordinari\n"
+"forma d'ús: mount -V            : mostra la versió\n"
+"            mount -h            : mostra aquesta ajuda\n"
+"            mount               : llista els sistemes de fitxers muntats\n"
+"            mount -l            : ídem, incloen les etiquetes de volum\n"
+"Fins aquí la part informativa. Es continua amb el muntatge.\n"
+"L'ordre és «mount [-t tipus_sf] alguna_cosa lloc».\n"
+"Els detalls inclosos en /etc/fstab es poden ometre.\n"
+"            mount -a [-t|-O]    : munta tot el que s'ha indicat\n"
+"                                  en /etc/fstab\n"
+"            mount dispositiu    : munta el dispositiu en el lloc conegut\n"
+"            mount directori     : munta el dispositiu conegut aquí\n"
+"            mount -t tipus disp dir : ordre mount ordinaria\n"
 "Tingueu en compte que no muntareu realment un dispositiu, sinó més\n"
 "aviat el seu sistema de fitxers (el tipus donat). També es pot muntar\n"
 "un arbre de directoris ja visible en un altre lloc\n"
-"    mount --bind dir_antic dir_nou\n"
+"            mount --bind dir_antic dir_nou\n"
 "o moure un subarbre:\n"
-"    mount --move dir_antic dir_nou\n"
+"            mount --move dir_antic dir_nou\n"
 "Es pot donar un dispositiu mitjançant el nom, posem-hi /dev/hda1 o\n"
 "/dev/cdrom o mitjançant l'etiqueta, usant -L etiqueta o mitjançant uuid,\n"
-"usant -U uuid. D'altres opcions: [-nfFrsvw] [-o opcions].\n"
-"Per a més detalls, escriviu man 8 mount.\n"
+"usant -U uuid.\n"
+"Altres opcions: [-nfFrsvw] [-o opcions] [-p dfcontrasenya].\n"
+"Per a més detalls, consulteu «man 8 mount».\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
-msgstr "mount: Sols l'usuari root pot fer això"
+msgstr "mount: només l'usuari root pot fer això"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: No s'ha trobat %s; s'està creant...\n"
+msgstr "mount: no s'ha trobat %s; s'està creant...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
-msgstr "mount: No troba aquesta partició"
+msgstr "mount: no s'ha trobat aquesta partició"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr "mount: Muntant %s\n"
+msgstr "mount: s'està muntant %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "no s'ha muntat res"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr "mount: No es pot trobar %s en %s"
+msgstr "mount: no s'ha pogut trobar %s a %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr "mount: No es pot trobar %s en %s o %s"
+msgstr "mount: no s'ha pogut trobar %s a %s o %s"
 
 #: mount/mount_guess_fstype.c:489
 #, c-format
 msgid "mount: error while guessing filesystem type\n"
-msgstr "mount: Error a l'intentar endevinar el tipus del sistema de fitxers\n"
+msgstr ""
+"mount: s'ha produït un error en intentar endevinar el tipus de sistema de "
+"fitxers\n"
 
 #: mount/mount_guess_fstype.c:541
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount: No heu especificat un tipus de sistema de fitxers per a %s\n"
+msgstr "mount: no heu especificat cap tipus de sistema de fitxers per a %s\n"
 
 #: mount/mount_guess_fstype.c:544
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr "       Es provarà amb tots els tipus indicats en %s o %s\n"
+msgstr "       Es provarà amb tots els tipus indicats a %s o %s\n"
 
 #: mount/mount_guess_fstype.c:547
 #, c-format
@@ -8675,322 +8381,317 @@ msgstr "       Provaré amb el tipus %s\n"
 #: mount/mount_guess_fstype.c:637
 #, c-format
 msgid "Trying %s\n"
-msgstr "Provant amb %s\n"
+msgstr "S'està provant amb %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
-msgstr "mount: Argument excessivament llarg màquina:dir\n"
+msgstr "mount: argument excessivament llarg host:dir\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr "mount: Atenció: Múltiples noms de màquina no suportats\n"
+msgstr "mount: avís: múltiples noms d'ordinador no està implementat\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr "mount: El directori a muntar no té el format màquina:dir\n"
+msgstr "mount: el directori a muntar no té el format ordinador:dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
-msgstr "mount: No es pot obtindre l'adreça per a %s\n"
+msgstr "mount: no s'ha pogut obtenir l'adreça per a %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
-msgstr "mount: Valor incorrecte per a hp->h_length\n"
+msgstr "mount: valor incorrecte per a hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
-msgstr "mount: Argument d'opció excessivament llarg\n"
+msgstr "mount: l'argument de l'opció és excessivament llarg\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr "Atenció: Opció desconeguda proto=\n"
+msgstr "Avís: Opció desconeguda proto=\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
-msgstr "Atenció: L'opció namlen no està suportada.\n"
+msgstr "Avís: L'opció namlen no està implementada.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
-msgstr "paràmetre de muntatge de nfs desconegut: %s=%d\n"
+msgstr "no es reconeix el paràmetre de muntatge de nfs: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
-msgstr "Atenció: L'opció nolock no està suportada.\n"
+msgstr "Avís: l'opció nolock no està implementada.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
-msgstr "Opció de muntatge de nfs desconeguda: %s%s\n"
+msgstr "no es creconeix l'opció de muntatge de nfs: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
-msgstr "mount: Valor incorrecte per a hp->h_length?\n"
+msgstr "mount: valor incorrecte per a hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
-msgstr "NFS sobre TCP no està suportat.\n"
+msgstr "NFS sobre TCP no està implementat.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "connector nfs"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
-msgstr "el servidor nfs informa de que el servei no està disponible"
+msgstr "el servidor nfs informa que el servei no està disponible"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
-msgstr "s'ha usat l'assignador de ports per a trobar el port NFS\n"
+msgstr "s'ha usat l'assignador de ports per trobar el port NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr "usant el port %d per al dimoni de nfs\n"
+msgstr "s'està usant el port %d per al dimoni de nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "connexió nfs"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
-msgstr "valor de retorn de nfs status desconegut: %d"
+msgstr "no es reconeix el valor de retorn de l'estat de nfs: %d"
 
 #: mount/sundries.c:26
 msgid "bug in xstrndup call"
-msgstr "error en la crida xstrndup"
+msgstr "s'ha produït un error en la crida xstrndup"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
 "       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
-"ús:   %s [-hV]\n"
-"      %s -a [-e] [-v]\n"
-"      %s [-v] [-p prioritat] especial ...\n"
-"      %s [-s]\n"
+"forma d'ús: %s [-hV]\n"
+"            %s -a [-e] [-v]\n"
+"            %s [-v] [-p prioritat] especial|ETIQUETA=nom_volum...\n"
+"            %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
-"ús:  %s [-hV]\n"
-"     %s -a [-v]\n"
-"     %s [-v] especial ...\n"
+"forma d'ús: %s [-hV]\n"
+"            %s -a [-v]\n"
+"            %s [-v] especial ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
-msgstr "%s en %s\n"
+msgstr "%s a %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: No es pot trobar \"_stext\" en %s\n"
+msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: No es pot executar stat per a %s: %s\n"
+msgstr "%s: no s'ha pogut fer stat en %s: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
-"swapon: Atenció: %s teniu els permisos %04o que no son segurs, es "
-"suggereixen %04o\n"
+"%s: avís: %s té els permisos %04o que són insegurs, se suggereix %04o\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: Saltant-se el fitxer %s - sembla que està a troços.\n"
+msgstr "%s: S'està ometent el fitxer %s - sembla que té forats.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
-msgstr "No és el superusuari.\n"
+msgstr "No sou el superusuari.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr "%s: No es pot obrir %s: %s\n"
+msgstr "%s: no s'ha pogut obrir %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
-msgstr "umount: Està compilat sense suporte per a -f\n"
+msgstr "umount: està compilat sense suport per a -f\n"
 
-#: mount/umount.c:141
-#, fuzzy, c-format
+#: mount/umount.c:139
+#, c-format
 msgid "umount: cannot fork: %s"
-msgstr "mount: No es pot establir el canvi: %s"
+msgstr "mount: no s'ha pogut bifurcar: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr "màquina: %s, directori: %s\n"
+msgstr "host: %s, directori: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
-msgstr "umount: No es pot obtindre l'adreça per a %s\n"
+msgstr "umount: no s'ha pogut obtenir l'adreça per a %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
-msgstr "umount: Valor incorrecte per a hostp->h_length\n"
+msgstr "umount: valor incorrecte per a hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
-msgstr "umount: %s: Dispositiu de blocs no vàlid"
+msgstr "umount: %s: dispositiu de blocs no vàlid"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr "umount: %s: No està muntat"
+msgstr "umount: %s: no està muntat"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr "umount: %s: No es pot escriure el superbloc"
+msgstr "umount: %s: no s'ha pogut escriure el superbloc"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
-msgstr "umount: %s: Dispositiu ocupat"
+msgstr "umount: %s: dispositiu ocupat"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
-msgstr "umount: %s: No s'ha trobat"
+msgstr "umount: %s: no s'ha trobat"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: %s: Haureu de ser superusuari per a usar umount"
+msgstr "umount: %s: haureu de ser superusuari per poder usar umount"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr "umount: %s: Dispositius de blocs no permesos en el sistema de fitxers"
+msgstr "umount: %s: dispositius de blocs no permesos en el sistema de fitxers"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existeix, s'està provant amb umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
-msgstr "no es pot executar umount en %s - es provarà amb %s\n"
+msgstr "no s'ha pogut executar umount en %s - es provarà amb %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
-msgstr "umount: %s ocupat - tornat a muntar en sols lectura\n"
+msgstr "umount: %s ocupat - s'ha tornat a muntar de només lectura\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr "umount: No es pot tornar a muntar %s en sols lectura\n"
+msgstr "umount: no s'ha pogut tornar a muntar %s de només lectura\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmuntat\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
-"umount: No es pot trobar la llista dels sistemes de fitxers per a desmuntar"
+"umount: no s'ha pogut trobar la llista dels sistemes de fitxers a desmuntar"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Ús: umount [-hV]\n"
-"    umount -a [-f] [-r] [-n] [-v] [-t  tipus_sist._fitx._virtuals] [-O "
-"opcions]\n"
-"    umount [-f] [-r] [-n] [-v] especial | node...\n"
+"Forma d'ús: umount [-hV]\n"
+"            umount -a [-f] [-r] [-n] [-v] [-t  tipus_sist._fitx._virtuals]\n"
+"                   [-O opcions]\n"
+"            umount [-f] [-r] [-n] [-v] especial | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
-#, fuzzy
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
-msgstr "No es pot obrir"
+msgstr "No s'ha pogut desmuntar «»\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr "S'intenta desmuntar %s\n"
+msgstr "S'està intentant desmuntar %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr "No es pot trobar a %s en mtab\n"
+msgstr "No s'ha pogut trobar %s a mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no està muntat (segons mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount: Sembla que %s ha estat muntat diverses vegades"
+msgstr "umount: sembla que %s s'ha muntat diverses vegades"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount: %s no està en el fstab (i no sou el root)"
+msgstr "umount: %s no està al fstab (i no sou el root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr "umount: El muntatge de %s no concorda amb el fstab"
+msgstr "umount: el muntatge de %s no concorda amb el fstab"
 
-#: mount/umount.c:637
-#, fuzzy, c-format
+#: mount/umount.c:630
+#, c-format
 msgid "umount: only %s can unmount %s from %s"
-msgstr "umount: Sols el root pot desmuntar %s des de %s"
+msgstr "umount: només %s pot desmuntar %s des de %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
-msgstr "umount: Sols el root pot fer això"
+msgstr "umount: només el root pot fer això"
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -9001,7 +8702,7 @@ msgstr ""
 #: sys-utils/ctrlaltdel.c:42
 #, c-format
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Ús: ctrlaltdel maquin.|progr.\n"
+msgstr "Forma d'ús: ctrlaltdel maquin.|progr.\n"
 
 #: sys-utils/cytune.c:115
 #, c-format
@@ -9027,27 +8728,27 @@ msgstr ""
 #: sys-utils/cytune.c:190
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr "Valor d'interval no vàlid: %s\n"
+msgstr "Valor d'interval invàlid: %s\n"
 
 #: sys-utils/cytune.c:198
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr "Valor establert no vàlid: %s\n"
+msgstr "Valor establert invàlid: %s\n"
 
 #: sys-utils/cytune.c:206
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr "Valor per defecte no vàlid: %s\n"
+msgstr "Valor per defecte invàlid: %s\n"
 
 #: sys-utils/cytune.c:214
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr "Valor de l'hora establerta no vàlid: %s\n"
+msgstr "Valor de l'hora establerta invàlid: %s\n"
 
 #: sys-utils/cytune.c:222
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr "Valor de l'hora per defecte no vàlid: %s\n"
+msgstr "Valor de l'hora per defecte invàlid: %s\n"
 
 #: sys-utils/cytune.c:239
 #, c-format
@@ -9055,34 +8756,34 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
-"Ús: %s [-q [-i interval]] ([-s valor]|[-S valor]) ([-t valor]|[-T valor]) [-"
-"g|-G] fitxer [fitxer...]\n"
+"Forma d'ús: %s [-q [-i interval]] ([-s valor]|[-S valor]) ([-t valor]|[-T "
+"valor]) [-g|-G] fitxer [fitxer...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
 #: sys-utils/cytune.c:340
 #, c-format
 msgid "Can't open %s: %s\n"
-msgstr "No es pot obrir %s: %s\n"
+msgstr "No s'ha pogut obrir %s: %s\n"
 
 #: sys-utils/cytune.c:258
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr "No es pot establir %s al llindar %d: %s\n"
+msgstr "No s'ha pogut establir %s al llindar %d: %s\n"
 
 #: sys-utils/cytune.c:277
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr "No es pot establir %s al llindar de l'hora %d: %s\n"
+msgstr "No s'ha pogut establir %s al llindar de l'hora %d: %s\n"
 
 #: sys-utils/cytune.c:295 sys-utils/cytune.c:352 sys-utils/cytune.c:383
 #, c-format
 msgid "Can't get threshold for %s: %s\n"
-msgstr "No es pot obtindre el llindar per a %s: %s\n"
+msgstr "No s'ha pogut obtenir el llindar per a %s: %s\n"
 
 #: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
 #, c-format
 msgid "Can't get timeout for %s: %s\n"
-msgstr "No es pot obtindre el temps d'espera per a %s: %s\n"
+msgstr "No s'ha pogut obtenir el temps d'espera per a %s: %s\n"
 
 #: sys-utils/cytune.c:307
 #, c-format
@@ -9096,16 +8797,16 @@ msgstr "%s: %ld el llindar i %ld el temps d'espera per defecte\n"
 
 #: sys-utils/cytune.c:328
 msgid "Can't set signal handler"
-msgstr "No es pot determinar el manegador de senyals"
+msgstr "No s'ha pogut determinar el gestor de senyals"
 
 #: sys-utils/cytune.c:332 sys-utils/cytune.c:367
 msgid "gettimeofday failed"
-msgstr "gettimeofday ha fallat"
+msgstr "no ha estat possible executar gettimeofday"
 
 #: sys-utils/cytune.c:345 sys-utils/cytune.c:377
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr "No es pot emetre CYGETMON en %s: %s\n"
+msgstr "No s'ha pogut emetre CYGETMON a %s: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
@@ -9136,43 +8837,45 @@ msgstr "   %f enters/seg.; %f rebut (caràcters/seg.)\n"
 #: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr "Ús: %s [-c] [-n nivell] [-s mida_memòria_temporal]\n"
+msgstr "Forma d'ús: %s [-c] [-n nivell] [-s mida_memòria_temporal]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: Senyal desconeguda %s\n"
+msgstr "flock: es desconeix l'opció, s'està avortant.\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Forma d'ús: flock [--shared | --timeout=segons] nom_fitxer ordre {arg "
+"arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
-msgstr "id no vàlid : %s\n"
+msgstr "id invàlid : %s\n"
 
 #: sys-utils/ipcrm.c:84
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "Impossible suprimir l'id %s (%s)\n"
+msgstr "no s'ha pogut suprimir l'id %s (%s)\n"
 
 #: sys-utils/ipcrm.c:99
 #, c-format
 msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
-msgstr "us desaprobat: %s {shm | msg | sem} id ...\n"
+msgstr "ús desaprovat: %s {shm | msg | sem} id ...\n"
 
 #: sys-utils/ipcrm.c:126
 #, c-format
 msgid "unknown resource type: %s\n"
-msgstr "tipus de la font desconegut: %s\n"
+msgstr "no es reconeix el tipus de la font: %s\n"
 
 #: sys-utils/ipcrm.c:130
 #, c-format
 msgid "resource(s) deleted\n"
-msgstr "font(s) suprimida(es)\n"
+msgstr "fonts suprimides\n"
 
 #: sys-utils/ipcrm.c:140
 #, c-format
@@ -9180,8 +8883,8 @@ msgid ""
 "usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
-"ús: %s [ [-q msqid] [-m shmid] [-s semid]\n"
-"    [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+"forma d'ús: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"               [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
 #: sys-utils/ipcrm.c:181
 #, c-format
@@ -9195,15 +8898,15 @@ msgstr "%s: clau il·legal (%s)\n"
 
 #: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
 msgid "permission denied for key"
-msgstr "permisos denegats per a la clau"
+msgstr "s'ha denegat el permís per a la clau"
 
 #: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
 msgid "already removed key"
-msgstr "la clau ja ha estat treta"
+msgstr "la clau ja s'havia suprimit"
 
 #: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
 msgid "invalid key"
-msgstr "clau no vàlida"
+msgstr "clau invàlida"
 
 #: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
 msgid "unknown error in key"
@@ -9215,11 +8918,11 @@ msgstr "permisos denegats per l'identificador"
 
 #: sys-utils/ipcrm.c:246
 msgid "invalid id"
-msgstr "identificador no vàlid"
+msgstr "identificador invàlid"
 
 #: sys-utils/ipcrm.c:251
 msgid "already removed id"
-msgstr "l'identificador ja ha estat tret"
+msgstr "l'identificador ja s'havia suprimit"
 
 #: sys-utils/ipcrm.c:256
 msgid "unknown error in id"
@@ -9238,7 +8941,7 @@ msgstr "%s: argument desconegut: %s\n"
 #: sys-utils/ipcs.c:121
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr "ús: %s -asmq -tclup \n"
+msgstr "forma d'ús: %s -asmq -tclup \n"
 
 #: sys-utils/ipcs.c:122
 #, c-format
@@ -9248,14 +8951,14 @@ msgstr "      %s [-s -m -q] -i identificador\n"
 #: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s -h for help.\n"
-msgstr "      %s -h per a l'ajuda.\n"
+msgstr "      %s -h per a ajuda.\n"
 
 #: sys-utils/ipcs.c:129
 #, c-format
 msgid ""
 "%s provides information on ipc facilities for which you have read access.\n"
 msgstr ""
-"%s proveeix d'informació sobre els recursos ipc per als quals teniu accés de "
+"%s proporciona informació sobre els recursos ipc als que teniu accés de "
 "lectura.\n"
 
 #: sys-utils/ipcs.c:131
@@ -9266,8 +8969,8 @@ msgid ""
 "\t-q : messages\n"
 msgstr ""
 "Especificació dels recursos:\n"
-"\t-m : Memòria compartida\n"
-"\t-q : Missatges\n"
+"\t-m : memòria compartida\n"
+"\t-q : missatges\n"
 
 #: sys-utils/ipcs.c:132
 #, c-format
@@ -9275,8 +8978,8 @@ msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
 msgstr ""
-"\t-s : Semàfors\n"
-"\t-a : Tot (per defecte)\n"
+"\t-s : semàfors\n"
+"\t-a : tot (per defecte)\n"
 
 #: sys-utils/ipcs.c:133
 #, c-format
@@ -9287,9 +8990,9 @@ msgid ""
 "\t-c : creator\n"
 msgstr ""
 "Format de l'eixida:\n"
-"\t-t : Temps\n"
-"\t-p : Pid\n"
-"\t-c : Creador\n"
+"\t-t : temps\n"
+"\t-p : pid\n"
+"\t-c : creador\n"
 
 #: sys-utils/ipcs.c:134
 #, c-format
@@ -9297,47 +9000,45 @@ msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
 msgstr ""
-"\t-l : Límits\n"
-"\t-u : Resumen\n"
+"\t-l : límits\n"
+"\t-u : resum\n"
 
 #: sys-utils/ipcs.c:135
 #, c-format
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
 msgstr ""
-"-i id [-s -q -m] : Detalls sobre els recursos identificats per "
+"-i id [-s -q -m] : detalls sobre els recursos identificats per "
 "l'identificador\n"
 
 #: sys-utils/ipcs.c:267
 #, c-format
 msgid "kernel not configured for shared memory\n"
-msgstr "nucli no configurat per a memòria compartida\n"
+msgstr "el nucli no està configurat per a memòria compartida\n"
 
 #: sys-utils/ipcs.c:273
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Límits de la memòria compartida --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "max number of segments = %lu\n"
-msgstr "màx. nombre de segments = %ld\n"
+msgstr "màx. nombre de segments = %lu\n"
 
 #: sys-utils/ipcs.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "max seg size (kbytes) = %lu\n"
-msgstr "mida màx. del segment (koctets) = %ld\n"
+msgstr "mida màx. del segment (kbytes) = %lu\n"
 
 #: sys-utils/ipcs.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "max total shared memory (pages) = %lu\n"
-msgstr "total màx. memòria compartida (koctets) = %ld\n"
+msgstr "total màx. memòria compartida (kbytes) = %lu\n"
 
 #: sys-utils/ipcs.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "min seg size (bytes) = %lu\n"
-msgstr "mida mín. segment (octets) = %ld\n"
+msgstr "mida mín. segment (octets) = %lu\n"
 
 #: sys-utils/ipcs.c:289
 #, c-format
@@ -9592,7 +9293,7 @@ msgstr "el nucli no està configurat per a cues de missatges\n"
 #: sys-utils/ipcs.c:504
 #, c-format
 msgid "------ Messages: Limits --------\n"
-msgstr "------ Missatges: Límits -------\n"
+msgstr "------ Missatges: límits -------\n"
 
 #: sys-utils/ipcs.c:505
 #, c-format
@@ -9612,7 +9313,7 @@ msgstr "mida màx. per defecte de la cua (octets) = %d\n"
 #: sys-utils/ipcs.c:511
 #, c-format
 msgid "------ Messages: Status --------\n"
-msgstr "------ Missatges: Estat --------\n"
+msgstr "------ Missatges: estat --------\n"
 
 #: sys-utils/ipcs.c:512
 #, c-format
@@ -9632,7 +9333,7 @@ msgstr "espai emprat = %d octets\n"
 #: sys-utils/ipcs.c:518
 #, c-format
 msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr "--- Cues de missatges: Creadors/propietaris ---\n"
+msgstr "--- Cues de missatges: creadors/propietaris ---\n"
 
 #: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
 #: sys-utils/ipcs.c:538
@@ -9649,17 +9350,20 @@ msgstr "--- Temps tramesa./recep./modific. cues de missatges ---\n"
 msgid "%-8s %-10s %-20s %-20s %-20s\n"
 msgstr "%-8s %-10s  %-20s %-20s %-20s\n"
 
+# FIXME
 #: sys-utils/ipcs.c:526
 msgid "send"
-msgstr "tramesa"
+msgstr "envia"
 
+# FIXME
 #: sys-utils/ipcs.c:526
 msgid "recv"
-msgstr "recepció"
+msgstr "rep"
 
+# FIXME
 #: sys-utils/ipcs.c:526
 msgid "change"
-msgstr "modificació"
+msgstr "modifica"
 
 #: sys-utils/ipcs.c:530
 #, c-format
@@ -9817,22 +9521,23 @@ msgstr "pid"
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr ""
-"ús: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR [ DESPLAÇAMENT ] ] ]"
+"forma d'ús: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR "
+"[ DESPLAÇAMENT ] ] ]"
 
 #: sys-utils/rdev.c:70
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
 msgstr ""
-"  rdev /dev/fd0  (o rdev /linux, etc.) mostra a l'actual dispositiu ROOT"
+"  rdev /dev/fd0  (o rdev /linux, etc.) mostra el dispositiu ROOT actual"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         estableix el ROOT en /dev/hda2"
+msgstr "  rdev /dev/fd0 /dev/hda2         estableix el ROOT a /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr ""
-"  rdev -R /dev/fd0 1              estableix el ROOTFLAGS (estat de sols "
+"  rdev -R /dev/fd0 1              estableix els ROOTFLAGS (estat de només "
 "lectura)"
 
 #: sys-utils/rdev.c:73
@@ -9864,13 +9569,13 @@ msgstr "  vidmode ...                     el mateix que rdev -v"
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
-"Nota: Els modes de vídeo són: -3=Ask, -2=Extended, -1=NormalVga,\n"
+"Nota: els modes de vídeo són: -3=Pregunta, -2=Estès, -1=NormalVga,\n"
 "                              1=tecla1, 2=tecla2, ... "
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr ""
-"      usar -R 1 per a muntar l'arrel a sols lectura; -R 0 a lectura/"
+"      useu -R 1 per muntar l'arrel de només lectura; -R 0 per a lectura/"
 "escriptura."
 
 #: sys-utils/rdev.c:247
@@ -9880,10 +9585,10 @@ msgstr "falta una coma"
 #: sys-utils/readprofile.c:72
 #, c-format
 msgid "out of memory"
-msgstr "memòria esgotada"
+msgstr "no hi ha prou memòria"
 
 #: sys-utils/readprofile.c:118
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9899,17 +9604,18 @@ msgid ""
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s: Ús: \"%s [opcions]\n"
-"\t -m <fitxer_mapa> (Valor predeterminat = \"%s\" i \t\t\t\t  \"%s\")\n"
-"\t -p <fitxer>  (Valor predeterminat = \"%s\")\n"
-"\t -M <mult>    Estableix el multiplicador del perfil en <mult>\n"
-"\t -i           Sols mostra la informació sobre el pas de mostreig\n"
-"\t -v           Mostra dades detallades\n"
-"\t -a           Mostra tots els símbols, fins i tot si el nombre és 0\n"
-"\t -b           Mostra els histogrames individuals dels comptadors\n"
-"\t -r           Restableix tots els comptadors (sols el root)\n"
-"\t -n           Desactiva la detecció auto. de l'ordre dels octets\n"
-"\t -V           Mostra la versió i surt\n"
+"%s: Forma d'ús: \"%s [opcions]\n"
+"\t -m <fitxer_mapa> (valors predeterminats = «%s» i\n"
+"\t\t\t\t  «%s»)\n"
+"\t -p <fitxer>  (valor predeterminat = «%s»)\n"
+"\t -M <mult>    estableix el multiplicador del perfil en <mult>\n"
+"\t -i           només mostra la informació sobre el pas de mostreig\n"
+"\t -v           mostra dades detallades\n"
+"\t -a           mostra tots els símbols, fins i tot si el compte és 0\n"
+"\t -b           mostra els histogrames individuals dels comptadors\n"
+"\t -r           restableix tots els comptadors (només el root)\n"
+"\t -n           inhabilita la detecció automàtica de l'ordre dels octets\n"
+"\t -V           mostra la versió i surt\n"
 
 #: sys-utils/readprofile.c:197
 #, c-format
@@ -9924,12 +9630,12 @@ msgstr "Passa de probes: %i\n"
 #: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr "%s: %s(%i): Línia del mapa incorrecta\n"
+msgstr "%s: %s(%i): línia del mapa incorrecta\n"
 
 #: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr "%s: No es pot trobar \"_stext\" en %s\n"
+msgstr "%s: no s'ha pogut trobar \"_stext\" a %s\n"
 
 #: sys-utils/readprofile.c:343
 #, c-format
@@ -9945,17 +9651,18 @@ msgstr "total"
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
-"ús: renice prioritat [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usuaris ]\n"
+"forma d'ús: renice prioritat [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"usuaris ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr "renice: %s: Usuari desconegut\n"
+msgstr "renice: %s: usuari desconegut\n"
 
 #: sys-utils/renice.c:105
 #, c-format
 msgid "renice: %s: bad value\n"
-msgstr "renice: %s: Valor incorrecte\n"
+msgstr "renice: %s: valor incorrecte\n"
 
 #: sys-utils/renice.c:123 sys-utils/renice.c:135
 msgid "getpriority"
@@ -9968,12 +9675,12 @@ msgstr "setpriority"
 #: sys-utils/renice.c:139
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
-msgstr "%d: Prioritat antiga %d, nova prioritat %d\n"
+msgstr "%d: prioritat antiga %d, nova prioritat %d\n"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "ús: %s programa [arg ...]\n"
+msgstr "forma d'ús: %s programa [arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9982,9 +9689,11 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"ús: %s <dispositiu> [ -i <IRQ> | -t <TEMPS> | -c <CARÀCT.> | -w <ESPERA> |\n"
-"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
-"          -T [on|off] ]\n"
+"Forma d'ús: %s <dispositiu> [ -i <IRQ> | -t <TEMPS> | -c <CARÀCT.> | -w "
+"<ESPERA> |\n"
+"               -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s "
+"| \n"
+"               -T [on|off] ]\n"
 
 #: sys-utils/tunelp.c:91
 msgid "malloc error"
@@ -9993,7 +9702,7 @@ msgstr "error en l'assignació de memòria"
 #: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
-msgstr "%s: Valor incorrecte\n"
+msgstr "%s: valor incorrecte\n"
 
 #: sys-utils/tunelp.c:242
 #, c-format
@@ -10013,7 +9722,7 @@ msgstr ", ocupat"
 #: sys-utils/tunelp.c:265
 #, c-format
 msgid ", ready"
-msgstr ", llest"
+msgstr ", a punt"
 
 #: sys-utils/tunelp.c:266
 #, c-format
@@ -10037,32 +9746,32 @@ msgstr "error de LPGETIRQ"
 #: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr "%s usant la IRQ %d\n"
+msgstr "%s està usant la IRQ %d\n"
 
 #: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr "%s usant l'escrutini\n"
+msgstr "%s està usant escrutini\n"
 
 #: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr "col: Argument -l incorrecte %s.\n"
+msgstr "col: argument -l incorrecte %s.\n"
 
 #: text-utils/col.c:535
 #, c-format
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "ús : col [-bfpx] [-l nline]\n"
+msgstr "forma d'ús: col [-bfpx] [-l nline]\n"
 
 #: text-utils/col.c:541
 #, c-format
 msgid "col: write error.\n"
-msgstr "col: Error d'escriptura.\n"
+msgstr "col: error d'escriptura.\n"
 
 #: text-utils/col.c:548
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr "col: Atenció: No es pot fer la còpia de seguretat de %s.\n"
+msgstr "col: avís: no s'ha pogut fer la còpia de seguretat de %s.\n"
 
 #: text-utils/col.c:549
 msgid "past first line"
@@ -10075,7 +9784,7 @@ msgstr "-- línia ja està buida"
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "ús: %s [ - ] [ -2 ] [ fitxer ... ]\n"
+msgstr "forma d'ús: %s [ - ] [ -2 ] [ fitxer ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
@@ -10084,7 +9793,7 @@ msgstr "línia massa llarga"
 #: text-utils/column.c:374
 #, c-format
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "ús: column [-tx] [-c columnes] [fitxer ...]\n"
+msgstr "forma d'ús: column [-tx] [-c columnes] [fitxer ...]\n"
 
 #: text-utils/hexsyntax.c:82
 #, c-format
@@ -10101,20 +9810,20 @@ msgstr "hexdump: valor del salt incorrecte.\n"
 msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fitxer_fmt] [-n longitud] [-s ometre] "
+"hexdump: [-bcCdovx] [-e fmt] [-f fitxer_fmt] [-n longitud] [-s omet] "
 "[fitxer ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "ús: %s [-dflpcsu] [+núm_línies | +/patró] nom1 nom2 ...\n"
+msgstr "forma d'ús: %s [-dflpcsu] [+núm_línies | +/patró] nom1 nom2 ...\n"
 
-#: text-utils/more.c:484
-#, fuzzy, c-format
+#: text-utils/more.c:439
+#, c-format
 msgid "%s: unknown option \"-%c\"\n"
-msgstr "%s: Senyal desconeguda %s\n"
+msgstr "%s: opció desconeguda «-%c»\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10125,8 +9834,7 @@ msgstr ""
 "*** %s: directori ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10137,45 +9845,45 @@ msgstr ""
 "**** %s: No és un fitxer de text ****\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
-msgstr "[Usar q o Q per a sortir]"
+msgstr "[Useu q o Q per a sortir]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Més--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
-msgstr "(Següent fitxer: %s)"
+msgstr "(Fitxer següent: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr "[Pressionar la barra espaiadora per a continuar; 'q' per a sortir.]"
+msgstr "[Premeu la barra espaiadora per continuar; «q» per a sortir.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
-msgstr "...retrocedir %d pàgines"
+msgstr "...retrocedeix %d pàgines"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
-msgstr "...retrocedir 1 pàgina"
+msgstr "...retrocedeix 1 pàgina"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
-msgstr "...ometent una línia"
+msgstr "...s'està ometent una línia"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
-msgstr "...ometent %d línies"
+msgstr "...s'està ometent %d línies"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10185,7 +9893,7 @@ msgstr ""
 "***Endarrera***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10193,12 +9901,12 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"La majoria de comandaments són precedits opcionalment per un argument k "
-"enter. Per omissió entre parèntesis.\n"
-"L'asterisc (*) indica que l'argument esdevé el nou per omissió.\n"
+"La majoria de les ordres són precedides opcionalment per un argument k "
+"enter. Els valors per defecte estan entre parèntesi.\n"
+"L'asterisc (*) indica que l'argument esdevé el nou valor per defecte.\n"
 
 # a.b: Falta arranjar això de "kth"
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10230,85 +9938,85 @@ msgstr ""
 "s                       Salta endavant k línies de text [1]\n"
 "f                       Salta endavant k pantalles de text [1]\n"
 "b o ctrl-B              Salta endarrera k pantalles de text [1]\n"
-"'                       Vés a on va començar l'anterior recerca\n"
+"'                       Va a on va començar l'anterior recerca\n"
 "=                       Mostra el número de la línia actual\n"
 "/<expressió regular>    Cerca l'ocurrència k-enèssima de l'exp.reg. [1]\n"
 "n                       Cerca l'ocurrència k-enèssima de l'última exp.reg. "
 "[1]\n"
-"!<cmd> o :!<cmd>        Executa <cmd> en una subshell\n"
+"!<cmd> o :!<cmd>        Executa <cmd> en un altre intèrpret d'ordres\n"
 "v                       Engega /usr/bin/vi a la línia actual\n"
 "ctrl-L                  Redibuixa la pantalla\n"
 ":n                      Vés al k-enèssim fitxer següent [1]\n"
 ":p                      Vés al k-enèssim fitxer anterior [1]\n"
 ":f                      Mostra el nom del fitxer i el número de línia\n"
-".                       Repeteix el comandament anterior\n"
+".                       Repeteix l'ordre anterior\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
-msgstr "[Prémer 'h' per a les instruccions.]"
+msgstr "[Premeu «h» per a les instruccions.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" línia %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[No és un fitxer] línia %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Desbordament\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
-msgstr "...ometent\n"
+msgstr "...s'està ometent\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
-msgstr "Error en l'expressió regular"
+msgstr "S'ha produït un error en l'expressió regular"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 "\n"
-"Patró no trobat\n"
+"No s'ha trobat el patró\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
-msgstr "Patró no trobat"
+msgstr "No s'ha trobat el patró"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
-msgstr "no es pot establir el canvi\n"
+msgstr "no s'ha pogut bifurcar\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 "\n"
-"...Saltant "
+"...S'està ometent"
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
-msgstr "...Saltant al fitxer "
+msgstr "...s'està saltant al fitxer "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
-msgstr "...Retrocedint al fitxer "
+msgstr "...S'està retrocedint al fitxer "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Línia massa llarga"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
-msgstr "No hi ha cap comandament previ a substituir"
+msgstr "No hi ha cap ordre prèvia a substituir"
 
 #: text-utils/odsyntax.c:130
 #, c-format
@@ -10318,32 +10026,32 @@ msgstr "od: od(1) ha quedat obsolet per a hexdump(1).\n"
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr "od: La compatibilitat amb hexdump(1) no permet l'opció -%c %s\n"
+msgstr "od: la compatibilitat amb hexdump(1) no permet l'opció -%c %s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
-msgstr "; veure strings(1)."
+msgstr "; vegeu strings(1)."
 
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr "hexdump: No es pot llegir %s.\n"
+msgstr "hexdump: no s'ha pogut llegir %s.\n"
 
 #: text-utils/parse.c:68
 #, c-format
 msgid "hexdump: line too long.\n"
-msgstr "hexdump: Línia massa llarga.\n"
+msgstr "hexdump: línia massa llarga.\n"
 
 #: text-utils/parse.c:401
 #, c-format
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr "hexdump: Nombre total d'octets amb diversos caràcters de conversió.\n"
+msgstr "hexdump: nombre total d'octets amb diversos caràcters de conversió.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
 msgstr ""
-"hexdump: Nombre total d'octets incorrecte per al caràcter de conversió %s.\n"
+"hexdump: nombre total d'octets incorrecte per al caràcter de conversió %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
@@ -10354,140 +10062,138 @@ msgstr ""
 #: text-utils/parse.c:496
 #, c-format
 msgid "hexdump: bad format {%s}\n"
-msgstr "hexdump: Format incorrecte {%s}\n"
+msgstr "hexdump: format incorrecte {%s}\n"
 
 #: text-utils/parse.c:502
 #, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr "hexdump: Caràcter de conversió %%%s incorrecte.\n"
+msgstr "hexdump: caràcter de conversió %%%s incorrecte.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
-"%s: Ús: %s [-número] [-p cadena] [-cefnrs] [+línia] [+/patró/] [fitxers]\n"
+"%s: Forma d'ús: %s [-número] [-p cadena] [-cefnrs] [+línia] [+/patró/] "
+"[fitxers]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
-msgstr "%s: L'opció requereix un argument -- %s\n"
+msgstr "%s: l'opció requereix un argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
-msgstr "%s: Opció ilegal -- %s\n"
+msgstr "%s: opció il·legal -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
-msgstr "...saltant endavant\n"
+msgstr "...s'està saltant endavant\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
-msgstr "...saltant enradera\n"
+msgstr "...s'està saltant endarrera\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
-msgstr "No hi ha fitxer següent"
+msgstr "No hi ha cap fitxer següent"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
-msgstr "No hi ha fitxer anterior"
+msgstr "No hi ha cap fitxer anterior"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
-msgstr "%s: Error de lectura del fitxer %s\n"
+msgstr "%s: S'ha produït un error de lectura en el fitxer %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
-msgstr "%s: EOF inesperat en el fitxer %s\n"
+msgstr "%s: No s'esperava EOF en el fitxer %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
-msgstr "%s: Error desconegut en el fitxer %s\n"
+msgstr "%s: S'ha produït un error desconegut en el fitxer %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: No es pot cerar el fitxer temporal\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "Error RE:"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
-msgstr "No es recorda la cadena de recerca"
+msgstr "No es recorda la cadena de cerca"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
-msgstr "No es pot obrir"
+msgstr "No s'ha pogut obrir"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
-msgstr "desat"
+msgstr "s'ha desat"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
-msgstr ": No es permet !comandament en el mode rflag.\n"
+msgstr ": no es permet !ordre en el mode rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
-msgstr "la crida del sistema fork() ha fallat, proveu-ho després\n"
+msgstr "no ha estat possible executar fork(), proveu-ho més endavant\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
-msgstr "(Següent fitxer: "
+msgstr "(Fitxer següent: "
 
 #: text-utils/rev.c:113
 #, c-format
 msgid "Unable to allocate bufferspace\n"
-msgstr "No es pot assignar espai de memòria temporal\n"
+msgstr "No s'ha pogut assignar espai de memòria intermèdia\n"
 
 #: text-utils/rev.c:156
 #, c-format
 msgid "usage: rev [file ...]\n"
-msgstr "ús: rev [fitxer ...]\n"
+msgstr "forma d'ús: rev [fitxer ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "no es pot obrir %s per a lectura\n"
+msgstr "No s'ha pogut obrir «%s» per a lectura\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "ús: %s [fitxer]\n"
+msgstr "Forma d'ús: tailf fitxer_registre\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "ús: %s [ -i ] [ -tTerminal ] fitxer...\n"
+msgstr "forma d'ús: %s [ -i ] [ -tTerminal ] fitxer...\n"
 
 #: text-utils/ul.c:152
 #, c-format
 msgid "trouble reading terminfo"
-msgstr "problema llegint terminfo"
+msgstr "hi ha hagut un problema en llegir terminfo"
 
 #: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr "Seqüència d'eixida desconeguda en l'entrada: %o, %o\n"
+msgstr "Seqüència d'escapament desconeguda en l'entrada: %o, %o\n"
 
 #: text-utils/ul.c:425
 #, c-format
 msgid "Unable to allocate buffer.\n"
-msgstr "No es pot assignar la memòria temporal.\n"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
 #: text-utils/ul.c:586
 #, c-format
@@ -10497,21 +10203,207 @@ msgstr "Línia d'entrada massa llarga.\n"
 #: text-utils/ul.c:599
 #, c-format
 msgid "Out of memory when growing buffer.\n"
-msgstr "Memòria esgotada a l'augmentar la mida de la memòria temporal.\n"
+msgstr ""
+"S'ha esgotat la memòria en augmentar la mida de la memòria intermèdia.\n"
 
-#, fuzzy
-#~ msgid "Warning: omitting partitions after %d\n"
-#~ msgstr "Atenció: S'estan suprimint les particions després de %d\n"
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Nombre invàlid: %s\n"
 
-#~ msgid "mount: fs type %s not supported by kernel"
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Error de sintaxi: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "No s'ha especificat aquet paràmetre: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] nom del dispositiu\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] dispositiu mida sectors capçals pistes stretch gap rate "
+#~ "spec1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] dispositiu\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] dispositiu\n"
+
+#~ msgid "version"
+#~ msgstr "versió"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "no es pot obrir /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "no s'ha pogut llegir les dades aleatòries de /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "no s'ha pogut obrir %s per a lectura"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "no s'ha pogut executar stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s no té els modes de fitxer correctes"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "no s'ha pogut llegir dades de %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Hi ha massa usuaris en actiu en el sistema.\n"
+#~ "Proveu-ho més endavant.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Esteu executant massa processos.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "La contrasenya ha de tenir com a mínim 6 caràcters, intenteu-ho de nou.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "La contrasenya ha de contenir caràcters d'alguna de les següents clases:\n"
+#~ "lletres majúscules i minúscules, dígits i caràcters no alfanumèrics.\n"
+#~ "Per a més informació consulteu passwd(1).\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "No podeu tornar a usar una contrasenya antiga.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "No useu res similar al vostre nom d'usuari per contrasenya.\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "No useu res similar al vostre nom real per contrasenya.\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Forma d'ús: passwd [nom_usuari [contrasenya]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Només l'usuari root pot usar les formes d'un i dos arguments.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Forma d'ús: passwd [-foqsvV] [usuari [contrasenya]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "No s'ha pogut executar %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "No s'ha pogut trobar el nom d'entrada"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Només l'usuari root pot canviar la contrasenya d'altres usuaris.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Massa arguments.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "No s'ha pogut trobar enlloc el nom d'usuari. `%s' és realment un usuari?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr "Només es poden canviar les contrasenyes locals. Useu yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "El UID i el nom d'usuari no coincideixen, sou un impostor."
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "S'està canviant la contrasenya per a %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Entreu l'antiga contrasenya: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Contrasenya il·legal, impostor."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Entreu la nova contrasenya: "
+
+#~ msgid "Password not changed."
+#~ msgstr "No s'ha canviat la contrasenya."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Reescriviu la nova contrasenya: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "L'heu escrit malament. No s'ha canviat."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "s'ha canviat la contrasenya, usuari %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "S'HA CANVIAT LA CONTRASENYA DEL SUPERUSUARI (ROOT)"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "el superusuari (root) ha canviat la contrasenya; usuari %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "s'està cridant setpwnam per establir la contrasenya.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "*NO* s'ha canviat la contrasenya. Intenteu-ho més endavant.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "S'ha canviat la contrasenya.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
 #~ msgstr ""
-#~ "mount: El tipus del sistema de fitxers %s no està suportat pel nucli"
+#~ "mount: aquesta versió ha estat compilada sense suport per al tipus `nfs'"
+
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: no s'ha compilat amb suport per a minix v2\n"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Arren.(%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Cap (%02X)"
+
+#~ msgid "Warning: deleting partitions after %d\n"
+#~ msgstr "Atenció: s'estan suprimint les particions després de %d\n"
 
 #~ msgid "BLKGETSIZE ioctl failed for %s\n"
 #~ msgstr "Falla del ioctl BLKGETSIZE per a %s\n"
 
-#~ msgid "%s: not compiled with minix v2 support\n"
-#~ msgstr "%s: No s'ha compilat amb suport per a minix v2\n"
+#~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) desplaçament %d, %s encriptació\n"
+
+#~ msgid ""
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
+#~ msgstr ""
+#~ "mount: No es pot trobar cap dispositiu loop.\n"
+#~ "       Podria ser que /dev/loop# tingui un número major incorrecte?"
+
+#~ msgid ""
+#~ "mount: Could not find any loop device. Maybe this kernel does not know\n"
+#~ "       about the loop device (then recompile or `insmod loop.o'), or\n"
+#~ "       maybe /dev/loop# has the wrong major number?"
+#~ msgstr ""
+#~ "mount: No es pot trobar cap dispositiu loop. Potser aquest nucli no\n"
+#~ "       el reconegui (si es això, recompileu o feu `insmod loop.o')\n"
+#~ "       o també podria ser que /dev/loop# tingui un número major "
+#~ "incorrecte."
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Inicialització (fins a 16 dígits hexadecimals): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Dígit no hexadecimal '%c'.\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "No conec com obtindre la clau per al sistema d'encriptació %d\n"
+
+#~ msgid "mount: fs type %s not supported by kernel"
+#~ msgstr ""
+#~ "mount: el tipus del sistema de fitxers %s no està suportat pel nucli"
 
 #~ msgid "mount: %s duplicate - not mounted"
 #~ msgstr "mount: %s duplicada; no es muntarà"
@@ -10520,4 +10412,4 @@ msgstr "Memòria esgotada a l'augmentar la mida de la memòria temporal.\n"
 #~ msgstr "UUID"
 
 #~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-#~ msgstr "mount: L'etiqueta %s apareix en %s i %s; no s'ha muntat\n"
+#~ msgstr "mount: l'etiqueta %s apareix en %s i %s; no s'ha muntat\n"
diff --git a/po/cs.gmo b/po/cs.gmo
new file mode 100644
index 000000000..158b50bbf
--- /dev/null
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 01be4df2b..2f35f97e1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-2.11d\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2001-05-30 15:11+0200\n"
 "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -114,7 +114,7 @@ msgstr "%s: chyba zápisu na %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Pou¾ití:\n"
@@ -158,13 +158,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "Pou¾ití: %s [ -n ] zaøízení\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s na %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -189,7 +188,7 @@ msgstr "2"
 msgid "Single"
 msgstr "1"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -199,97 +198,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, fuzzy, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: chyba zápisu na %s\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, fuzzy, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "mìlo by být (%d, %d, %d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, fuzzy, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "pøi pøekladu %s nebyla zvolena podpora minix v2\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, fuzzy, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s není zaøízením pru¾ného disku\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: chyba pøi analýze pøepínaèù\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -763,7 +762,7 @@ msgstr "pøíli¹ mnoho iuzlù - maximum je 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "nedostatek místa, minimální potøebný poèet blokù: %lu"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Zaøízení: %s\n"
@@ -832,18 +831,18 @@ msgstr "chyba pøi zápisu .. polo¾ky"
 msgid "error closing %s"
 msgstr "Chyba pøi zavírání %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Pou¾ití: mkfs [-V] [-t sstyp] [ss-volby] zaøízení [velikost]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Nedostatek pamìti!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs verze %s (%s)\n"
@@ -886,7 +885,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -939,10 +937,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, fuzzy, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1015,7 +1009,6 @@ msgstr "i-uzly nelze zapsat"
 msgid "write failed in write_block"
 msgstr "chyba pøi zápisu ve write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1051,7 +1044,7 @@ msgstr "chyba pøi posunu ukazovátka v prùbìhu kontroly blokù"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nesprávné hodnoty v do_check: pravdìpodobnì chyby\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "chyba pøi posunu ukazovátka v check_blocks"
 
@@ -1093,106 +1086,106 @@ msgstr "o %s nelze získat informace"
 msgid "will not try to make filesystem on '%s'"
 msgstr "nebudu se pokou¹et vytvoøit systém souborù na '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Zadadaná velikost stránky (%d) je chybná.\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Pou¾ívám zadanou velikost stránky (%d) místo implicitních hodnot (%d/%d).\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Pøedpokládám velikost stránek %d (nikoliv %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "popis"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Pou¾ití: %s [-c] [-v0|-v1] [-pVELIKOST STRÁNKY] /dev/název [bloky]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "pøíli¹ mnoho chybných stránek"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Nedostatek pamìti"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "chybných stránek: 1\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "chybných stránek: %d\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: chyba: Kde mám vytvoøit odkládací prostor?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: chyba: zadaná velikost (%ld) je vìt¹í ne¾ velikost zaøízení (%d)\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: chyba: neznámá verze %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: chyba: minimální velikost odkládacího prostoru je %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: varování: odkládací prostor useknut na %ldkB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: chyba: Kde mám vytvoøit odkládací prostor?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "nebudu se pokou¹et vytvoøit odkládací zaøízení '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "osudová chyba: první stránka je neèitelná"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1206,126 +1199,88 @@ msgstr ""
 "opravdu\n"
 "chcete vytvoøit odkládací prostor v0, pou¾ijte pøepínaè -f pro vynucení.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Odkládací prostor nelze nastavit: neèitelné"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Vytváøím odkládací prostor verze %d, velikost (v bajtech) = %ld\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "odkládací prostor nelze pøevinout"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "stránku signatur nelze zapsat"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "volání fsync selhalo"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Chybné èíslo: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaktická chyba: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Chybný argument: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, fuzzy, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "Pou¾ití: %s [ -p ] název zaøízení\n"
-
-#: disk-utils/setfdprm.c:102
-#, fuzzy, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"         %s [ -p ] zaøízení velikost sekt hlavy stopy stretch gap rychlost\n"
-"         spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "         %s [ -c | -y | -n | -d ] zaøízení\n"
-
-#: disk-utils/setfdprm.c:107
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "         %s [ -c | -y | -n ] zaøízení\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Nepou¾itelné"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Volný prostor"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 #, fuzzy
 msgid "Linux ext3"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 #, fuzzy
 msgid "Linux XFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 #, fuzzy
 msgid "Linux ReiserFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Na disku byly provedeny zmìny.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Restartujte systém, aby byla jistota, ¾e tabulka rozdìlení disku byla\n"
 "korektnì zmìnìna.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1338,331 +1293,312 @@ msgstr ""
 "DOS 6.x diskové oddíly, pøeètìte si prosím manuál\n"
 "programu cfdisk, abyste získal dodateèné informace.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "OSUDOVÁ CHYBA"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Stisknìte jakoukoliv klávesu pro ukonèení programu cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Nelze posunout ukazovátko na disku"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Z disku nelze èíst"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Nelze zapisovat na disk"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "pøíli¹ mnoho diskových oddílù"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Diskový oddíl zaèíná pøed sektorem 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Diskový oddíl konèí pøed sektorem 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Diskový oddíl zaèíná za koncem disku"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Diskový oddíl konèí za koncem disku"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logické diskový oddíl jsou chybnì seøazeny"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logické diskové oddíly se vzájemnì pøekrývají"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "zvìt¹ené logické diskové oddíly se vzájemnì pøekrývají"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Vnitøní chyba pøi vytváøení logického disku bez roz¹íøených diskových "
 "oddílù !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Zde nelze vytvoøit logický disk -- vznikly by dva roz¹íøené diskové oddíly"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Polo¾ka nabídky je pøíli¹ dlouhá. Nabídka mù¾e vypadat podivnì."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Nabídka nemá zadaný smìr. Pou¾ívám horizontální."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Chybná klávesa"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Stisknìte klávesu pro pokraèování"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primární"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Vytvoøit nový primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logický"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Vytvoøit nový logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Zru¹it"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Nevytváøet diskový oddíl"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Vnitøní chyba !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Zaèátek"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Vytvoøit diskový oddíl na zaèátku volného prostoru"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Vytvoøit diskový oddíl na konci volného prostoru"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Pro roz¹íøený diskový oddíl není dostatek místa"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "Nebyla nalezena ¾ádná tabulka rozdìlení disku.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Chybný podpis na tabulce rozdìlení disku"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Vytisknout pouze tabulku rozdìlení disku"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "Nebyla nalezena ¾ádná tabulka rozdìlení disku.\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Zadal jste vìt¹í poèet cylindrù, ne¾ se vejde na disk."
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Disk nelze otevøít"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disk byl otevøen pouze pro ètení - nemáte práva pro zápis"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Velikost disku nelze zjistit"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Chybný primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Chybný logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varování!! Toto mù¾e vést ke znièení dat na Va¹em disku!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Jste si jist, ¾e chcete ulo¾it tabulku rozdìlení disku na disk? (ano èi ne):"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Tabulka rozdìlení disku nebyla ulo¾ena"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ano"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Zadejte `ano' èi `ne'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Ukládám tabulku rozdìlení disku na disk"
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Tabulka rozdìlení disku byla ulo¾ena na disk"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Tabulka byla ulo¾ena, ale nepodaøilo se ji znovu naèíst. Restartujte systém."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "®ádný primární diskový oddíl není startovací. DOS MBR takto nenastartuje."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Více ne¾ 1 primární diskový oddíl je startovací. DOS MBR takto nenastartuje."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Zadejte název souboru èi stisknìte RETURN pro zobrazení: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Soubor '%s' nelze otevøít"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "  ®ádný  "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "  Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "  Primární"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "  Logický"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Startovací"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabulka rozdìlení disku pro %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            První    Poslední\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1671,7 +1607,7 @@ msgstr ""
 " # Typ      Sektor   Sektor   Posun   Délka    ID systému souborù     "
 "Pøíznaky\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1680,473 +1616,470 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "        ---Poèátek---       ----Konec----   Poèáteèní\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Pøíz Hlav Sekt Cyl    ID  Hlav Sekt Cyl  sektor    Sektorù\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Pøímý"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Vytisknout tabulku v pøímém datovém formátu"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektory"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Vytisknout tabulku seøazenou dle sektorù"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabulka"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Vytisknout pouze tabulku rozdìlení disku"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Netisknout tabulku"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Nápovìda pro cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Toto je cfdisk, program pro vytváøení diskových oddílù zalo¾ený"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "na knihovnì curses. Umo¾òuje vytváøení, mazání a modifikaci"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "diskových oddílù na Va¹em pevném disku."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Pøíkaz      Význam"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Pøepne aktuálnímu oddílu pøíznak startovatelnosti"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Sma¾e aktuální oddíl"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Zmìní geometrii"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VAROVÁNÍ: Tato volba by mìla být pou¾ívána pouze lidmi,"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             kteøí vìdí, co èiní."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Vypí¹e tuto nápovìdu"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximálnì zvìt¹í aktuální diskový oddíl "
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Poznámka: Toto mù¾e uèinit oddíl nekompatibilní s"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Vytvoøit na volném místì nový oddíl"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Vypí¹e tabulku rozdìlení disku na obrazovku èi do souboru"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Pøi výpisu tabulky rozdìlení disku si mù¾ete zvolit"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             z nìkolika formátù:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Pøímý (pøesnì to, co by bylo zapsáno na disk)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabulka seøazená dle sektorù"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabulka v pøímém formátu"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Ukonèí program bez ulo¾ení tabulky rozdìlení disku"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Zmìní typ systému souborù"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Zmìní jednotky pro zobrazení velikosti oddílu"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Cykluje mezi MB, sektory a cylindry"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Ulo¾í tabulku rozdìlení disku (pouze velké W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Jeliko¾ to mù¾e znièit na disku, musíte to potvrdit"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             nebo odmítnout napsáním `yes' nebo"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nahoru       Pøesune kurzor na pøedcházející oddíl."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Dolù         Pøesune kurzor na dal¹í oddíl."
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Pøekreslí obrazovku"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Vypí¹e tuto nápovìdu"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Poznámka: V¹echny pøíkazy mohou být zadány malými i velkými písmeny"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "(s vyjímkou zápisu - W)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Zmìní geometrii cylindrù"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Hlavy"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Zmìní geometrii hlav"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Zmìní geometrii sektorù"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Geometrie zmìnìna"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Zadejte poèet cylindrù: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Chybný poèet cylindrù"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Zadejte poèet hlav: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Chybný poèet hlav"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Zadejte poèet sektorù na stopu: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Chybný poèet sektorù"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Zadejte typ systému souborù: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Nelze nastavit typ SS na prázdný"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Nelze nastavit typ SS na roz¹íøený"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Neznámý (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disk: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Hlav: %d   Sektorù na stopu: %d   Cylindrù: %d"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Název"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Pøíznaky"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Typ oddílu"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Typ SS"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Popis]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr " Sektory"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Velikost (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Velikost (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Pøepne pøíznak startovatelnosti aktuálnímu diskovému oddílu"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Smazat"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Sma¾e aktuální diskový oddíl"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Zmìní geometrii disku (pouze pro odborníky)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Nápovìda"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Vypí¹e nápovìdu"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Zvìt¹ení"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Zvìt¹í velikost aktuálního diskového oddílu na maximum (pouze pro odborníky)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nový"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Vytvoøí nový diskový oddíl ve volném prostoru"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Tisk"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Vypí¹e tabulku rozdìlení disku (na obrazovku èi do souboru)"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Ukonèí program bez ulo¾ení tabulky rozdìlení disku"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Druh"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Zmìní typ systému souborù (DOS, Linux, OS/2 atd.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Jednotky"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Zmìní jednotky, ve kterých je udávána velikost diskového oddílu"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Ulo¾it"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Ulo¾í tabulku rozdìlení disku na disk (mù¾e znièit data)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Tento oddíl nelze nastavit jako startovací."
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Prázdný diskový oddíl nelze smazat."
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Tento diskový oddíl nelze zvìt¹it."
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Tento diskový oddíl je nepou¾itelný."
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Tento diskový oddíl je ji¾ pou¾íván."
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Typ prázdného diskového oddílu nelze zmìnit."
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "®ádné dal¹í diskové oddíly"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Chybný pøíkaz"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2218,9 +2151,9 @@ msgstr ""
 "\n"
 "BSD tabulka rozdìlení disku pro zaøízení: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Pøíkazy"
 
@@ -2240,10 +2173,9 @@ msgstr "   i   instalovat zavadìè"
 msgid "   l   list known filesystem types"
 msgstr "   l   vypsat známé typy systémù souborù"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   vypí¹e tuto nabídku"
 
@@ -2255,14 +2187,14 @@ msgstr "   n   vytvoøit nový BSD diskový oddíl"
 msgid "   p   print BSD partition table"
 msgstr "   p   vytisknout BSD tabulku rozdìlení disku"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   ukonèí program bez ulo¾ení zmìn"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   návrat do hlavní nabídky"
 
@@ -2305,13 +2237,13 @@ msgstr "Na %s se nenachází ¾ádný *BSD diskový oddíl.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Pøíkaz pro BSD popis disku (m pro nápovìdu): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "První %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Poslední %s èi +velikost èi +velikostM èi velikostK"
@@ -2357,8 +2289,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " chybnýsekt"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2461,8 +2391,8 @@ msgstr "sektorù/stopu"
 msgid "tracks/cylinder"
 msgstr "stop/cylindr"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cylindry"
 
@@ -2519,7 +2449,7 @@ msgstr "Zavadìè instalován na %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Diskový oddíl (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Ji¾ bylo vytvoøeno maximální mno¾ství diskových oddílù.\n"
@@ -2543,7 +2473,7 @@ msgstr ""
 "\n"
 "Synchronizují se disky.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 #, fuzzy
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
@@ -2564,7 +2494,7 @@ msgstr ""
 "-u: zadání Zaèátku a Konce v sektorech (místo cylindrech)\n"
 "-b 2048: (pro nìkteré MO jednotky) pou¾ije 2048bajtové sektory\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2580,199 +2510,185 @@ msgstr ""
 "  èi: fdisk /dev/rd/c0d0  èi: fdisk /dev/ida/c0d0  (pro RAID zaøízení)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s nelze otevøít\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s nelze èíst\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ukazovátko nelze posunout na %s.\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s nelze ulo¾it\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Nelze alokovat více pamìti\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fatální chyba\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   pøepne pøíznak \"pouze pro ètení\""
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   úprava bsd popisu disku"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   pøepne pøíznak \"pøipojitelný\""
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   sma¾e diskový oddíl"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   vypí¹e známé typy diskových oddílù"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   vytvoøí nový diskový oddíl"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   vytvoøí prázdný DOSOVÝ diskový oddíl"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   vypí¹e tabulku rozdìlení disku"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   vytvoøí prázdný Sun popis disku"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   zmìní id diskového oddílu"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   zmìní jednotky v nich¾ jsou vypisovány informace"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   ovìøí tabulku rozdìlení disku"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   ulo¾í tabulku rozdìlení disku a ukonèí program"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   roz¹iøující funkce (pouze pro odborníky)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   nastaví startovací diskový oddíl"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   úprava polo¾ky startovacího souboru"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   nastaví sgi odkládací diskový oddíl"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   pøepne pøíznak \"startovací\""
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   pøepne pøíznak \"DOS kompatibilní\""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   zmìní mno¾ství alternativních cylindrù"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   zmìní mno¾ství cylindrù"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   vypí¹e tabulku rozdìlení disku (tak jak je ulo¾ena na disku)"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   zmìní mno¾ství extra sektorù na stopu"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   zmìní mno¾ství hlav"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   zmìní prokládací faktor"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   zmìní rychlost otáèení"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   zmìní poèet sektorù/stopu"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   zmìní poèet fyzických cylindrù"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   posune poèátek dat v diskovém oddílu"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   vypí¹e roz¹íøené diskové oddíly"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 #, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   vytvoøí IRIX tabulku rozdìlení disku"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   opraví øazení diskových oddílù"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Musíte nastavit"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "hlavy"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektory"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2781,11 +2697,11 @@ msgstr ""
 "%s%s.\n"
 "Mù¾ete tak uèinit z nabídky roz¹iøujících funkcí.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " a "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2804,29 +2720,29 @@ msgstr ""
 "2) s programy pro správu diskových oddílù z jiných OS\n"
 "   (napø. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Chybný posun v primárním diskovém oddílu\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Varování: nadbyteèný ukazatel na link v tabulce rozdìlení disku %d.\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Varování: nadbyteèná data v tabulce rozdìlení disku %d ignorována.\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2840,24 +2756,24 @@ msgstr ""
 "data\n"
 "pochopitelnì dostupná.\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Pozor: velikost sektoru je %d (nikoliv %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Nebudete moci ulo¾it tabulku rozdìlení disku.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2867,17 +2783,17 @@ msgstr ""
 "popis\n"
 "disku\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Vnitøní chyba\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Nadbyteèný roz¹íøený diskový oddíl %d ignorován.\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2886,7 +2802,7 @@ msgstr ""
 "Varování: chybný pøíznak 0x%04x tabulky rozdìlení disku %d bude opraven "
 "zápisem(w)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2895,83 +2811,83 @@ msgstr ""
 "\n"
 "tøikrát jsem nalezl EOF - konèím..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "©estnáctkovì (L vypí¹e kódy):"
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, implicitnì %d): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Pou¾ívám implicitní hodnotu %d\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Hodnota je mimo meze.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Èíslo diskového oddílu"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varování: diskový oddíl %d nemá urèen typ\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Nadbyteèný roz¹íøený diskový oddíl %d ignorován.\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylindr"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Mìním jednotky v nich¾ jsou vypisovány informace na %sy\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VAROVÁNÍ: diskový oddíl %d je roz¹íøeným diskovým oddílem\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Pøíznak DOSOVÉ kompatibility je nastaven.\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Pøíznak DOSOVÉ kompatibility není nastaven.\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Diskový oddíl %d zatím neexistuje!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2983,7 +2899,7 @@ msgstr ""
 "volný prostor. Vytváøet diskové oddíly typu 0 není moudré.\n"
 "Diskový oddíl mù¾ete smazat pomocí pøíkazu `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2992,7 +2908,7 @@ msgstr ""
 "Nemù¾ete mìnit bì¾né diskové oddíly na roz¹íøené a zpìt. Nejdøíve jej "
 "sma¾te.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3003,7 +2919,7 @@ msgstr ""
 "nebo» SunOS/Solaris to oèekává a i Linux tomu dává pøednost.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3015,60 +2931,60 @@ msgstr ""
 "a diskový oddíl 11 jako celý svazek (6), nebo» IRIX to oèekává.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Typ diskového oddílu %d byl zmìnìn na %x (%s).\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Diskový oddíl %d má rozdílný fyzický a logický zaèátek (nelinuxový?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyz=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logický=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Diskový oddíl %d má rozdílný fyzický a logický konec:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Diskový oddíl %i nezaèíná na hranici cylindru:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "mìlo by být (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Diskový oddíl %d nekonèí na hranici cylindru.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "mìlo by být (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3078,7 +2994,7 @@ msgstr ""
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -3086,19 +3002,19 @@ msgstr ""
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3107,7 +3023,7 @@ msgstr ""
 "Diskové oddíly jsou ji¾ seøazeny.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3115,16 +3031,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Zaèátek     Konec  Bloky    Id  Systém\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Zaøízení"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3133,7 +3049,7 @@ msgstr ""
 "\n"
 "Diskové oddíly jsou chybnì seøazeny\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3144,84 +3060,84 @@ msgstr ""
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "È  AF  Hd Sek  Cyl  Hd Sek  Cyl    Zaèátek   Vel  Id\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varování: diskový oddíl %d obsahuje sektor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Diskový oddíl %d: hlava %d má vìt¹í èíslo ne¾ je maximum %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Diskový oddíl %d: sektor %d má vìt¹í èíslo ne¾ je maximum %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Diskový oddíl %d: cylindr %d má vìt¹í èíslo ne¾ je maximum %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Diskový oddíl %d: pøedchozí sektory %d nesouhlasí s úhrnem %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varování: chybný poèátek dat v diskovém oddílu %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varování: diskový oddíl %d pøesahuje do diskového oddílu %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varování: diskový oddíl %d je prázdný.\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logický diskový oddíl %d pøesahuje mimo diskový oddíl %d.\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Celkový poèet alokovaných sektorù (%d) je vìt¹í ne¾ maximum (%d).\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "nealokovaných sektorù: %d\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Diskový oddíl %d je ji¾ definován. Pøed opìtovným vytvoøením jej musíte\n"
 "nejprve smazat.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je ji¾ alokován\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Nejsou ¾ádné volné sektory.\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3230,22 +3146,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Musíte nejprve nìkteré smazat a pøidat roz¹íøený diskový oddíl.\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "logické diskový oddíl jsou chybnì seøazeny"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Chybný primární diskový oddíl"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3256,32 +3172,32 @@ msgstr ""
 "   %s\n"
 "   p   primární diskový oddíl (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logický diskový oddíl (5 nebo více)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   roz¹íøený diskový oddíl"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Chybné èíslo diskového oddílu pro typ `%c'.\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr "Tabulka rozdìlení disku byla zmìnìna!\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Volám ioctl() pro znovunaètení tabulky rozdìlení disku.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3290,7 +3206,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3303,75 +3219,75 @@ msgstr ""
 "DOS 6.x diskové oddíly, pøeètìte si prosím manuálovou\n"
 "stránku programu fdisk, abyste získal dodateèné informace.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Chyba pøi zavírání %s\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronizují se disky.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Diskový oddíl %d neobsahuje datovou oblast.\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nový zaèátek dat"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Pøíkaz pro odborníky (m pro nápovìdu): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Poèet cylindrù"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Poèet hlav"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Poèet sektorù"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varování: nastaven posun sektoru kvùli kompatibilitì s DOSEM\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Na disku %s není korektní tabulka rozdìlení disku.\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "pøíkaz %c není znám\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Toto jádro detekuje velikost sektoru automaticky - pøepínaè -b ignorován\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3381,19 +3297,18 @@ msgstr ""
 "jedním\n"
 "          zadaným zaøízením.\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Na %s nalezen OSF/1 popis disku. Spou¹tím re¾im popisu disku.\n"
 "Pro návrat do re¾imu DOS tabulky rozdìlení disku pou¾ijte pøíkaz 'r'.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Pøíkaz (m pro nápovìdu): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3402,16 +3317,16 @@ msgstr ""
 "\n"
 "Aktuální startovací soubor: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Zadejte název nového startovacího souboru: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Startovací soubor nebyl zmìnìn.\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3478,15 +3393,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativní"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3564,7 +3479,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u velikost%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3621,7 +3535,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Existuje více ne¾ jedna polo¾ka celého disku.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
@@ -3706,7 +3620,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVybral jste si neobvyklý název pro startovací soubor.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3726,11 +3639,10 @@ msgstr ""
 "Zadejte YES, pokud jste si jist, ¾e chcete oznaèit tento diskový oddíl "
 "jinak.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr ""
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3802,44 +3714,43 @@ msgstr "Pokou¹ím se zachovat parametry diskového oddílu %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tZAÈÁTEK=%d\tDÉLKA=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Prázdný prostor"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Celý disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3852,12 +3763,12 @@ msgstr ""
 "cylindry a diskové oddíly, nebo vytvoøit novou tabulku (pøíkaz s v hlavní\n"
 "nabídce)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Automatická konfigurace nalezla %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3869,7 +3780,7 @@ msgstr ""
 "dokud se nerozhodnete je ulo¾it na disk. Poté ji¾ nebudou stará data\n"
 "pochopitelnì dostupná.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3879,72 +3790,72 @@ msgstr ""
 "   ?   automatická konfigurace\n"
 "   0   u¾ivatelská konfigurace (s detekovaným implicitním nastavením)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Zadejte typ (? pro auto, 0 pro u¾ivatelský): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Automatická konfigurace selhala.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektorù/stopu"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Alternativní cylindry"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fyzické cylindry"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Rychlost otáèení (otm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Interleave faktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektory na cylindr"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "V¹echny parametry disku mù¾ete zmìnit z nabídky x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" pru¾ný disk"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux u¾ivatelský"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Diskový oddíl %d nekonèí na hranici cylindru.\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Diskový oddíl %d pøesahuje do jiných v sektorech %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Nevyu¾ívaný prostor - sektory 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nevyu¾ívaný prostor - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3953,7 +3864,7 @@ msgstr ""
 "Jiné diskové oddíly ji¾ zaujímá celý disk.\n"
 "Sma¾te/zmen¹ete nìjaké a zkuste to znovu.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3963,7 +3874,7 @@ msgstr ""
 "Tøetí diskový oddíl nezabírá celý disk, ale va¹e hodnota %d %s\n"
 "zaujímá jiné diskové oddíly. Va¹e polo¾ka byla zmìnìna na %d %s.\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3973,7 +3884,7 @@ msgstr ""
 "tohoto diskového oddílu jako Celého disku (5), zaèínajícího na 0 o délce\n"
 "v sektorech %u\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3987,7 +3898,7 @@ msgstr ""
 "Zadejte YES, pokud jste si jist, ¾e chcete tento diskový oddíl oznaèit 82\n"
 "(odkládací prostor pro Linux): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4006,7 +3917,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4019,16 +3930,16 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Pøíznak Zaèátek     Konec  Bloky    Id  Systém\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Poèet alternativních cylindrù"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Poèet fyzických cylindrù"
 
@@ -4052,32 +3963,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Roz¹íøený"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX startovací"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 #, fuzzy
 msgid "W95 FAT32"
@@ -4088,7 +3993,6 @@ msgstr "Win95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 #, fuzzy
 msgid "W95 FAT16 (LBA)"
@@ -4186,12 +4090,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4212,8 +4114,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4223,7 +4123,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD èi SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4244,12 +4143,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Starý Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / starý Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4280,12 +4177,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4294,7 +4189,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr ""
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4360,30 +4254,22 @@ msgstr "data mimo SS"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell utilita"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS ss"
@@ -4392,117 +4278,110 @@ msgstr "BeOS ss"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr ""
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekundární"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "chyba posunu ukazovátka na %s - ukazovátko nelze posunout na %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 "chyba pøi posunu ukazovátka: po¾adavek 0x%08x%08x, výsledek 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "nedostatek pamìti - konèím\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "chyba ètení na %s - sektor %lu nelze èíst\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "CHYBA: sektor %lu nemá msdos podpis\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "chyba zápisu na %s - sektor %lu nelze zapsat\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "soubor pro ulo¾ení sektorù (%s) nelze otevøít\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "chyba zápisu na %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "volání stat pro soubor s ulo¾enými sektory (%s) selhalo\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "soubor s ulo¾enými sektory má chybnou velikost - nebude obnoven\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "nedostatek pamìti?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "soubor s ulo¾enými sektory (%s) nelze otevøít\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "chyba pøi ètení %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "zaøízení %s nelze otevøít pro zápis\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "chyba pøi zápisu sektoru %lu na %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: geometrii nelze zjistit\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: velikost nelze zjistit\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4513,22 +4392,22 @@ msgstr ""
 "celý disk. Pou¾ití fdisku je v tom pøípadì pravdìpodobnì zbyteèné\n"
 "[Pou¾ijte pøepínaè --force pokud to opravdu chcete.]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varování: dle HDIO_GETGEO je poèet hlav %lu\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varování: dle HDIO_GETGEO je poèet sektorù %lu\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varování: dle BLKGETSIZE/HDIO_GETGEO je poèet cylindrù %lu\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4537,7 +4416,7 @@ msgstr ""
 "Varování: podivný poèet sektorù (%lu) - obvykle nebývá více ne¾ 63\n"
 "To zpùsobí problémy v¹em programùm, které pou¾ívají CHS adresování.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4546,13 +4425,13 @@ msgstr ""
 "\n"
 "Disk %s: cylindrù: %lu, hlav: %lu, sektorù/stopu: %lu\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr "%s diskového oddílu %s má chybný poèet hlav: %lu (mìlo by být 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4560,7 +4439,7 @@ msgid ""
 msgstr ""
 "%s diskového oddílu %s má chybný poèet sektorù: %lu (mìlo by být 1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4568,19 +4447,19 @@ msgid ""
 msgstr ""
 "%s diskového oddílu %s má chybný poèet cylindrù: %lu (mìlo by být 0-%lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr "Id  Název\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Naèítám znovu tabulku rozdìlení disku ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4588,31 +4467,31 @@ msgstr ""
 "Nepodaøilo se znovu naèíst tabulku rozdìlení disku.\n"
 "Restartujte nyní, pøed pou¾itím mkfs, systém.\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Chyba pøi zavírání %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "diskový oddíl %s neexistuje\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "Neznámý formát - pou¾ívám sektory\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabulka rozdìlení disku pro %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "nepou¾ívaný formát - pou¾ívám %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4621,12 +4500,12 @@ msgstr ""
 "Jednotky = cylindry po %lu bajtech, bloky po 1024 bajtech, poèítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Zaøíz  Boot Zaèátek   Konec #cylind #bloky    Id  Systém\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4635,12 +4514,12 @@ msgstr ""
 "Jednotky = sektory po 512 bajtech, poèítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Zaøíz  Boot    Zaèátek     Konec #sektory Id  Systém\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4649,12 +4528,12 @@ msgstr ""
 "Jednotky = bloky po 1024 bajtech, poèítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Zaøíz  Boot   Zaèátek     Konec #bloky   Id  Systém\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4664,31 +4543,31 @@ msgstr ""
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Zaøíz  Boot Zaèátek Konec   MB   #bloky    Id  Systém\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tzaèátek: (c,h,s) pøedpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tkonec: (c,h,s) pøedpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "diskový oddíl konèí na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Nebyly nalezeny ¾ádné diskové oddíly\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4699,52 +4578,52 @@ msgstr ""
 "pro C/H/S=*/%ld/%ld (místo %ld/%ld/%ld).\n"
 "Zobrazuji za pou¾ití této geometrie.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "Nebyla nalezena ¾ádná tabulka rozdìlení disku.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Zvlá¹tní - poèet definovaných diskových oddílù je pouze %d.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Varování: diskový oddíl %s má velikost 0 a není oznaèen jako prázdný.\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varování: diskový oddíl %s má velikost 0 a je startovací.\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varování: diskový oddíl %s má velikost 0 a nenulový zaèátek.\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varování: diskový oddíl %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "není obsa¾en v diskovém oddílu %s.\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varování: diskové oddíly %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "a %s se navzájem pøekrývají.\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4754,17 +4633,17 @@ msgstr ""
 "lu)\n"
 "a v pøípadì zaplnìní ji znièí\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varování: diskový oddíl %s zaèíná na sektoru 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varování: diskový oddíl %s pøesahuje za konec disku.\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4772,17 +4651,17 @@ msgstr ""
 "Pouze jeden z primárních diskových oddílù mù¾e být roz¹íøeným.\n"
 " (aèkoliv v Linux to není problém)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varování: diskový oddíl %s nezaèíná na hranici cylindru.\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varování: diskový oddíl %s nekonèí na hranici cylindru.\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4790,7 +4669,7 @@ msgstr ""
 "Varování: více ne¾ jeden primární diskový oddíl je oznaèen jako startovací.\n"
 "LILU to neèiní problémy, ale DOS MBR z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4798,7 +4677,7 @@ msgstr ""
 "Varování: obyèejnì je mo¾né startovat pouze z primárních diskových oddíl|ù.\n"
 "LILO nebude brát ohled na pøíznak 'startovací'.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4806,12 +4685,12 @@ msgstr ""
 "Varování: ¾ádný primární diskový oddíl není oznaèen jako startovací.\n"
 "LILU to neèiní problémy, ale DOS z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 #, fuzzy
 msgid "start"
 msgstr "stav"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4819,24 +4698,24 @@ msgstr ""
 "diskový oddíl %s: zaèátek: (c,h,s) pøedpoklad (%ld,%ld,%ld), nalezeno\n"
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "odeslání"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "diskový oddíl %s: konec: (c,h,s) pøedpoklad (%ld,%ld,%ld), nalezeno\n"
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "diskový oddíl %s konèí na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4845,7 +4724,7 @@ msgstr ""
 "Varování: zaèátek roz¹íøeného diskového oddílu posunut z %ld na %ld.\n"
 "(Pouze pro úèely výpisu. Nemìòte jeho obsah.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4853,134 +4732,131 @@ msgstr ""
 "Varování: roz¹íøený diskový oddíl nezaèíná na hranici cylindru.\n"
 "DOS a Linux budou jeho obsah interpretovat rozdílnì.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "pøíli¹ mnoho diskových oddílù - ignoruji > %d\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "strom diskových oddílù?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "nalezen Disk Manager - s tím neumím pracovat\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "nalezen DM6 podpis - konèím\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "zvlá¹tní..., roz¹íøený diskový oddíl o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "zvlá¹tní..., BSD diskový oddíl o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " diskový oddíl %s není znám\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "byl zadán pøepínaè -n: Nic nebylo zmìnìno\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Chyba pøi ukládání starých sektorù - konèím\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Chyba pøi zápisu na diskový oddíl %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "pøíli¹ dlouhý èi neúplný øádek - konèím\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "vstupní chyba: po polo¾ce %s jsem oèekával znak `='\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "vstupní chyba: neoèekávaný znak %c po polo¾ce %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nerozpoznaný vstup: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "èíslo je pøíli¹ veliké\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "nesmysly za èíslem\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "není místo pro popis diskového oddílu\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "okolní roz¹iøující diskový oddíl nelze vytvoøit\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "pøíli¹ mnoho vstupních polo¾ek\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Ji¾ nejsou volné bloky\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Chybný typ\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
-"Varování: zadaná velikost(%ld) pøekraèuje maximální povolenou velikost (%"
-"lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Varování: prázdný diskový oddíl\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varování: chybný zaèátek diskového oddílu (døívìj¹í %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nerozpoznaný pøíznak 'startovací' - zvolte - èi *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "neúplná c,h,s specifikace?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Roz¹íøený diskový oddíl na neoèekávaném místì\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "chybný vstup\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "pøíli¹ mnoho diskových oddílù\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -4992,100 +4868,96 @@ msgstr ""
 "<zaèátek> <velikost> <typ [E,S,L,X,hex]> <startovací [-,*]> <c,h,s> <c,h,s>\n"
 "Obvykle je tøeba zadat pouze <zaèátek> a <velikost> (a mo¾ná <typ>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "verze"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Pou¾ití: %s [pøepínaèe] zaøízení ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "zaøízení: nìco jako /dev/hda èi /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "u¾iteèné pøepínaèe:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [èi --show-size]: vypí¹e velikost diskového oddílu"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [èi --id]:        vypí¹e èi zmìní Id diskového oddílu"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [èi --list]:      ke ka¾dému zaøízení vypí¹e diskové oddíly"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [èi --dump]:      idem, ale ve formátu vhodném k dal¹ímu zpracování"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [èi --increment]: èísluje cylindry etc. od 1 místo od 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  jako jednotky pou¾ije Sektory/Bloky/Cylindry èi MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [èi --list-types]:vypí¹e známé typy diskových oddílù"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [èi --DOS]:       pro kompatibilitu s DOSEM: ubírá trochu místa"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [èi --re-read]:   donutí jádro znovu naèíst tabulku rozdìlení disku"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                zmìní pouze diskový oddíl s èíslem #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ¾ádné zmìny nebudou ulo¾eny na disk"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O SOUBOR :           ulo¾í zmìnìné sektory do SOUBORU"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I SOUBOR :            obnoví tyto sektory ze SOUBORU"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [èi --version]:   vypí¹e informace o verzi"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [èi --help]:      vypí¹e tuto nápovìdu"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "nebezpeèné pøepínaèe:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [èi --show-geometry]: vypí¹e informace o geometrii, které\n"
 "                                    udr¾uje jádro"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
@@ -5094,7 +4966,7 @@ msgstr ""
 "    -g [èi --show-geometry]: vypí¹e informace o geometrii, které\n"
 "                                    udr¾uje jádro"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5102,116 +4974,116 @@ msgstr ""
 "    -x [èi --show-extended]: vypí¹e informace o roz¹íøených diskových\n"
 "                             oddílech a na vstupu bude oèekávat jejich popis"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [èi --Linux]:      problémy nepodstatné pro Linux budou ignorovány"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [èi --quiet]:      nebude vypisovat varovné hlá¹ky"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Nalezenou geometrii mù¾ete pøepsat pomocí:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [èi --cylinders #]:nastaví poèet cylindrù"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [èi --heads #]:    nastaví poèet hlav"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [èi --sectors #]:  nastaví poèet cylindrù"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Ovìøování konzistence mù¾ete vypnout pomocí:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [èi --force]:      akceptuje ve¹keré - i nesmyslné - po¾adavky"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Pou¾ití:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s zaøízení\t\t vypí¹e aktivní diskové oddíly na daném zaøízení\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s zaøízení n1 n2 ... aktivuje diskové oddíly n1 ..., deaktivuje ostatní\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An zaøízení\t aktivuje diskové oddíly n ..., deaktivuje ostatní\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "¾ádný pøíkaz?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "celkový poèet blokù: %d\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Pou¾ití: sfdisk --print-id zaøízení èíslo diskového oddílu\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Pou¾ití: sfdisk --change-id zaøízení Id diskového oddílu\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Pou¾ití: sfdisk --id zaøízení èíslo diskového oddílu [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "mù¾ete zadat pouze jedno zaøízení (vyjímkou jsou pøepínaèe -l a -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s pro ètení nelze otevøít"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindrù, %ld hlav, %ld sektorù/stopu\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "nelze zjistit velikost %s"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "chybný aktivní bajt: 0x%x místo 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5219,7 +5091,7 @@ msgstr ""
 "Hotovo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5229,35 +5101,35 @@ msgstr ""
 "MBR\n"
 "nastartuje pouze z disku s jedním aktivním diskovým oddílem.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "diskový oddíl %s má id %x a není skrytý\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id %lx je chybné\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Tento disk je právì pou¾íván.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatální chyba: %s nelze nalézt\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varování: %s není blokovým zaøízením\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Ovìøuji, zda tento disk není právì pou¾íván ...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5270,30 +5142,30 @@ msgstr ""
 "v¹echny odkládací prostory na tomto disku. K potlaèení této kontroly mù¾ete\n"
 "pou¾ít pøepínaè --no-reread.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Pou¾ijte pøepínaè --force k potlaèení ve¹kerých kontrol.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Stará situace:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Diskový oddíl %d neexistuje. Nelze jej zmìnit.\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nová situace:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5301,21 +5173,21 @@ msgstr ""
 "Toto rozlo¾ení diskových oddílù se mi nelíbí - nic nemìním.\n"
 "(Pokud jej opravdu chcete pou¾ít, pak zadejte pøepínaè --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Toto se mi nelíbí - mìl byste odpovìdìt NO\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Vyhovuje Vám to? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Ulo¾it na disk? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5324,16 +5196,16 @@ msgstr ""
 "\n"
 "sfdisk: pøedèasný konec vstupu\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Konèím - nebyly uèinìny ¾ádné zmìny\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Odpovìzte prosím y,n èi q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5342,7 +5214,7 @@ msgstr ""
 "Nová tabulka rozdìlení disku byla úspì¹nì ulo¾ena.\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5444,133 +5316,133 @@ msgstr "getopt (roz¹íøené) 1.1.2\n"
 msgid "internal error, contact the author."
 msgstr "Vnitøní chyba, oznamte ji autorovi."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "spu¹tìn pomocí MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "hodnoty ulo¾eny v BCD tvaru\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "vstupnì/výstupní port pro pøístup k hodinám nastaven na 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "pou¾it pøepínaè --funky-toy!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: 1000 neúspì¹ných pokusù o atomické provedení %s!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port nelze otevøít: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Jeliko¾ jsem se nesna¾il, nepodaøilo se mi získat práva pro pøístup.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s: pøístup k portu nelze získat:  volání iopl(3) selhalo.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Pravdìpodobnì je tøeba mít práva superu¾ivatele.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Pøedpokládám, ¾e hodiny reálného èasu jsou nastaveny na %s èas.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "greenwichský"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "místní"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Varování: neznámý formát tøetího øádku v souboru adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Oèekáváno `UTC', `LOCAL' èi nic.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Poslední oprava posunu probìhla %ld sekund od roku 1969.\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Poslední kalibrace probìhla %ld sekund od roku 1969.\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Hodiny reálného èasu jsou nastaveny na %s èas.\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "neznámý"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "èekám na tiknutí hodin...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...hodiny tikly\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Hodiny reálného èasu obsahují chybné hodnoty: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hodiny reálného èasu: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund od roku "
 "1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Hodiny reálného èasu ukazují %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Nastavuji hodiny reálného èasu na %.2d:%.2d:%.2d = %ld sekund od roku 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Testovací re¾im - Èas nezmìnìn.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5579,7 +5451,7 @@ msgstr ""
 "Poèet sekund uplynulých od referenèního èasu: %.6f.\n"
 "Èekám, dokud neuplyne dal¹í celá sekunda.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5588,22 +5460,22 @@ msgstr ""
 "Registry hodin reálného èasu obsahují hodnoty, které jsou buï chybné (napø.\n"
 "50tý den v mìsíci), èi mimo pøípustný rozsah (napø. rok 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekundy\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Pøepínaè --date vy¾aduje argument.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, fuzzy, c-format
 msgid "--date argument too long\n"
 msgstr "název ss je pøíli¹ dlouhý"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5611,21 +5483,21 @@ msgid ""
 msgstr ""
 "Argument pøepínaèe --date není platným datem. Konkrétnì obsahuje uvozovky.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Spou¹tím pøíkaz 'date': %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "Pøíkaz 'date' nelze v shellu /bin/sh spustit. Volání popen() selhalo."
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "odpovìï pøíkazu 'date' = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5640,7 +5512,7 @@ msgstr ""
 "Odpovìï:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5657,12 +5529,12 @@ msgstr ""
 "Odpovìï:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "Datum %s odpovídá %ld sekundám od roku 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5671,36 +5543,36 @@ msgstr ""
 "Systémový èas nelze podle hodin reálného èasu nastavit, proto¾e neukazují\n"
 "platný èas.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Volám settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Testovací re¾im - systémový èas nezmìnìn.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Nastavit systémový èas mù¾e pouze superu¾ivatel.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "volání settimeofday() selhalo"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5709,7 +5581,7 @@ msgstr ""
 "Neopravuji míru posunu, proto¾e hodiny reálného èasu poslednì obsahovaly\n"
 "neplatné hodnoty.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, fuzzy, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5718,7 +5590,7 @@ msgstr ""
 "Neopravuji míru posunu, proto¾e poslední kalibrace je¹tì neuplynul celý "
 "den.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5727,7 +5599,7 @@ msgstr ""
 "Neopravuji míru posunu, proto¾e poslední kalibrace je¹tì neuplynul celý "
 "den.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5739,22 +5611,22 @@ msgstr ""
 "je nastavena na %3$f sekund/den.\n"
 "Opravuji míru posunu o %4$f sekund.\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Poèet sekund od poslední opravy: %d\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "Potøebná zmìna èasu: sekund vpøed: %d ; sekund zpìt: %.6f\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Testovací re¾im - soubor adjtime nezmìnìn.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5763,38 +5635,38 @@ msgstr ""
 "Do %s by bylo ulo¾eno následující:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Parametry opravy posunu nezmìnìny.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr "Hodiny reálného èasu obsahují neplatný èas, tudí¾ jej nelze opravit.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Potøebná oprava je men¹í ne¾ 1 sekunda, proto hodiny nenastavuji.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Pou¾ívám %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Nebylo nalezeno ¾ádné pou¾itelné rozhraní k hodinám.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Systémový èas nelze nastavit.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5808,34 +5680,39 @@ msgstr ""
 "Tento program nebyl pøelo¾en pro Alpha systém ( a tudí¾ pravdìpodobnì nyní\n"
 "nebì¾í na Alphì). Ignorováno.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Poèátek epochy nelze z jádra zjistit.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Jádro pokládá za poèátek epochy %lu.\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr "Poèátek epochy nastavíte pomocí pøepínaèù epoch a setepoch.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Testovací re¾im - poèátek epochy na %d nemìním.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Hodnotu poèátku epochy v jádøe nelze nastavit.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s na %s\n"
+
+#: hwclock/hwclock.c:1196
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5891,7 +5768,7 @@ msgstr ""
 "  --date        èas, na který budou nastaveny hodiny reálného èasu\n"
 "  --epoch=ROK   nastaví poèátek epochy pro hodiny reálného èasu na ROK\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5900,13 +5777,13 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                nastaví typ alpha systému (viz hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s akceptuje pouze pøepínaèe. Zadáno argumentù, které nejsou pøepínaèi: %d\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5915,54 +5792,54 @@ msgstr ""
 "Zadal jste vícero funkèních pøepínaèù. Program mù¾e provést maximálnì jednu\n"
 "funkci najednou.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr "%s: Pøepínaèe --utc a --localtime nelze pou¾ít zároveò.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr "%s: Pøepínaèe --utc a --localtime nelze pou¾ít zároveò.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Nebyl zadán platný èas, který mám nastavit. Hodiny nelze nastavit.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Hodiny reálného èasu mù¾e nastavit pouze superu¾ivatel.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Hodiny reálného èasu mù¾e nastavit pouze superu¾ivatel.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr "Hodnotu poèátku epochy v jádøe mù¾e nastavit pouze superu¾ivatel.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "®ádným ze známých zpùsobù nelze získat pøístup k hodinám reálného èasu.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5996,7 +5873,6 @@ msgstr "èas se pomocí volání ioctl() pro %s nepodaøilo zjistit"
 msgid "ioctl KDSHWCLK failed"
 msgstr "volání ioctl KDSHWCLK selhalo"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "/dev/tty1 ani /dev/vc/1 nelze otevøít"
@@ -6092,9 +5968,6 @@ msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 "Z %2$s byl pomocí RTC_EPOCH_READ ioctl zji¹tìn poèátek epochy (%1$ld).\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6121,7 +5994,6 @@ msgstr "volání ioctl(RTC_EPOCH_SET) pro %s selhalo"
 msgid "calling open_tty\n"
 msgstr "volám open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "volám termio_init\n"
@@ -6130,7 +6002,6 @@ msgstr "volám termio_init\n"
 msgid "writing init string\n"
 msgstr "zapisuji inicializaèní øetìzec\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "pøed autobaud\n"
@@ -6144,7 +6015,6 @@ msgstr "èekám na cr-lf\n"
 msgid "read %c\n"
 msgstr "pøeèteno %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "ètu pøihla¹ovací jméno\n"
@@ -6198,7 +6068,6 @@ msgstr "/dev: volání chdir() selhalo: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s není znakovým zaøízením"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6213,12 +6082,10 @@ msgstr "/dev/%s nelze otevøít jako standardní vstup: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: není otevøeno pro ètení/zápis"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "volám dup\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6261,30 +6128,25 @@ msgstr ""
 "èi\t[-hiLmw] [-l login_program] [-t èasový limit] [-I inicializaèní øetìzec] "
 "[-H poèítaè] linka baud_rate,... [typ terminálu]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: nedostatek pamìti, pøihlá¹ení se nemusí zdaøit\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "pamì» pro ttyclass nelze alokovat"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "pamì» pro grplist nelze alokovat"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Pøihlá¹ení z %2$s na tty %1$s implicitnì odmítnuto.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Pøihlá¹ení z $2%s na $1%s odmítnuto.\n"
@@ -6329,8 +6191,8 @@ msgstr "Mìním finger informace o u¾ivateli %s.\n"
 msgid "Password error."
 msgstr "Chybné heslo."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Heslo: "
@@ -6506,34 +6368,6 @@ msgstr "Pou¾ijte %s -l pro vypsání seznamu\n"
 msgid "No known shells.\n"
 msgstr "Není znám ¾ádný shell.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "/dev/urandom nelze otevøít"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "náhodná data z /dev/urandom nelze èíst"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "%s pro ètení nelze otevøít"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "volání stat(%s) selhalo"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s má chybná pøístupová práva"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "data z %s nelze èíst"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6545,11 +6379,11 @@ msgstr ""
 "Pou¾ití: last [-#] [-f soubor] [-t tty] [-h název poèítaèe]\n"
 "                [u¾ivatel ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  stále pøihlá¹en"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6558,15 +6392,15 @@ msgstr ""
 "\n"
 "wtmp zaèíná %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: volání malloc selhalo.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6575,51 +6409,45 @@ msgstr ""
 "\n"
 "pøeru¹en %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: %s nelze otevøít: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: pøepínaè -h mù¾e pou¾ít pouze superu¾ivatel\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Pou¾ití: login [fp] [u¾ivatelské jméno]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: chyba PAM, konèím: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM nelze inicializovat: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Pøihla¹ovací jméno:"
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "%1$d. CHYBNÉ PØIHLÁ©ENÍ U®IVATELE %3$s Z %2$s, %4$s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6628,17 +6456,17 @@ msgstr ""
 "Chybné pøihlá¹ení\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "PØÍLI© MNOHO (%1$d) POKUSÙ U®IVATELE %3$s O PØIHLÁ©ENÍ Z %2$s, %4$s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "NEÚSPÌ©NÉ PØIHLÁ©ENÍ U®IVATELE %2$s Z %1$s, %3$s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6647,142 +6475,127 @@ msgstr ""
 "\n"
 "Chybné pøihlá¹ení\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, fuzzy, c-format
 msgid "login: Out of memory\n"
 msgstr "%s: Nedostatek pamìti!\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Chybné u¾ivatelské jméno"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "pøihlá¹ení u¾ivatele %s na tomto terminálu odmítnuto\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %s Z %s NA TTY %s ODMÍTNUTO"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %s NA TTY %s ODMÍTNUTO"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Chybné pøihlá¹ení\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Ji¾ je pøihlá¹eno pøíli¹ mnoho u¾ivatelù.\n"
-"Zkuste to opìt pozdìji.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Máte spu¹tìno pøíli¹ mnoho procesù.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "PØÍSTUP U®IVATELE %2$s VYTÁÈENOU LINKOU NA TTY %1$s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE ROOT Z %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE ROOT NA TTY %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %2$s Z %3$s NA TTY %1$s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, fuzzy, c-format
 msgid "You have new mail.\n"
 msgstr "Máte %spo¹tu.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, fuzzy, c-format
 msgid "You have mail.\n"
 msgstr "Máte %spo¹tu.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: volání fork selhalo: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "volání setuid() selhalo"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Adresáø %s neexistuje!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Pøihla¹uji s domácím adresáøem nastaveným na \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: nedostatek pamìti pro skript shellu.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skript shellu %s nelze spustit.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ¾ádný shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6791,65 +6604,65 @@ msgstr ""
 "\n"
 "Pøihla¹ovací jméno na %s: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "pøihla¹ovací jméno je pøíli¹ dlouhé.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "JMÉNO je pøíli¹ dlouhé"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "pøihla¹ovací jméno nesmí zaèínat '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "pøíli¹ mnoho znakù LF\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "PØÍLI© mnoho znakù LF"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Vypr¹el èasový limit (%d sekund) pro pøihlá¹ení.\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Poslední pøihlá¹ení: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "%.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "CHYBNÉ PØIHLÁ©ENÍ U®IVATELE %2$s Z %1$s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "CHYBNÉ PØIHLÁ©ENÍ U®IVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "POÈET CHYBNÝCH PØIHLÁ©ENÍ U®IVATELE %3$s Z %2$s: %1$d"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "POÈET CHYBNÝCH PØIHLÁ©ENÍ U®IVATELE %3$s NA TTY %2$s: %1$d"
@@ -6869,164 +6682,30 @@ msgstr "pøíjem zpráv je vypnut\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Pou¾ití: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Kdo jste?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: ®ádná taková skupina neexistuje."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Pøístup odmítnut"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "®ádný shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Heslo musí obsahovat alespoò 6 znakù, zkuste to znovu.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Nemù¾ete opìt pou¾ít staré heslo.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"Nepou¾ívejte, jako heslo Va¹e u¾ivatelské jméno ani nic nìco podobného.\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Nepou¾ívejte, jako heslo Va¹e skuteèné jméno ani nic nìco podobného.\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Pou¾ití: password [u¾ivatelské jméno [heslo]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Pouze superu¾ivatel mù¾e pou¾ít argumenty.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Pou¾ití: passwd [foqsvV] [u¾ivatel [heslo]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "%s nelze spustit: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Pøihla¹ovací jméno nelze nalézt"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Pouze superu¾ivatel mù¾e zmìnit hesla jiným u¾ivatelùm.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Pøíli¹ mnoho argumentù.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "U¾ivatelské jméno nelze nalézt. Je `%s' opravdu u¾ivatelem?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Lituji, ale mohu zmìnit pouze místní hesla. Pou¾ijte yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID a u¾ivatelské jméno se neshodují!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Mìním heslo u¾ivatele %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Zadejte staré heslo: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Nepovolené heslo."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Zadejte nové heslo: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Heslo nebylo zmìnìno."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Potvrïte nové heslo: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Pøepsal jste se. Heslo nebylo zmìnìno."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "heslo bylo zmìnìno, u¾ivatel %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "HESLO U®IVATELE ROOT BYLO ZMÌNÌNO"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "heslo zmìnìno u¾ivatelem root, u¾ivatel %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "Volám setpwnam pro nastavení hesla.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Heslo *NEBYLO* zmìnìno. Zkuste to pozdìji.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Heslo bylo zmìnìno.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7073,7 +6752,6 @@ msgstr "%s u¾ivatelem %s: %s"
 msgid "halted by %s: %s"
 msgstr "%s u¾ivatelem %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7110,7 +6788,6 @@ msgstr "Spou¹tím program \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Chyba pøi spu¹tìní\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7203,7 +6880,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr "chyba pøi bìhu závìreèného programu\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "volání fork pro závìreèný program selhalo\n"
@@ -7232,7 +6908,7 @@ msgstr "adresáø nelze otevøít\n"
 msgid "fork failed\n"
 msgstr "volání fork selhalo\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "volání exec selhalo\n"
 
@@ -7381,12 +7057,6 @@ msgstr "chybná hodnota pro mìsíc: pou¾ijte 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "chybná hodnota pro rok: pou¾ijte 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7397,13 +7067,12 @@ msgstr ""
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "Pou¾ití: cal [mjyV] [[mìsíc] rok]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Pou¾ití: %s [+formát] [den mìsíc rok]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Den svatého Tiba"
 
@@ -7536,7 +7205,7 @@ msgstr "%s: %s nelze pøejmenovat na %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Pou¾ití: %s z na soubory...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7547,22 +7216,22 @@ msgstr ""
 "Pokud jej opravdu chcete pou¾ít, tak zadejte `%s [pøepínaèe] %s'.\n"
 "Script nebyl spu¹tìn.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, fuzzy, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Pou¾ití: script [-a] [-f] [-q] [soubor]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script spu¹tìn. Soubor je %s.\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script spu¹tìn %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7571,254 +7240,253 @@ msgstr ""
 "\n"
 "Script ukonèen %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script utils. Soubor je %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "volání openpty selhalo\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Nejsou ¾ádná dal¹í volná pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Chybný pøepínaè, pou¾ití\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term název terminálu]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ atribut ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file soubor pro ulo¾ení ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekvence ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "¹etøící re¾im nelze vypnout/zapnout\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "chyba klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Chyba pøi ètení %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Chyba pøi ukládání obrazu obrazovky\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "nelze èíst %s a nelze provést dump pomocí volání ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: promìnná TERM není nastavena.\n"
@@ -7893,10 +7561,6 @@ msgstr "varování: %s nelze otevøít: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s nelze otevøít - pou¾ívám %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8196,81 +7860,72 @@ msgstr "mount: %s nelze pro nastavení rychlosti otevøít"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: rychlost nelze nastavit: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: volání fork selhalo: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: tato verze byla pøelo¾ena bez podpory pro typ `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: chyba s nfs mount verze 4, zkou¹ím verzi 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: typ systému souborù nebyl zadán a ani jej nelze zjistit"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: musíte zadat typ systému souborù"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: pøipojení se nezdaøilo"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: pøípojný bod %s není adresáøem"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: pøístup odmítnut"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount mù¾e pou¾ívat pouze superu¾ivatel"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je ji¾ pøipojeno"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc je ji¾ pøipojeno"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s je ji¾ pøipojeno, èi je %s ji¾ pou¾íváno"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: pøípojný bod %s neexistuje"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: pøípojný bod %s je symbolickým odkazem, jen¾ nikam neukazuje"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speciální zaøízení %s neexistuje"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8279,12 +7934,12 @@ msgstr ""
 "mount: speciální zaøízení %s neexistuje\n"
 "              (název cesty nezaèíná adresáøem)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s je¹tì není pøipojeno èi chybný pøepínaè"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8293,70 +7948,69 @@ msgstr ""
 "mount: chybný typ ss, chybný pøepínaè, chybný superblok na %s\n"
 "       nebo pøíli¹ mnoho pøipojených systémù souborù"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "tabulka pøipojení je plná"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok nelze pøeèíst"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: blokové zaøízení %s je neznámé"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   vypsat známé typy systémù souborù"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: pravdìpodobnì jste myslel %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: mo¾ná jste myslel iso9660 ?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: mo¾ná jste myslel iso9660 ?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr "mount: %s má chybné èíslo zaøízení, èi ss typ %s není podporován"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s není blokovým zaøízením a volání stat selhalo?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8364,71 +8018,66 @@ msgid ""
 msgstr ""
 "mount: jádro nerozpoznalo %s jako blokové zaøízení (mo¾ná `insmod ovladaè'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s není blokovým zaøízením (mo¾ná pomù¾e `-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s není blokovým zaøízením"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s není platným blokovým zaøízením"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blokové zaøízení"
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "umount: %s%s nelze pøipojit v re¾imu pouze pro ètení"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s je chránìno proti zápisu, pøipojuji pouze pro ètení"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s je chránìno proti zápisu, pøipojuji pouze pro ètení"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: nebyl zadán typ - budu pou¾ívat nfs kvùli dvojteèce\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr "mount: nebyl zadán typ - budu pou¾ívat smbfs kvùli dvojteèce\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: pracuji na pozadí \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: konèím \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je ji¾ pøipojeno na %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8477,34 +8126,34 @@ msgstr ""
 "Dal¹í pøepínaèe: [-nfFrsvw] [-o volby].\n"
 "Dal¹í informace viz man(8).\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: toto mù¾e provést pouze superu¾ivatel"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nebylo nalezeno - vytváøím jej..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: ¾ádný odpovídající diskový oddíl nebyl nalezen"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: pøipojuji %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "nebyl pøipojen ¾ádný diskový oddíl"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s nelze v %s nalézt"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s nelze nalézt v %s ani %s"
@@ -8539,98 +8188,98 @@ msgstr "       Vyzkou¹ím typ %s\n"
 msgid "Trying %s\n"
 msgstr "Pou¾ívám %s.\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: pøíli¹ dlouhý argument pro poèítaè:adresáø\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: varování: vícenásobné názvy poèítaèù nejsou podporovány\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: adresáø pro pøipojení není ve tvaru poèítaè:adresáø\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount:  adresu %s nelze zjistit\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ¹patné hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: pøíli¹ dlouhý argument pro volbu\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Varování: neznámá volba pro proto=.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Varování: volba namlen není podporována.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "parametr %s=%d pro pøipojení nfs není znám\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Varování: volba nolock není podporována.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "volba %s%s pro pøipojení nfs je neznámá\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ¹patné hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS pøes TCP není podporováno.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs soket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "tato slu¾ba je na tomto nfs serveru nedostupná"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "pro nalezení NFS portu jsem pou¾il portmapper\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "pou¾ívám port %d pro nfs server\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "návratová hodnota nfs status %d je neznámá"
@@ -8639,7 +8288,7 @@ msgstr "návratová hodnota nfs status %d je neznámá"
 msgid "bug in xstrndup call"
 msgstr "chyba ve volání xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8652,7 +8301,7 @@ msgstr ""
 "         %s [-v] [-p priorita] zvlá¹tní soubor ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8664,141 +8313,139 @@ msgstr ""
 "         %s [-v] [-p priorita] zvlá¹tní soubor ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: \"_stext\" nelze v %s nalézt\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: volání stat pro %s selhalo: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: varování: pøístupová práva pro %s (%04o) nejsou bezpeèná, pou¾ijte %"
 "04o\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: soubor %s vynechávám - zdá se, ¾e v nìm jsou díry.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s nelze otevøít: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount byl pøelo¾en bez podpory pro -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: volání fork selhalo: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "poèítaè: %s, adresáø: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: adresu %s nelze zjistit\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: chybná hodnota hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: blokové zaøízení %s je chybné"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s není pøipojeno"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: superblok nelze na %s zapsat"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: zaøízení %s je ji¾ pou¾íváno"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nelze najít"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: musíte být superu¾ivatelem, abyste mohl odpojit %s"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: bloková zaøízení nejsou na systému souborù povolena"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nenalezl jsem umount2, zkou¹ím umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s nelze odpojit - zkou¹ím %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s je ji¾ pou¾íváno - znovu pøipojeno v re¾imu pro pouze ètení\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s nelze znovu pøipojit v re¾imu pouze pro ètení\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s odpojeno\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznam systémù souborù na odpojení nelze nalézt"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, fuzzy, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8809,48 +8456,47 @@ msgstr ""
 "         umount -a [-f] [-r] [-n] [-v] [-t typy vfs]\n"
 "         umount [-f] [-r] [-n] [-v] speciální soubor | uzel...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "%s nelze otevøít.\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Zkou¹ím odpojit %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s nelze v mtab najít\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: podle mtab není %s pøipojeno"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: zdá se, ¾e %s je pøipojeno více ne¾ jednou"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s není ve fstab (a Vy nejste root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: pøipojení %s neodpovídá fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "unmount: pouze u¾ivatel %s mù¾e odpojit %s ze %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: toto mù¾e provést pouze u¾ivatel root"
 
@@ -9006,7 +8652,7 @@ msgstr "%s: neznámý signál %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9175,8 +8821,6 @@ msgstr "jádro nepodporuje sdílenou pamì»\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Omezení pro sdílenou pamì» --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
@@ -9953,17 +9597,17 @@ msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_soubor] [-n délka] [-s vzdálenost] "
 "[soubor ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "Pou¾ití: %s [-dflpcsu] [+èíslo øádku | +/vzorek] název1 název2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: neznámý signál %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9974,8 +9618,7 @@ msgstr ""
 "*** %s je adresáø ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9986,47 +9629,47 @@ msgstr ""
 "***** %s není textovým souborem *****\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Stisknìte q èi Q pro ukonèení]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Pokraèování--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Dal¹í soubor: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Stisknìte mezerník pro pokraèování, 'q' pro ukonèení.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, fuzzy, c-format
 msgid "...back %d pages"
 msgstr "...pøeskakuji zpìt o poèet stran: %d"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 #, fuzzy
 msgid "...back 1 page"
 msgstr "...pøeskakuji zpìt o poèet stran: %d"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 #, fuzzy
 msgid "...skipping one line"
 msgstr "...pøeskakuji o poèet øádkù: %d"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "...pøeskakuji o poèet øádkù: %d"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10035,7 +9678,7 @@ msgstr ""
 "\n"
 "***Zpìt***\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10048,7 +9691,7 @@ msgstr ""
 "jsou v hranatých závorkách. Hvìzdièka (*) znamená, ¾e hodnota argumentu se\n"
 "stane implicitní.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 #, fuzzy
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
@@ -10094,34 +9737,34 @@ msgstr ""
 ":f\t\t\tVypí¹e jméno aktuálního souboru a èíslo aktuálního øádku\n"
 ".\t\t\tZopakuje pøedcházející pøíkaz\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Stisknìte 'h' pro nápovìdu.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" øádek %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Nejedná se o soubor] øádek %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Pøeteèení\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...vynechávám\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Chyba v regulárním výrazu"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10129,15 +9772,15 @@ msgstr ""
 "\n"
 "Vzorek nebyl nalezen\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Vzorek nebyl nalezen"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "volání fork selhalo\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10145,21 +9788,21 @@ msgstr ""
 "\n"
 "...Vynechávám "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 #, fuzzy
 msgid "...Skipping to file "
 msgstr "...Pøecházím "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 #, fuzzy
 msgid "...Skipping back to file "
 msgstr "zpìt na soubor "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Øádek je pøíli¹ dlouhý"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Neexistuje ¾ádný pøíkaz, jen¾ by bylo mo¾no nahradit"
 
@@ -10212,98 +9855,95 @@ msgstr "hexdump: chybný formát {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: chybný znak v konverzi %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "pøepínaè `%s' vy¾aduje argument\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "Chybná klávesa"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...vynechávám\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...vynechávám\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 #, fuzzy
 msgid "No next file"
 msgstr "(Dal¹í soubor: %s)"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 #, fuzzy
 msgid "No previous file"
 msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: chyba zápisu na %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: chyba zápisu na %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: doèasný soubor nelze èíst.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 #, fuzzy
 msgid "RE error: "
 msgstr ", chyba"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 #, fuzzy
 msgid "Cannot open "
 msgstr "%s nelze otevøít.\n"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 #, fuzzy
 msgid "saved"
 msgstr "odeslání"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "Heslo *NEBYLO* zmìnìno. Zkuste to pozdìji.\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 #, fuzzy
 msgid "(Next file: "
 msgstr "(Dal¹í soubor: %s)"
@@ -10358,6 +9998,152 @@ msgstr "Vstupní øádka je pøíli¹ dlouhá.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Nedostatek pamìti pro rostoucí buffer.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Chybné èíslo: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaktická chyba: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Chybný argument: '%s'\n"
+
+#, fuzzy
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "Pou¾ití: %s [ -p ] název zaøízení\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "         %s [ -p ] zaøízení velikost sekt hlavy stopy stretch gap "
+#~ "rychlost\n"
+#~ "         spec1 fmt_gap\n"
+
+#, fuzzy
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "         %s [ -c | -y | -n | -d ] zaøízení\n"
+
+#, fuzzy
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "         %s [ -c | -y | -n ] zaøízení\n"
+
+#~ msgid "version"
+#~ msgstr "verze"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "/dev/urandom nelze otevøít"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "náhodná data z /dev/urandom nelze èíst"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "%s pro ètení nelze otevøít"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "volání stat(%s) selhalo"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s má chybná pøístupová práva"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "data z %s nelze èíst"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Ji¾ je pøihlá¹eno pøíli¹ mnoho u¾ivatelù.\n"
+#~ "Zkuste to opìt pozdìji.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Máte spu¹tìno pøíli¹ mnoho procesù.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Heslo musí obsahovat alespoò 6 znakù, zkuste to znovu.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Nemù¾ete opìt pou¾ít staré heslo.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "Nepou¾ívejte, jako heslo Va¹e u¾ivatelské jméno ani nic nìco podobného.\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "Nepou¾ívejte, jako heslo Va¹e skuteèné jméno ani nic nìco podobného.\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Pou¾ití: password [u¾ivatelské jméno [heslo]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Pouze superu¾ivatel mù¾e pou¾ít argumenty.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Pou¾ití: passwd [foqsvV] [u¾ivatel [heslo]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "%s nelze spustit: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Pøihla¹ovací jméno nelze nalézt"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Pouze superu¾ivatel mù¾e zmìnit hesla jiným u¾ivatelùm.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Pøíli¹ mnoho argumentù.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "U¾ivatelské jméno nelze nalézt. Je `%s' opravdu u¾ivatelem?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr "Lituji, ale mohu zmìnit pouze místní hesla. Pou¾ijte yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID a u¾ivatelské jméno se neshodují!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Mìním heslo u¾ivatele %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Zadejte staré heslo: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Nepovolené heslo."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Zadejte nové heslo: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Heslo nebylo zmìnìno."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Potvrïte nové heslo: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Pøepsal jste se. Heslo nebylo zmìnìno."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "heslo bylo zmìnìno, u¾ivatel %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "HESLO U®IVATELE ROOT BYLO ZMÌNÌNO"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "heslo zmìnìno u¾ivatelem root, u¾ivatel %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "Volám setpwnam pro nastavení hesla.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Heslo *NEBYLO* zmìnìno. Zkuste to pozdìji.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Heslo bylo zmìnìno.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: tato verze byla pøelo¾ena bez podpory pro typ `nfs'"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Varování: ma¾u diskový oddíl za %d\n"
diff --git a/po/da.gmo b/po/da.gmo
new file mode 100644
index 000000000..ffa5756ad
--- /dev/null
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index fc3d47963..4c6a74cc4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2004-12-04 01:16+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -120,7 +120,7 @@ msgstr "%s: ioctl-fejl på %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SST   BST   StartSekt    Størr.  Enhed\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "brug:\n"
@@ -164,13 +164,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "brug: %s [ -n ] enhed\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s fra %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -195,7 +194,7 @@ msgstr "Dobbelt"
 msgid "Single"
 msgstr "Enkelt"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -210,98 +209,98 @@ msgstr ""
 " -v         vis flere meddelelser\n"
 " file       fil der skal tjekkes\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: fejl %d under udpakning! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: størrelsesfejl i symbolsk lænke '%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  udpakker blok fra %ld til %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: ugyldig tilstand på '%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  hul ved %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Ikke-blok (%ld) byte\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Ikke-størrelse (%ld mod %ld) byte\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: ugyldigt cramfs--forkert stilængde\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: ikke oversat med understøttelse for -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: advarsel--kunne ikke bestemme filsystemets størrelse \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s er hverken en blokenhed eller fil\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: ugyldigt cramfs--fillængde for kort\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: ugyldigt cramfs--forkert magisk nummer\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: advarsel--fillængde for lang, er det et efterfyldt aftryk?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ugyldigt cramfs--crc-fejl\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: advarsel--gammelt cramfs-aftryk, ingen CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: ugyldigt cramfs--ugyldig superblok\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: ugyldigt cramfs--mappedata-afslutning (%ld) != fildatabegyndelse (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ugyldigt cramfs--ugyldig fildataforskydning\n"
@@ -777,7 +776,7 @@ msgstr "for mange inodes - øvre grænse er 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "ikke plads nok, kræver mindst %lu blokke"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhed: %s\n"
@@ -846,18 +845,18 @@ msgstr "fejl under skrivning af '..'-indgang"
 msgid "error closing %s"
 msgstr "Fejl under lukning af %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Brug: mkfs [-V] [-t fstype] [fs-tilvalg] enhed [størrelse]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Hukommelse opbrugt!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
@@ -917,7 +916,6 @@ msgstr ""
 "Overskrider MAXENTRIES.  Forøg denne værdi i mkcramfs.c og genoversæt  "
 "Afslutter.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -973,10 +971,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "skrivning af ROM-aftryk mislykkedes (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1054,7 +1048,6 @@ msgstr "kunne ikke skrive inodes"
 msgid "write failed in write_block"
 msgstr "mislykket skrivning i write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1090,7 +1083,7 @@ msgstr "søgning fejlede under test af blokke"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Mystiske værdier i do_check: sandsynligvis programfejl\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "søgning mislykkedes i check_blocks"
 
@@ -1132,106 +1125,106 @@ msgstr "kunne ikke finde %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "vil ikke forsøge at oprette filsystem på '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Ugyldig sidestørrelse '%d' angivet af bruger\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Benytter bruger-bestemt sidestørrelse %d i stedet for systemværdierne %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Antager sider med størrelsen %d (ikke %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "mærke"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Brug: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/navn [blokke]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "for mange ugyldige sider"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Hukommelse opbrugt"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "en ugyldig side\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu ugyldige sider\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fejl: Ingen steder at opsætte swap?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fejl: størrelsen %lu er større end enhedsstørrelsen %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fejl: ukendt version %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fejl: swap-område skal mindst være på %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: fejl: afkorter swap-området til %ldkB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: fejl: Ingen steder at opsætte swap?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Vil ikke forsøge at oprette swap-enhed på '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fatalt: første side kan ikke læses"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1244,120 +1237,84 @@ msgstr ""
 "opretter en v0 swap. Ingen swap oprettet. Hvis du virkelig vil oprette en\n"
 "v0 swap på denne enhed, kan du gennemtvinge det med tilvalget -f.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kunne ikke klargøre swap-område: ulæseligt"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Klargører swap-område version %d, størrelse = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "kunne ikke spole tilbage på swap-enheden"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "kunne ikke skrive signatur-side"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync mislykkedes"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Ugyldigt tal: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaksfejl: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Ingen sådan parameter sat: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] enh navn\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr "   %s [ -p ] enh str sekt hoveder spor stræk gab rate spec1 fmt_gab\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] enh\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] enh\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Ubrugelig"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Frit område"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disken er blevet udskiftet.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Genstart systemet for at sikre, at partitionstabellen er opdateret korrekt.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1370,327 +1327,308 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "ændret DOS 6.x partitioner.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "FATAL FEJL"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Tryk en tast for at afslutte cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Kan ikke søge på drev"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Kan ikke læse drev"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Kan ikke skrive på drev"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "For mange partitioner"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Partition starter før sektor 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Partition slutter før sektor 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Partition starter efter slut-på-disk"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Partition slutter efter slut-på-disk"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitionen slutter i den sidste partialcylinder"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logiske partitioner ikke i disk-rækkefølge"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logisk partitions-overlap"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "forstørret logisk partitions-overlap"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Intern fejl under oprettelse af logisk drev uden udvidet partition !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kan ikke oprette logisk drev her -- ville resultere i to udvidede partitioner"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menupunkt for langt. Menu ser muligvis mærkeligt ud."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu uden retning. Vælger standarden horisontal."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Ugyldig tast"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Tryk en tast for at fortsætte"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primær"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Opret en ny primær partition"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Opret en ny logisk partition"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Opret ikke partition"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Intern fejl !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Størrelse (i MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Begyndelse"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Tilføj partition i starten af det frie område"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Slut"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Tilføj partition i slutningen af det frie område"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Ikke plads til at oprette udvidet partition"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Ingen partitionstabel.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Ingen partitionstabel. Starter med nulstillet tabel."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Ugyldig signatur i partitionstabel"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Ukendt partitionstabel-type"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Vil du starte med nulstillet tabel [j/N] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav flere cylindre end der kan være på disken"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Kan ikke åbne drev"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Åbnede drev skrivebeskyttet - du har ikke adgang til at skrive"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Kan ikke få diskstørrelsen"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Ugyldig primærpartition"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Ugyldig logisk partition"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Advarsel!! Dette ødelægger muligvis data på din disk!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Er du sikke på, at du vil skrive partitionstabellen til disken? (ja eller "
 "nej): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Skrev ikke partitionstabellen til disken"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Skriv venligst 'ja' eller 'nej'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabel til disken..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabel til disken"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Skrev partitionstabel, men genindlæsning mislykkedes. Genstart for at "
 "opdatere tabellen."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ingen primærpartitioner er markeret opstartbar. DOS MBR vil ikke kunne "
 "starte op."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Da flere primærpartitioner er opstartbare, vil DOS MBR ikke kunne starte op."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Angiv filnavn eller tryk RETUR for at vise på skærmen: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan ikke åbne filen '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Drev: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Ingen  "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primær"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logisk "
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Opstart"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Ingen"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabel for %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Første      Sidst\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1698,7 +1636,7 @@ msgstr ""
 " # Type       Sektor      Sektor   forskydn. Længde   Filsystem  Type (ID) "
 "Flag\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1706,465 +1644,462 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Starter---       ----Ender----     Start     Antal\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flag  Hovd Sekt Cyl   ID  Hovd Sekt Cyl     Sektor    Sektorer\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Rå"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Vis tabellen i råtdata format"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Vis tabellen ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Vis kun partitionstabellen"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Vis ikke tabellen"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Hjælpeskærm for cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dette er cfdisk, et curses-baseret diskpartitionerings-program, som"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "lader dig oprette, slette eller modificere partitioner på din"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "harddisk."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Kommando     Betydning"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Slet partitionen"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Ret cylinder, hoved, sektorer-per-spor parametre"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ADVARSEL: Denne kommando bør kun bruges af folk, der"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             er klar over, hvad de gør."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Vis denne skærm"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimér partitionens diskforbrug"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Bemærk: Dette kan gøre partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Opret ny partition i frit område"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Udlæs partitionstabellen til skærmen eller en fil"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Der er flere forskellige formater på partitionen,"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             som du kan vælge mellem:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Rådata (nøjagtig de, som ville skrives på disken)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel i rådata format"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Afslut program uden at skrive partitionstabellen"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Skift filsystem type"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Skift enhed for visning af partitionsstørrelser"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Skifter mellem MB, sektorer og cylindre"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Skriv partitionstabellen til disk (skal være stort W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Siden dette kan ødelægge data på disken, skal du enten"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             bekræfte eller afvise ved at skrive henholdsvis 'ja'"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             eller 'nej'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pil op       Flyt markøren til forrige partition"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pil ned      Flyt markøren til næste partition"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Gentegner skærmen"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Vis denne skærm"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Bemærk: Alle kommandoerne kan angives med enten store eller små"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "bogstaver (undtagen W)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylindre"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Skift cylindergeometri"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Hoveder"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Skift hovedgeometri"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Skift sektorgeometri"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Færdig"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Færdig med geometriændring"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Angiv antallet af cylindre: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Ugyldigt cylinderantal"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Angiv antallet af hoveder: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Ugyldig hovedantal"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Angiv antallet af sektorer per spor: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Ugyldig sektorantal"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Angiv filsystemtype: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Kan ikke ændre filsystemtype til tom"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Kan ikke ændre filsystemtype til udvidet"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ukt(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Ukendt (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Drev: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Størrelse: %lld byte, %lld Mb"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Størrelse: %lld byte, %lld.%lld Gb"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Hoveder: %d   Sektorer per spor: %d   Cylindre: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Navn"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part-type"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Fs-type"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Mærkat]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Sektorer"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cylindre"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Størrelse (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Størrelse (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Opstartbar"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Slet"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Slet partitionen"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Skift diskgeometri (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Hjælp"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Vis hjælpeskærm"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maksimér"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimér diskforbruget for partitionen (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Opret ny partition i frit område"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Udlæs"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Udlæs partitionstabellen til skærmen eller til en fil"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Afslut"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Afslut program uden at ændre partitionstabellen"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Skift filsystemtype (DOS, Linux, OS/2 osv.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Enheder"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Skift enheder for visning af partitionstabellen (MB, sekt, cyl)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen til disk (dette kan ødelægge data)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Kan ikke gøre denne partition opstartbar"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Kan ikke slette en tom partition"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Kan ikke maksimere denne partition"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Denne partition er ubrugelig"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Denne partition er allerede i brug"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan ikke ændre en tom partitions type"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Ikke flere partitioner"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Ugyldig kommando"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2235,9 +2170,9 @@ msgstr ""
 "\n"
 "BSD-mærkat for enhed: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Kommando beskrivelse"
 
@@ -2257,10 +2192,9 @@ msgstr "   i    installer opstarts-igangsætter ('bootstrap')"
 msgid "   l   list known filesystem types"
 msgstr "   l    vis liste over filsystemtyper"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m    vis denne menu"
 
@@ -2272,14 +2206,14 @@ msgstr "   n    tilføj en ny BSD-partition"
 msgid "   p   print BSD partition table"
 msgstr "   p    vis BSD-partitionstabel"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q    afslut uden at gemme ændringerne"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r    returnér til hovedmenuen"
 
@@ -2322,13 +2256,13 @@ msgstr "Der er ingen *BSD-partitioner på %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD-diskmærkat kommando (m for hjælp): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Første %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sidste %s eller +størrelse eller +størrelseM eller +størrelseK"
@@ -2373,8 +2307,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " fjlsekt"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2475,8 +2407,8 @@ msgstr "sektorer/spor"
 msgid "tracks/cylinder"
 msgstr "spor/cylinder"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cylindre"
 
@@ -2533,7 +2465,7 @@ msgstr "Opstarts-igangsætter installeret på %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Det maksimale antal partitioner er blevet oprettet\n"
@@ -2557,7 +2489,7 @@ msgstr ""
 "\n"
 "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2577,7 +2509,7 @@ msgstr ""
 "-u: angiv start og slut som sektornumre (i stedet for cylindernumre)\n"
 "-b 2048: (for visse MO-drev) brug sektorer på 2048 byte\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2593,198 +2525,184 @@ msgstr ""
 " eller: fdisk /dev/rd/c0d0  eller: fdisk /dev/ida/c0d0  (for RAID-enheder)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kunne ikke åbne %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kunne ikke læse %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kunne ikke søge til %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kunne ikke skrive %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl mislykkedes på %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Kunne ikke allokere mere hukommelse\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fatal fejl\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a    skift et skrivebeskyttelses-flag"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b    skift bsd-diskmærkat"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c    skift montérbart-flag"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d    slet en partition"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l    vis liste over kendte partitionstyper"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n    tilføj en ny partition"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o    opret en ny, tom DOS-partitionstabel"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p    vis partitionstabellen"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s    opret en ny, tom Sun-diskmærkat"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t    skift system-id for en partition"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u    skift enheder for visning/indtastning"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v    verificér partitionstabellen"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w    skriv partitionstabel til disk og afslut"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x    ekstra funktionalitet (kun for eksperter)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a    vælg en opstartbar partition"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b    redigér indgang i opstartsfil"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c    vælg sgi swap-partition"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a    skift opstartbar-flaget"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c    skift DOS-kompatilitets-flaget"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a    ændr antallet af alternative cylindre"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c    ændr antallet af cylindre"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d    vis rådataene fra partitionstabellen"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e    ændr antallet af ekstra sektorer per cylinder"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h    ændr antallet af hoveder"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   ændr interleavefaktor"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o    ændr rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s    ændr antallet af sektorer/spor"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ændr antallet af fysiske cylindre"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b    flyt starten på data i en partition"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e    vis udvidede partitioner"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g    opret en IRIX (SGI) partitionstabel"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f    ordn partitionsrækkefølgen"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Du skal angive"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "hoveder"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2793,11 +2711,11 @@ msgstr ""
 "%s%s.\n"
 "Dette kan du gøre fra menuen 'Ekstra funktioner'.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " og "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2816,29 +2734,29 @@ msgstr ""
 "2) opstarts- og partitioneringsprogrammer fra andre OS'er\n"
 "   (Bl.a. DOS FDISK og OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ugyldig forskydning i primær udvidet partition\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Advarsel: ekstra lænkepeger (link pointer) i partitionstabel %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Advarsel: ignorerer ekstra data i partitionstabel %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2851,17 +2769,17 @@ msgstr ""
 "indhold naturligvis ikke genskabes\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Bemærk: sektorstørrelsen er %d (ikke %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Du vil ikke kunne gemme partitionstabellen.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2870,7 +2788,7 @@ msgstr ""
 "Denne disk har både magiske numre for DOS \n"
 "BSD. Brug 'b'-kommandoen for at gå i BSD-tilstand.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2879,17 +2797,17 @@ msgstr ""
 "Enheden indeholder hverken en gyldig DOS-partitionstabel eller et Sun-, SGI- "
 "eller OSF-diskmærkat.\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Intern fejl\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerer ekstra udvidet partition %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2898,7 +2816,7 @@ msgstr ""
 "Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med "
 "'w' (skriv)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2907,83 +2825,83 @@ msgstr ""
 "\n"
 "fik filslut (EOF) tre gange - afslutter..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Hex-kode (tryk L for en liste over koderne): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standard %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Bruger standardværdi %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Værdi udenfor området.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Advarsel: partition %d er af typen 'tom'\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d er valgt\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partitioner defineret!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primære partitioner er allerede definerede!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Skifter enheder for visning/indtastning til %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ADVARSEL: Partition %d er en udvidet partition\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-kompatilitetsflag er sat\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatilitetsflag er ikke sat\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d eksisterer ikke endnu!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2996,7 +2914,7 @@ msgstr ""
 "er nok uklogt. Du kan slette en partition med\n"
 "'d'-kommandoen.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3005,7 +2923,7 @@ msgstr ""
 "Du kan ikke ændre en partition mellem at være udvidet eller ikke-udvidet\n"
 "Slet den først.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3016,7 +2934,7 @@ msgstr ""
 "SunOS/Solaris forventer det og selv Linux foretrækker det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3027,52 +2945,52 @@ msgstr ""
 "og partition 11 som 'entire volume' (6), da IRIX forventer det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Ændrede systemtypen for partition %d til %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d har forskellig fysisk/logisk begyndelse (ikke-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har forskellig fysisk/logisk endelse:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i starter ikke på en cylinder-grænse:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "burde være (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i slutter ikke på en cylindergrænse.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "burde være (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3081,7 +2999,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld Mb, %lld byte\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3090,17 +3008,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld Gb, %lld byte\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d hoveder, %d sektorer/spor, %d cylindre"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", i alt %llu sektorer"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3109,7 +3027,7 @@ msgstr ""
 "Enheder = %s af %d * %d = %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3118,7 +3036,7 @@ msgstr ""
 "Intet at gøre. Rækkefølgen er allerede korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3126,16 +3044,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Opstart   Start         Slut     Blokke   Id  System\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Enhed"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3144,7 +3062,7 @@ msgstr ""
 "\n"
 "Partitionstabellens indgange er ikke i disk-rækkefølge\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3155,84 +3073,84 @@ msgstr ""
 "Disk %s: %d hoveder, %d sektorer, %d cylindre\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF Hvd Sek  Cyl Hvd Sek  Cyl     Start      Str. ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Advarsel: partition %d indeholder sektor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: hovedet %d er større end de maksimale %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: sektor %d er større end de maksimale %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitionerne %d: cylinder %d større end de maksimale %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partition %d: forrige sektorer %d stemmer ikke med totalen %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Advarsel: ugyldig start-på-data i partition %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Advarsel: partition %d overlapper med partition %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Advarsel: partition %d er tom\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logisk partition %d ikke fuldstændigt indenfor partition %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 "Det totale antal allokerede sektorer %d er større end de maksimale %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld ikke-allokerede sektorer\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Partition %d er allerede defineret. Slet den før du tilføjer den igen.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Ingen tilgængelige frie sektorer\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3245,22 +3163,22 @@ msgstr ""
 "\ttilføje DOS-partitioner. (Brug o.)\n"
 "\tADVARSEL: Dette vil ødelægge diskens nuværende indhold.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Du må først slette en partition og tilføje en udvidet partition\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Samtlige logiske partitioner er i brug\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Tilføjer en primærpartition\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3271,20 +3189,20 @@ msgstr ""
 "   %s\n"
 "   p    primær partition (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l    logisk (5 eller derover)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e    udvidet"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ugyldigt partitionsnummer for type '%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3293,12 +3211,12 @@ msgstr ""
 "Partitionstabellen er ændret!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kalder ioctl() for at genindlæse partitionstabellen.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3311,7 +3229,7 @@ msgstr ""
 "Denne kerne bruger stadig den gamle tabel.\n"
 "Den nye tabel vil blive brugt fra næste genstart.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3324,74 +3242,74 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "ændret DOS 6.x partitioner.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Fejl ved lukning af %s\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har intet dataområde\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Ny begyndelse på data"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Ekspert kommando (m for hjælp): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Antal cylindre"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Antal hoveder"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Advarsel: sætter sektorforskydning for DOS-kompatilitet\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s indeholder ikke en gyldig partitionstabel\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kunne ikke åbne %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kunne ikke åbne %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ukendt kommando\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Denne kerne finder selv sektorstørrelser - tilvalget -b ignoreres\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3400,17 +3318,16 @@ msgstr ""
 "Advarsel: tilvalget -b (angiv sektorstørrelse) kræver angivelse af disk-"
 "enhed\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Detekterede et OSF/1 diskmærkat på %s. Går i diskmærkat-tilstand.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Kommando (m for hjælp): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3419,16 +3336,16 @@ msgstr ""
 "\n"
 "Den nuværende opstartfil er: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Angiv venligt navnet på den ny opstartsfil: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Opstartsfil uændret\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3495,15 +3412,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux' egen"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3581,7 +3498,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u størrelse%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3638,7 +3554,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Der er mere end én fuldstændig diskindgang.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Ingen partitioner defineret\n"
@@ -3723,7 +3639,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tDu har valgt et ikke-standard navn på opstartsfilen.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3743,11 +3658,10 @@ msgstr ""
 "Kun \"SGI volume\" hele-disk-sektionen kan bryde dette.\n"
 "Skriv JA, hvis du er sikker på, at du vil mærke partitionen anderledes.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "JA\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3821,44 +3735,43 @@ msgstr "Forsøger at bibeholde parametrene for partition %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tLÆNGDE=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Tom"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetekt"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3872,12 +3785,12 @@ msgstr ""
 "eller gennemtvinge et helt nyt mærkat.\n"
 "(s-kommandoen i hovedmenuen\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Autokonfigurering fandt en %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3890,7 +3803,7 @@ msgstr ""
 "naturligvis ikke kunne genskabes.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3900,72 +3813,72 @@ msgstr ""
 "   ?   autokonfigurering\n"
 "   0   brugerangivet (med maskinens fundne standardværdier)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Vælg type (? for auto. 0 for brugerangivet): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Autokonfigurering mislykkedes.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektorer/spor"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Alternative cylindre"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fysiske cylindre"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Interleavefaktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Ekstra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Du kan ændre alle diskparametrene fra x-menuen"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" diskette"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux' egen"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d slutter ikke på en cylinder-grænse\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partition %d overlapper med andre i sektorerne %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Ubenyttet hul - sektorerne 0­%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ubenyttet hul - sektorerne %d­%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3974,7 +3887,7 @@ msgstr ""
 "Disken er allerede helt udfyldt med andre partitioner.\n"
 "Slet eller formindsk nogen af dem, før du prøver igen.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3985,7 +3898,7 @@ msgstr ""
 "%d %s dækker en anden partition. Din indgang er blevet ændret til\n"
 "%d %s \n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3994,7 +3907,7 @@ msgstr ""
 "Hvis du vil beholde SunOS/Solaris-kompatilitet, bør du beholde denne\n"
 "partition som 'Whole disk' (5), der begynder på 0, med %u sektorer\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4008,7 +3921,7 @@ msgstr ""
 "og opstartsblok. Skriv JA hvis du er helt sikker på, at du vil\n"
 "markere den partition som Linux swap (82): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4027,7 +3940,7 @@ msgstr ""
 "Enheder = %s á %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4040,16 +3953,16 @@ msgstr ""
 "Enheder = %s á %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Start       Slut   Blokke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Antal alternative cylindre"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Antal fysiske cylindre"
 
@@ -4073,32 +3986,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Udvidet"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX opstartbar"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Opstartshåndtering"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4107,7 +4014,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4200,12 +4106,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4226,8 +4130,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4237,7 +4139,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD eller SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4258,12 +4159,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Gammel Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / gammel Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
@@ -4293,12 +4192,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad dvale"
@@ -4307,7 +4204,6 @@ msgstr "IBM Thinkpad dvale"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4373,30 +4269,22 @@ msgstr "Ikke-filsystemdata"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Værktøj"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4405,116 +4293,109 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC opstart"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekundær"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "søgefejl på %s - kunne ikke søge til %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "søgefejl: ønskede 0x%08x%08x, fik 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "løbet tør for hukommelse - opgiver\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "læsefejl på %s - kunne ikke læse sektor %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FEJL: sektor %lu har ikke en MSDOS-signatur\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "skrivefejl på %s - kan ikke skrive sektor %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kunne ikke åbne partitionssektor-redningsfil (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "skrivefejl på %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kunne ikke finde partitions-genskabelsesfil (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitions-genskabelsesfil har forkert størrelse - genskaber ikke\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "løbet tør for hukommelse?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan ikke åbne partitions-genskabelsesfilen (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "fejl under læsning af %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan ikke åbne enheden %s for skrivning\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fejl ved skrivning af sektor %lu på %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: kan ikke bestemme geometrien\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: kan ikke bestemme størrelsen\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4525,22 +4406,22 @@ msgstr ""
 "hel disk. Brug af fdisk på den er sikkert meningsløst.\n"
 "[Brug tilvalget --force hvis du virkelig gerne vil]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Advarsel: HDIO_GETGEO siger,at der er %lu hoveder\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Advarsel: HDIO_GETGEO siger, at der er %lu sektorer\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Advarsel: BLKGETSIZE/HDIO_GETGEO siger, at der er  %lu cylindre\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4549,7 +4430,7 @@ msgstr ""
 "Advarsel: usandsynligt antal sektorer (%lu) - normalt højst 63\n"
 "Dette vil give problemer med al programmel, der bruger C/H/S-adressering.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4558,14 +4439,14 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylindre, %lu hoveder, %lu sektorer/spor\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s for partition %s har umulig hoved-værdi: %lu (burde være mellem 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4573,7 +4454,7 @@ msgid ""
 msgstr ""
 "%s for partition %s har umulig sektor-værdi: %lu (burde være mellem 1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4582,7 +4463,7 @@ msgstr ""
 "%s for partition %s har umulig cylinder-værdi: %lu (burde være mellem 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4591,12 +4472,12 @@ msgstr ""
 "Id  Navn\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Genindlæser partitionstabel ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4604,31 +4485,31 @@ msgstr ""
 "Kommandoen for genindlæsning af partitionstabellen mislykkedes\n"
 "Genstart dit system nu, før du formatterer med mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fejl ved lukning af %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ingen sådan partition\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "ukendt format - benyttet sektorer\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitionstabel for %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "ikke-implementeret format - benytter %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4637,12 +4518,12 @@ msgstr ""
 "Enheder = cylindre á %lu byte, blokke á 1024 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Enhed  Opst Start     Slut  #cyldr. #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4651,12 +4532,12 @@ msgstr ""
 "Enheder = sektorer á 512 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Enhed  Opstart Start       Slut  #sektorer Id  System\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4665,12 +4546,12 @@ msgstr ""
 "Enheder = blokke á 1024 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Enhed  Opstrt Start       Slut   #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4679,31 +4560,31 @@ msgstr ""
 "Enheder = megabyte á 1048576 byte, blokke á 1024 byte, fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Enhed  Opst Start   Slut   MiB    #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tstart: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tslut: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitionen slutter på cylinder %ld, efter diskens slutning\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Fandt ingen partitioner\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4714,51 +4595,51 @@ msgstr ""
 "   til C/H/S=*/%ld/%ld (i stedet for %ld/%ld/%ld).\n"
 "I denne visning vil jeg gå ud fra denne geometri.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "der er ingen partitionstabel.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "mærkeligt, kun %d partitioner er defineret.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Advarsel: partition %s har størrelsen 0, men er ikke markeret tom\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Advarsel: partition %s har størrelsen 0, men er opstartbar\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Advarsel: partition %s har størrelsen 0, men starter ikke i 0\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Advarsel: partition %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "indeholdes ikke i partition %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Advarsel: partitionerne %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "og %s overlapper hinanden\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4768,17 +4649,17 @@ msgstr ""
 "lu),\n"
 "og vil ødelægge denne, når der skrives til partitionen.\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Advarsel: partition %s starter i sektor 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Advarsel: partition %s når ud over diskens slutning\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4786,17 +4667,17 @@ msgstr ""
 "Kun én af primærpatitionerne må være udvidet\n"
 " (dette er dog ikke noget problem under Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Advarsel: partition %s starter ikke på en cylindergrænse\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Advarsel: partition %s slutter ikke på en cylindergrænse\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4805,7 +4686,7 @@ msgstr ""
 "Dette generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne "
 "disk.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4813,7 +4694,7 @@ msgstr ""
 "Advarsel: normalt kan man kun starte op fra primærpartitioner\n"
 "LILO ignorerer opstartbar flaget.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4821,33 +4702,33 @@ msgstr ""
 "Advarsel: ingen primærpartition er markeret opstartbar (aktiv)\n"
 "Det generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne disk.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "start"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: start: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "slut"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: end: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s slutter på cylinder %ld, efter diskens slutning\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4856,7 +4737,7 @@ msgstr ""
 "Advarsel: ændrede starten på udvidet partition fra %ld til %ld\n"
 "(Vedrører kun oplistningen. Ændrer ikke indholdet.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4864,134 +4745,133 @@ msgstr ""
 "Advarsel: udvidet partition starter ikke på en cylindergrænse.\n"
 "DOS og Linux vil opfatte indholdet forskelligt.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "for mange partitioner - ignorerer dem efter nr. (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "træ med partitioner?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "fandt Disk Manager - kan ikke håndtere sådan en\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "fandt DM6 signatur - opgiver\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "mærkeligt... en udvidet partition med størrelsen 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "mærkeligt..., en BSD-partition med størrelsen 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: ukendt partitionstabeltype\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flaget -n blev givet: Intet ændret\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Kunne ikke gemme de gamle sektorer- afbryder\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Mislykket skrivning af partition på %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "lang eller uafsluttet inddatalinje - afbryder\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "inddatafejl: forventer '=' efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "inddatafejl: uventet tegn %c efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ukendt inddata: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "tal for stort\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "uvedkommende tegn efter tallet\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "ikke plads til partitionsbeskrivelse\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "kunne ikke opbygge den omgivende udvidede partition\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "for mange inddatafelter\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Ikke plads til mere\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Ugyldig type\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Advarsel: den angiven størrelse(%lu) overstiger den maksimalt tilladte (%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Advarsel: tom partition\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Advarsel: ugyldigt partitionsbegyndelse (tidligst %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ukendt opstartbar-flag,  vælg - eller *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "delvis c,h,s-specifikation?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Udvidet partition ikke hvor den forventedes\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "ugyldige inddata\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "for mange partitioner\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5001,47 +4881,43 @@ msgstr ""
 "<start> <størr> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Du behøver normalt kun at angive <start> og <størr> (og måske <type>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "version"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhed: noget lignende /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "nyttige tilvalg:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: vis partitionens størrelse"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:        vis eller ændr partitions-id"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:      vis hver enheds partitioner"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [eller --dump]:      det samme, men i et format, der vil passe til "
 "senere inddata"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [eller --increment]: antal cylindre osv. fra 1 i stedet for fra 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5049,59 +4925,59 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:     indlæs/vis i enhederne sektorer/blokke/cylindre/"
 "MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:vis kendte partitionstyper"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [eller --DOS]:       DOS-kompatibilitet: spilder lidt plads"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [eller --re-read]:   lad kernen genindlæse partitionstabellen"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                   ret kun partitionen med nummer #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                    undlad at skrive ændringerne til disken"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O fil :                gem de sektorer, der overskrives, i en fil"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :                genskab disse sektorer"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]:   vis version"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:      vis denne besked"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "farlige tilvalg:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [eller --show-geometry]: vis kernens bud på den geometri"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -g [eller --show-geometry]: vis kernens bud på den geometri"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5109,114 +4985,114 @@ msgstr ""
 "    -x [eller --show-extended]: medtag udvidede partitioner i uddata\n"
 "                                eller forvent beskrivelser af dem i inddata"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [eller --Linux]:      giv ikke råd, der ikke vedrører Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:      undertryk advarsler"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan tilsidesætte den detekterede geometri med:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [eller --cylinders #]:angiv det cylinderantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [eller --heads #]:    angiv det hovedantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [eller --sectors #]:  angiv det sektorantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan undertrykke alle forenelighedstjek med:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [eller --force]:      gør hvad jeg siger, selvom det er dumt"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Brug:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s enhed\t\t vis aktive partitioner på enhed\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s enhed n1 n2 ... aktivér partitionerne på n1 ..., deaktivér resten\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An enhed\t aktivér partition n, deaktivér de andre\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "ingen kommando?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "i alt: %llu blokke\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "brug: sfdisk --print-id enhed partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "brug: sfdisk --change-id enhed partitionsnummer id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "brug: sfdisk --id enhed partitionsnummer [id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "du kan kun angive én enhed (undtagen med -l eller -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kunne ikke åbne %s for skrivning\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kunne ikke åbne %s for læsning\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: O.k.\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindre, %ld hoveder, %ld sektorer/spor\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan ikke få størrelsen %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ugyldig aktiv-byte: 0x%x i stedet for 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5224,7 +5100,7 @@ msgstr ""
 "Færdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5233,35 +5109,35 @@ msgstr ""
 "Du har %d aktive primærpartitioner. Dette generer ikke LILO,\n"
 "men DOS MBR vil kun kunne starte op fra en disk med én aktiv partition.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s har id %x og er ikke skjult\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ugyldig id %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Denne disk er i brug for øjeblikket.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatal fejl: kunne ikke finde %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Advarsel: %s er ikke en blokenhed\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Tjekker, at ingen benytter denne disk for øjeblikket...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5274,30 +5150,30 @@ msgstr ""
 "Afmonter alle filsystemer og 'swapoff' alle swappartitioner på denne disk.\n"
 "Brug flaget --no-reread for at undertrykke dette tjek.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Brug flaget --force for at undertrykke alle tjek.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "O.k.\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Gammel situation:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partitionen %d eksisterer ikke. Kan ikke ændre den\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5305,21 +5181,21 @@ msgstr ""
 "Jeg kan ikke lide disse partitioner - intet blev ændret.\n"
 "(Hvis du virkelig ønsker det, kan du bruge flaget --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Jeg kan ikke lide detteher - du bør nok svare Nej\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Er du tilfreds med dette? [jna] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vil du virkelig skrive dette til disken? [jna] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5328,16 +5204,16 @@ msgstr ""
 "\n"
 "sfdisk: inddata sluttede for tidligt\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Afslutter - intet blev ændret\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Svar venligst j,n,a\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5346,7 +5222,7 @@ msgstr ""
 "Skrivning af ny partitionstabel lykkedes\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5445,129 +5321,129 @@ msgstr "getopt (udvidet) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "intern fejl, kontakt programmøren."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "startede op med MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "'Ruffian' BCD-ur\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "urport justeret til 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "'funky TOY' (tid-på-året)!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: momentan %s mislykkedes i 1000 iterationer!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Kan ikke åbne /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Jeg kunne ikke få adgang fordi jeg ikke forsøgte.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s kan ikke få adgang til I/O-port: kaldet 'iopl(3)' mislykkedes.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Du behøver nok root-rettigheder.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Antager at maskinuret holdes i %s tid.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "GMT"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "lokal"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Advarsel: ukendt tredie linje i adjtime-fil\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Forventet: 'UTC' (GMT), 'LOCAL' eller ingenting.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Sidste hastighedsjustering blev gjort %ld sekunder efter 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Sidste kalibrering blev foretaget %ld sekunder efter 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Maskinuret er i %s-tid\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "ukendt"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Venter på et ur-tik...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...fangede ur-tik\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Ugyldige værdier i maskinur: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Maskinur-tid: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekunder siden 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Tid læst fra maskinuret: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Sætter maskinuret til %.2d:%.2d:%.2d = %ld sekunder siden 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Uret uændret - testede kun.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5576,7 +5452,7 @@ msgstr ""
 "Der er gået %.6f sekunder siden referencetiden.\n"
 "Udskyder yderligere for at nå til næste hele sekund.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5585,22 +5461,22 @@ msgstr ""
 "Maskinurets registre indeholder værdier, der enten er ugyldige (f.eks. 50. "
 "dag i måneden) eller udenfor det område, vi kan håndtere (f.eks. år 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekunder\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Intet --date tilvalg angivet.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "parametret til --date er for langt\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5609,22 +5485,22 @@ msgstr ""
 "Værdien af --date tilvalget er ikke en gyldig dato.\n"
 "Mere specifikt, indeholder den anførselstegn.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Udfører 'date'-kommandoen: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Kunne ikke køre 'date'-programmet i /bin/sh skallen. popen() mislykkedes"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "svar fra 'date'-kommandoen = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5639,7 +5515,7 @@ msgstr ""
 "Svaret var:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5656,12 +5532,12 @@ msgstr ""
 "Svaret var:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "Datoteksten %s svarer til %ld sekunder siden 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5670,36 +5546,36 @@ msgstr ""
 "Maskinuret indeholder ikke en gyldig tid, så vi kan ikke sætte systemuret "
 "med det.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Kalder 'settimeofday':\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Sætter ikke systemuret, da der køres i testtilstand.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Skal være superbruger for at sætte systemuret.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() mislykkedes"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5708,7 +5584,7 @@ msgstr ""
 "Justerede ikke hastighedsfaktoren, da maskinuret tidligere havde en ugyldig "
 "værdi.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5718,7 +5594,7 @@ msgstr ""
 "og kan derfor ikke bruges. Det er nødvendigt at starte \n"
 "kalibreringen forfra.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5727,7 +5603,7 @@ msgstr ""
 "Justerede ikke hastighedsfaktoren, da det er mindre en et døgn siden sidste "
 "kalibrering.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5738,22 +5614,22 @@ msgstr ""
 "hastighedsfaktor på %f sekunder/døgn.\n"
 "Justerer hastighedsfaktoren med %f sekunder/døgn\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "%d sekunder siden sidste justering\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "Skal indsætte %d sekunder og stille uret %.6f sekunder tilbage\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Opdaterer ikke adjtime-filen, da der køres i testtilstand.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5762,40 +5638,40 @@ msgstr ""
 "Ville have skrevet følgende til %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Hastighedsjusteringen blev ikke opdateret.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "Maskinuret indeholder ikke en gyldig tid, så vi kan ikke justere det.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "Den krævede justering er mindre end ét sekund, så vi sætter ikke uret.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Bruger %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Fandt ingen brugbare ur-grænseflader.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Kunne ikke sætte systemuret.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5807,17 +5683,17 @@ msgstr ""
 "Denne kopi af hwclock blev kompileret til en anden maskine end Alpha\n"
 "(og kører derfor sandsynligvis ikke på en Alpha nu). Intet blev gjort.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Kunne ikke hente en epokeværdi fra kernen.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernen går ud fra en epokeværdi på %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5826,17 +5702,22 @@ msgstr ""
 "For at sætte epokeværdien, skal du bruge tilvalget 'epoch' for at angive "
 "hvilken værdi, den skal sættes til\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Sætter IKKE epokeværdien til %d - tester bare.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kunne ikke sætte epokeværdien i kernen.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s fra %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5895,7 +5776,7 @@ msgstr ""
 "  --noadjfile   tilgå ikke /etc/adjtime. Det kræver, at der bruges\n"
 "                enten --utc eller --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5904,12 +5785,12 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                angiv hvilken slags alpha du har (se hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s accepterer ingen parametre. Du angav parameteren %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5918,7 +5799,7 @@ msgstr ""
 "Du har angivet flere funktionstilvalg.\n"
 "Du kan kun udføre én funktion ad gangen.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5926,7 +5807,7 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --utc og --localtime udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -5934,27 +5815,27 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --adjust og --noadjfile udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: --noadjfile kræver enten --utc or --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ingen brugbar set-til-tid. Kan ikke sætte uret.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Beklager, kun superbrugeren kan ændre maskinuret.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Beklager, kun superbrugeren kan ændre systemuret.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -5962,12 +5843,12 @@ msgid ""
 msgstr ""
 "Beklager, kun superbrugeren kan ændre maskinurets epokeværdi i kernen.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Kan ikke tilgå maskinuret med nogen kendt metode.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6003,7 +5884,6 @@ msgstr "ioctl() kunne ikke aflæse tiden fra %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "KDGHWCLK-ioctl mislykkedes"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Kunne ikke åbne /dev/tty1 eller /dev/vc/1"
@@ -6099,9 +5979,6 @@ msgstr "ioctl(RTC_EPOCH_READ) til %s mislykkedes"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "vi har aflæst epokeværdi %ld fra %s med RTC_EPOCH_READ ioctl.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6127,7 +6004,6 @@ msgstr "ioctl(RTC_EPOCH_SET) til %s mislykkedes"
 msgid "calling open_tty\n"
 msgstr "kalder 'open_tty'\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "kalder 'termio_init'\n"
@@ -6136,7 +6012,6 @@ msgstr "kalder 'termio_init'\n"
 msgid "writing init string\n"
 msgstr "skriver init-streng\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "før 'autobaud'\n"
@@ -6150,7 +6025,6 @@ msgstr "venter på cr-lf\n"
 msgid "read %c\n"
 msgstr "læs %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "læser loginnavn\n"
@@ -6204,7 +6078,6 @@ msgstr "/dev: chdir() mislykkedes: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ikke en tegnenhed"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6219,12 +6092,10 @@ msgstr "/dev/%s: kan ikke åbne som standard-ind: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: ikke åben for læsning/skrivning"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duplikerer\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6267,30 +6138,25 @@ msgstr ""
 "eller\t[-hiLmw] [-l login_program] [-t tidsudløb] [-I initstreng] [-H "
 "login_vært] linje baud_rate,... [termtype]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: ikke megen hukommelse, login kan mislykkes\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "kunne ikke allokere hukommelse for ttyclass (malloc)"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "kunne ikke allokere hukommelse for grplist (malloc)"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login på %s fra %s afvises som standard.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login på %s fra %s afvist.\n"
@@ -6335,8 +6201,8 @@ msgstr "Ændrer finger-information for %s.\n"
 msgid "Password error."
 msgstr "Fejl i adgangskode."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Adgangskode: "
@@ -6514,34 +6380,6 @@ msgstr "Brug %s -l for at se en liste.\n"
 msgid "No known shells.\n"
 msgstr "Ingen kendte skaller.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "kunne ikke åbne /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "kunne ikke læse tilfældige data fra /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "kunne ikke åbne for læsning af %s"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "kunne ikke stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s har ikke de korrekte filmodi"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "kunne ikke læse data fra %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6551,11 +6389,11 @@ msgstr "Kunne ikke læse %s, afbryder."
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "brug: last [-#] [-f fil] [-t tty] [-h vært] [bruger ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  stadig logget på"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6564,15 +6402,15 @@ msgstr ""
 "\n"
 "wtmp starter %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: hukommelsesallokerings-fejl (malloc).\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6581,51 +6419,45 @@ msgstr ""
 "\n"
 "afbrudt %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATALT: kunne ikke genåbne tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "FATALT: ugyldig tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h er kun for superbrugeren.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "brug: login [-fp] [brugernavn]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-fejl, afbryder: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kunne ikke klargøre PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGIN %d FRA %s FOR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6634,17 +6466,17 @@ msgstr ""
 "Login ugyldigt\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "FOR MANGE LOGINFORSØG (%d) FRA %s FOR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGINSESSION FRA %s FOR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6653,7 +6485,7 @@ msgstr ""
 "\n"
 "Login ugyldigt\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6662,135 +6494,120 @@ msgstr ""
 "\n"
 "Problem med sessions-opsætning, afbryder.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "TOMT brugernavn i %s: %d. Afbryder."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ugyldigt brugernavn \"%s\" i %s:%d. Afbryder."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Hukommelse opbrugt\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Ugyldigt brugernavn"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login afvist på denne terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s AFVIST FRA %s PÅ TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s AFVIST PÅ TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login ugyldigt\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"For mange brugere er allerede logget på.\n"
-"Prøv igen senere.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Du har for mange processer kørende.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "OPRINGNING KLOKKEN %s AF %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN PÅ %s FRA %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN PÅ %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN PÅ %s AF %s FRA %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN PÅ %s AF %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: mislykket forgrening: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY mislykkedes: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() mislykkedes"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Ingen mappe %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logger ind med hjemmemappe = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ingen hukommelse for skal-skript.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kunne ikke køre skal-skript: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ingen skal: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6799,65 +6616,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "loginnavn alt for langt.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "for langt NAVN"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "loginnavne må ikke starte med '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "for mange tomme linjeskift,\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "VOLDSOMT MANGE linjeskift"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login udløb efter %d sekunder\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Sidste login: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "fra %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGINFEJL FRA %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGINFEJL på %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGINFEJL fra %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGINFEJL PÅ %s, %s"
@@ -6877,167 +6694,30 @@ msgstr "er n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "brug: mesg [j | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Hvem er du?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Ingen sådan gruppe."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Nægtet adgang"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Ingen skal"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Adgangskoden skal bestå af mindst 6 tegn. Prøv igen.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Adgangskoden skal indeholde tegn fra to af følgende klasser:\n"
-"store og små bogstaver, tal og ikke-alfanumeriske tegn.\n"
-"Se passwd(1) for flere oplysninger.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Du kan ikke genbruge den gamle adgangskode.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Brug venligst ikke brugernavn og lignende som adgangskode!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Brug venligst ikke dit rigtige navn og lignende som adgangskode!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Brug: passwd [brugernavn [adgangskode]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Kun root kan bruge et- og to-parameter formater.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Brug: passwd [-foqsvV] [bruger [adgangskode]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Kunne ikke udføre %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kunne ikke finde loginnavn"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Kun root kan ændre adgangskoder for andre.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "For mange parametre.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Kan ikke finde brugernavnet nogen steder. Er '%s' virkelig en bruger?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Beklager, jeg kan kun ændre lokale adgangskoder. Brug 'yppasswd' i stedet."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID og brugernavn passer ikke sammen."
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Ændrer adgangskode for %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Indtast gammel adgangskode: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Ugyldig adgangskode."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Indtast ny adgangskode: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Adgangskode ikke ændret."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Gentag ny adgangskode: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Du stavede forkert. Adgangskoden blev ikke ændret."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "adgangskode ændret, bruger %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT-ADGANGSKODE ÆNDRET"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "adgangskoden ændret af root, bruger %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "kalder setpwnam for at ændre adgangskoden.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Adgangskode *IKKE* ændret. Prøv igen senere.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Adgangskode ændret.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7084,7 +6764,6 @@ msgstr "genstartet af %s: %s"
 msgid "halted by %s: %s"
 msgstr "standset af %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7121,7 +6800,6 @@ msgstr "Kører programmet \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Fejl ved kørsel af\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7211,7 +6889,6 @@ msgstr "fejl under sætning af close-on-exec på /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "fejl ved kørsel af finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "fejl ved forsøg på at spalte processen finalprog\n"
@@ -7240,7 +6917,7 @@ msgstr "kunne ikke åbne mappe\n"
 msgid "fork failed\n"
 msgstr "forgrening mislykkedes\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "programkørsel mislykkedes\n"
 
@@ -7390,12 +7067,6 @@ msgstr "ugyldig månedsværdi: brug 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "ugyldig årsværdi: brug 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7406,13 +7077,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "brug: cal [-13smjyV] [[måned] år]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "brug: %s [+format] [dag måned år]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tibs-dag"
 
@@ -7543,7 +7213,7 @@ msgstr "%s: kunne ikke omdøbe %s til %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "kald: %s fra til filer...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7554,22 +7224,22 @@ msgstr ""
 "Brug '%s [tilvalg] %s', hvis du virkelig vil bruge den.\n"
 "Skript blev ikke startet.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "brug: script [-a] [-f] [-q] [-t] [fil]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skript påbegyndt, filen er %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Skript påbegyndt på %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7578,254 +7248,253 @@ msgstr ""
 "\n"
 "Skript kørt på %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skript færdigt, filen er %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty mislykkedes\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Løbet tør for pty-er\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Parameterfejl, brug\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_navn ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilnavn ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "kan ikke ændre strømsparetilstand\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl fejl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fejl ved læsning af %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Fejl ved skrivning af skærmkopi\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "kunne hverken læse %s eller udføre ioctl dump\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM er ikke defineret.\n"
@@ -7900,10 +7569,6 @@ msgstr "advarsel: kunne ikke åbne %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kunne ikke åbne %s - bruger %s i stedet\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8201,81 +7866,72 @@ msgstr "mount: kunne ikke åbne %s for at sætte hastigheden"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kunne ikke sætte hastigheden: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kunne ikke forgrene: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: denne version blev oversat uden understøttelse for 'nfs'-typen"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: montering af nfs version 4 mislykkedes, prøver version 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Jeg kunne ikke bestemme filsystemtypen, og ingen var angivet"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du skal angive filsystemtypen"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: montering mislykkedes"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkt %s er ikke en mappe"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: adgang nægtet"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: skal være superbruger for at bruge 'mount'"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s er optaget"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc er allerede monteret"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: enten er %s allerede monteret eller %s optaget"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkt %s eksisterer ikke"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: monteringspunkt %s er en symbolsk lænke ud i ingenting"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenhed %s eksisterer ikke"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8284,12 +7940,12 @@ msgstr ""
 "mount: specialenhed %s eksisterer ikke\n"
 "       (en sti er ikke en mappe)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ikke allerede monteret, eller forkert tilvalg"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8298,69 +7954,68 @@ msgstr ""
 "mount: forkert filsystemtype, forkert tilvalg, ugyldig superblok på %s,\n"
 "       eller for mange monterede filsystemer"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "monteringstabellen er fuld"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kunne ikke læse superblokken"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ukendt enhed"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: ukendt filsystemtype'%s'"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du mente sikkert %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: måske mente du 'iso9660'?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: måske mente du 'vfat'?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s har forkert enhedsnummer eller filsystemtypen %s understøttes ikke"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s er ikke en blokenhed, og 'stat' fejler?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8369,73 +8024,68 @@ msgstr ""
 "mount: kernen genkender ikke %s som en blokenhed\n"
 "       (måske hjælper 'insmod enheds-driver'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s er ikke en blokenhed (brug eventuelt '-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s er ikke en blokenhed"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s er ikke en gyldig blokenhed"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blokenhed "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s er skrivebeskyttet, men eksplicit '-w'-tilvalg blev givet"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: ingen type blev angive - Jeg antager nfs på grund af kolonnet\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: ingen type blev angivet - Jeg antager smbfs p.g.a. det "
 "foranstillede //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: kører \"%s\" i baggrunden\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: opgiver \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s er allerede monteret som %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8482,34 +8132,34 @@ msgstr ""
 "Andre tilvalg: [-nfFrsvw] [-o tilvalg] [-p adgangskodefd].\n"
 "se mange flere detaljer med 'man 8 mount'.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: dette kan kun root gøre"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s fundet - opretter den..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: fandt ingen sådan partition"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: monterer %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "intet blev monteret"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kunne ikke finde %s i %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kunne ikke finde %s i %s eller %s"
@@ -8544,98 +8194,98 @@ msgstr "       Jeg vil forsøge type %s\n"
 msgid "Trying %s\n"
 msgstr "Forsøger %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: voldsomt langt 'vært:mappe'-parameter\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: advarsel: angivelse af flere værtsnavne understøttes ikke\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: mappe, der monteres, er ikke i formatet 'vært:mappe'\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: kunne ikke få adressen på %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: fik ugyldig hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: voldsomt langt tilvalgsparameter\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Advarsel: Ukendt proto= tilvalg.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Advarsel: Tilvalget 'namlen' understøttes ikke.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "ukendt NFS-montageparameter: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Advarsel: tilvalget 'nolock' understøttes ikke.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "ukendt NFS-montageparameter: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: fik ugyldig hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS via TCP understøttes ikke.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "NFS-sokkel"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "NFS-tjener angav, at tjenesten ikke var tilgængelig"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "benyttede portmapper til at finde NFS-port\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "bruger port %d til NFS-dæmonen\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "NFS-forbindelse"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "ukendt NFS-statusværdi: %d"
@@ -8644,7 +8294,7 @@ msgstr "ukendt NFS-statusværdi: %d"
 msgid "bug in xstrndup call"
 msgstr "programfejl i xstrndup-kald"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8657,7 +8307,7 @@ msgstr ""
 "      %s [-v] [-p prioritet] speciel ...\n"
 "      %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8668,139 +8318,137 @@ msgstr ""
 "      %s -a [-v]\n"
 "      %s [-v] speciel ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s på %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: kunne ikke finde \"_stext\" i %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: kan ikke finde %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: advarsel: %s har usikre filrettigheder %04o, %04o anbefales\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Dropper filen %s - den lader til at være fragmenteret.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Ikke superbruger.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: kunne ikke åbne %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: oversat uden understøttelse af tilvalget -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: kunne ikke forgrene: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "vært: %s, mappe: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: kunne ikke få adressen på %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: fik ugyldig hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ugyldig blokenhed"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ikke monteret"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kunne ikke skrive superblok"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: enhed optaget"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ikke fundet"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: skal være superbruger for at afmontere"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blokenheder tillades ikke på dette fs"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, forsøger umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kunne ikke afmontere %s med umount - forsøger %s i stedet\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunne ikke montere %s skrivebeskyttet\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s afmonteret\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8811,48 +8459,47 @@ msgstr ""
 "      umount -a [-f] [-r] [-n] [-v] [-t vfstyper] [-O tilvalg]\n"
 "      umount [-f] [-r] [-n] [-v] speciel | knude...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Kunne ikke åbne "
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Forsøger at afmontere %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunne ikke finde %s i mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s er ikke monteret (ifølge mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det lader til, at %s er monteret flere gange"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s er ikke i fstab (og du er ikke root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s montering stemmer ikke med fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: kun %s kan afmontere %s fra %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: dette kan kun root gøre"
 
@@ -9006,7 +8653,7 @@ msgstr "%s: ukendt signal %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9173,8 +8820,6 @@ msgstr "kernen er ikke konfigureret til brug af delt hukommelse\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- Grænser for delt hukommelse ---\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9957,17 +9602,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_fil] [-n længde] [-s overspring] "
 "[fil ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "brug: %s [-dflpcsu] [+linjeantal | +/mønster] navn1 navn2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: ukendt signal %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9978,8 +9623,7 @@ msgstr ""
 "*** %s: mappe ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9990,45 +9634,45 @@ msgstr ""
 "******** %s: Ikke en tekstfil ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Brug q eller Q for at afslutte]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Mere--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Næste fil: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Tryk mellemrum for at fortsætte, 'q' for at afslutte.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...bak %d sider"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...bak 1 side"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...overspringer en linje"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...overspringer %d linjer"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10038,7 +9682,7 @@ msgstr ""
 "***Tilbage***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10050,7 +9694,7 @@ msgstr ""
 "klammer.\n"
 "Stjerne (*) betyder at parameteren bliver den nye standardværdi.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10096,34 +9740,34 @@ msgstr ""
 ":f                      Vis aktuelle filnavn og linjenummer\n"
 ".                       Gentag seneste kommando\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Tryk 'h' for instruktioner.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linje %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ikke en fil] linje %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Overløb\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...overspringer\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Forkludret regulært udtryk"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10131,15 +9775,15 @@ msgstr ""
 "\n"
 "Mønster ikke fundet\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Mønster ikke fundet"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "kunne ikke forgrene (fork)\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10147,19 +9791,19 @@ msgstr ""
 "\n"
 "...Overspringer "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Springer til filen "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Springer tilbage til filen "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "For lang linje"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Ingen tidligere kommando at erstatte med"
 
@@ -10212,91 +9856,88 @@ msgstr "hexdump: ugyldigt format {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ugyldig konverteringstegn %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 "%s: Brug: %s [-tal] [-p streng] [-cefnrs] [+linje] [+/mønster/] [filer]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: tilvalget kræver et parameter -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: ugyldigt tilvalg -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...hopper fremad\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...springer bagud\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Ingen næste fil"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Ingen forrige fil"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Læsefejl fra %s-fil\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Uventet filafslutning i %s-fil\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Ukendt fejl i %s-fil\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kunne ikke oprette midlertidig fil.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE fejl: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(Filafslutning)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Ingen gammel søgestreng"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Kunne ikke åbne "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "gemte"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !kommando ikke tilladt i rflag-tilstand.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() mislykkedes, prøv senere\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Næste fil: "
 
@@ -10350,6 +9991,156 @@ msgstr "For lang inddatalinje.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Løb tør for hukommelse under forstørring af buffer.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Ugyldigt tal: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaksfejl: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Ingen sådan parameter sat: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] enh navn\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] enh str sekt hoveder spor stræk gab rate spec1 fmt_gab\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] enh\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] enh\n"
+
+#~ msgid "version"
+#~ msgstr "version"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "kunne ikke åbne /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "kunne ikke læse tilfældige data fra /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "kunne ikke åbne for læsning af %s"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "kunne ikke stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s har ikke de korrekte filmodi"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "kunne ikke læse data fra %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "For mange brugere er allerede logget på.\n"
+#~ "Prøv igen senere.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Du har for mange processer kørende.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Adgangskoden skal bestå af mindst 6 tegn. Prøv igen.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Adgangskoden skal indeholde tegn fra to af følgende klasser:\n"
+#~ "store og små bogstaver, tal og ikke-alfanumeriske tegn.\n"
+#~ "Se passwd(1) for flere oplysninger.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Du kan ikke genbruge den gamle adgangskode.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Brug venligst ikke brugernavn og lignende som adgangskode!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Brug venligst ikke dit rigtige navn og lignende som adgangskode!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Brug: passwd [brugernavn [adgangskode]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Kun root kan bruge et- og to-parameter formater.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Brug: passwd [-foqsvV] [bruger [adgangskode]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Kunne ikke udføre %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kunne ikke finde loginnavn"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Kun root kan ændre adgangskoder for andre.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "For mange parametre.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Kan ikke finde brugernavnet nogen steder. Er '%s' virkelig en bruger?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Beklager, jeg kan kun ændre lokale adgangskoder. Brug 'yppasswd' i stedet."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID og brugernavn passer ikke sammen."
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Ændrer adgangskode for %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Indtast gammel adgangskode: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Ugyldig adgangskode."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Indtast ny adgangskode: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Adgangskode ikke ændret."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Gentag ny adgangskode: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Du stavede forkert. Adgangskoden blev ikke ændret."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "adgangskode ændret, bruger %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT-ADGANGSKODE ÆNDRET"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "adgangskoden ændret af root, bruger %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "kalder setpwnam for at ændre adgangskoden.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Adgangskode *IKKE* ændret. Prøv igen senere.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Adgangskode ændret.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: denne version blev oversat uden understøttelse for 'nfs'-typen"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Advarsel: sletter partitioner efter %d\n"
diff --git a/po/de.gmo b/po/de.gmo
new file mode 100644
index 000000000..e775adf87
--- /dev/null
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 71ef3b83a..4a124cf68 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,48 +3,54 @@
 # Michael Piefel <piefel@informatik.hu-berlin.de>, 2002, 2004.
 # Karl Eichwalder <ke@suse.de>, 2001-2002.
 # Elrond <Elrond@Wunder-Nett.org>, 1999-2001.
-# Adrian Bunk <bunk@kernel.org>, 2004.
 #
 # Note:
 # =====
 # Changes done by Karl Eichwalder are put into the Public Domain.
 # Mine too. MPi
+#
 # As requested here is the unmodified header:
+#
 # -=-=-=-=-=-=-=-=-=-=-=-=-=- cut here -=-=-=-=-=-=-=-=-=-=-=-=-=-
 # German translation for util-linux.
 # Copyright (C) 1999, 2000, 2001 Elrond <Elrond@Wunder-Nett.org>.
 # Elrond <Elrond@Wunder-Nett.org>, 1999-2001.
+#
 # $Revision: 1.42 $
+#
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided, that this
 # header is not removed and modified versions are marked
 # as such.
+#
 # If you have additions/changes/other requests, please
 # send them to me (Elrond <Elrond@Wunder-Nett.org>)!
+#
 # People who helped or contributed (in historical order):
-# Martin Schulze <joey@infodrom.north.de>
-# Daniel Egger <Daniel.Egger@suse.de>
-# deliA <deliA@Wunder-Nett.org>
+#   Martin Schulze <joey@infodrom.north.de>
+#   Daniel Egger <Daniel.Egger@suse.de>
+#   deliA <deliA@Wunder-Nett.org>
+#
 # Submitted to the TP 2001-07-18 14:32:47 CEST -ke-
+#
 # -=-=-=-=-=-=-=-=-=-=-=-=-=- cut here -=-=-=-=-=-=-=-=-=-=-=-=-=-
+#
 # Hinweise zur Ãœbersetzung:
 # =========================
 # command – Befehl
 # bad     – beschädigt (z. B. „beschädigte Blöcke“)
-# bzw. ungültig (z. B. „ungültige ‚magic number‘ im Superblock“)
-# Michael Piefel <piefel@informatik.hu-berlin.de>, 2004.
-# 
-# 
+#           bzw. ungültig (z. B. „ungültige ‚magic number‘ im Superblock“)
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12q-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2004-12-31 16:13+0100\n"
-"Last-Translator: Adrian Bunk <bunk@kernel.org>\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-06-27 16:17+0200\n"
+"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\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"
 
 #: disk-utils/blockdev.c:62
@@ -145,7 +151,7 @@ msgstr "%s: IOCTL-Fehler bei %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "NurL  RA   SGr   BGr   Startsek     Größe   Gerät\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Aufruf:\n"
@@ -194,13 +200,12 @@ msgstr "Aufruf: %s [ -n ] Gerät\n"
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s von %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -225,7 +230,7 @@ msgstr "Doppel"
 msgid "Single"
 msgstr "Einfach"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -240,99 +245,99 @@ msgstr ""
 " -v         gesprächiger sein\n"
 " Datei      zu testende Datei\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: Fehler %d beim Entpacken! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: Größenfehler bei symbolischer Verknüpfung „%s“\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  entpacke Block bei %ld nach %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: unsinniger Modus auf „%s“ (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr " Loch bei %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Nicht-Block (%ld) Bytes\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Nicht-Größe (%ld vs %ld) Bytes\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: ungültiges cramfs – ungültige Pfadlänge\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: Die Unterstützung für -x wurde nicht mit übersetzt\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: Warnung – kann Dateisystemgröße nicht bestimmen\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s ist kein blockorientiertes Gerät oder Datei\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: ungültiges cramfs – Dateilänge zu kurz\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: ungültiges cramfs – falsche Magie\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: Warnung – Dateilänge zu lang, aufgefülltes Abbild?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ungültiges cramfs -- CRC-Fehler\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: Warnung – altes cramfs-Abbild, kein CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: ungültiges cramfs – ungültiger Superblock\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: ungültiges cramfs – Verzeichnisdatenende (%ld) != Dateidatenanfang (%"
 "ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ungültiges cramfs – ungültiges Dateidatenoffset\n"
@@ -802,7 +807,6 @@ msgid "blocks argument too large, max is %lu"
 msgstr "„blocks“-Argument zu groß, max ist %lu"
 
 #: disk-utils/mkfs.bfs.c:207
-#, fuzzy
 msgid "too many inodes - max is 512"
 msgstr "zu viele Inodes – Maximum ist 512"
 
@@ -811,7 +815,7 @@ msgstr "zu viele Inodes – Maximum ist 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "nicht genügend Platz; es werden wenigstens %lu Blöcke benötigt"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Gerät: %s\n"
@@ -880,24 +884,24 @@ msgstr "Fehler beim Schreiben des „..“-Eintrags"
 msgid "error closing %s"
 msgstr "Fehler beim Schließen von %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Aufruf: mkfs [-V] [-t FS-Typ] [FS-Optionen] Gerät [Größe]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Speicher ist aufgebraucht!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs Version %s (%s)\n"
 
 #: disk-utils/mkfs.cramfs.c:124
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
 "outfile\n"
@@ -914,13 +918,13 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"Aufruf: %s [-v] [-b blkgr] [-e edition] [-i datei] [-n name] verzname "
+"Aufruf: %s [-h] [-v] [-b blkgr] [-e edition] [-i datei] [-n name] verzname "
 "ausdatei\n"
 " -h         diese Hilfe ausgeben\n"
 " -v         wortreich sein\n"
 " -E         alle Warnungen zu Fehlern machen (von 0 versch. Exit-Status)\n"
 " -b blkgr   diese Blockgröße verwenden, muss gleich der Seitengröße sein\n"
-" -e edition Edition-Nummber setzen (Teil von fsid)\n"
+" -e edition Edition-Nummer setzen (Teil von fsid)\n"
 " -i datei   ein Dateiabbild in das Dateisystem einfügen (benötigt >= 2.4.0)\n"
 " -n name    name des cramfs-Dateisystems setzen\n"
 " -p         mit %d Bytes für Boot-Code auffüllen\n"
@@ -953,7 +957,6 @@ msgstr ""
 "MAXENTRIES überschritten. Setzen Sie diesen Wert in mkcramfs.c hoch und\n"
 "übersetzen Sie erneut. Breche jetzt ab.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -1010,10 +1013,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "Schreiben des ROM-Abbilds fehlgeschlagen (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1092,7 +1091,6 @@ msgstr "kann Inodes nicht Schreiben"
 msgid "write failed in write_block"
 msgstr "Schreiben fehlgeschlagen in write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1128,7 +1126,7 @@ msgstr "Seek fehlgeschlagen während Blocküberprüfung"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Merkwürdige Werte in do_check: wahrscheinlich Fehler\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "Seek fehlgeschlagen in check_blocks"
 
@@ -1171,110 +1169,110 @@ msgstr "kann kein „stat“ auf %s anwenden"
 msgid "will not try to make filesystem on '%s'"
 msgstr "Es wird nicht versucht, ein Dateisystem auf „%s“ zu erzeugen"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Ungültige nutzerdefinierte Seitengröße %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Benutze nutzerdefinierte Seitengröße %d anstelle der Systemwerte %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Es wird eine Seitengröße von %d (nicht %d) angenommen.\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
-msgstr ""
+msgstr "Ungültige Swap-Headergröße, kein Label geschrieben.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "Label wurde abgeschnitten.\n"
 
 # dito
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "Label"
+msgstr "kein Label, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "keine UUID\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr "Aufruf: %s [-c] [-v0|-v1] [-pSEITENGRÖSSE] /dev/Name [Größe in kB]\n"
+msgstr ""
+"Aufruf: %s [-c] [-v0|-v1] [-pSEITENGRÖSSE] [-L Label] /dev/Name [Blöcke]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "Zu viele beschädigte „Seiten“"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Speicher ist aufgebraucht"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "Eine beschädigte „Seite“\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu beschädigte Seiten\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: Es wurde nicht angegeben, wo der Swapbereich angelegt werden soll.\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 "%s: Fehler: Die angegebene Größe %lu ist größer als die des Gerätes: %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: Fehler: unbekannte Version %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: Fehler: Der Swapbereich muss mindestens %ldkB groß sein\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: Warnung: Der Swapbereich wird nur mit der Größe %ldkB angelegt\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr ""
-"%s: Es wurde nicht angegeben, wo der Swapbereich angelegt werden soll.\n"
+msgstr "%s: Fehler: Label nur mit V1-Swapbereich\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Es wird nicht versucht, Swap auf ‚%s‘ anzulegen"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fatal: erste Seite nicht lesbar"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1288,124 +1286,85 @@ msgstr ""
 "Es wird kein Swapbereich angelegt. Wenn Sie wirklich einen Swapbereich\n"
 "anlegen wollen, so benutzen Sie die Option -f.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Es ist nicht möglich, einen Swapbereich einzurichten: nicht lesbar"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Swapbereich Version %d wird angelegt, Größe %llu KBytes\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "kann Swap-Gerät nicht zurückspulen"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "kann Signaturseite nicht schreiben"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Ungültige Nummer: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaxfehler: „%s“\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Keine solche Parametermenge: „%s“\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] Gerät Name\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] gerät größe sekt köpfe spuren stretch lücke rate spec1 "
-"fmt_lücke\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] Gerät\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] Gerät\n"
-
 # "Unbrauchbar"
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Unbenutzbar"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Freier Bereich"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
-#, fuzzy
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
-msgstr "Linux XFS"
+msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Festplatte wurde verändert.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Rebooten Sie das System, um sicherzustellen, dass die Partitionstabelle neu "
 "gelesen wird.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1418,248 +1377,245 @@ msgstr ""
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "cfdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "FATALER FEHLER"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Eine Taste drücken, um cfdisk zu beenden"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Konnte „seek()“ nicht auf der Festplatte benutzen"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Konnte nicht von der Festplatte lesen"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Konnte nicht auf die Festplatte schreiben"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Zu viele Partitionen"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Partition fängt vor Sektor 0 an"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Partition endet vor Sektor 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Partition fängt hinter dem Ende der Festplatte an"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Partition endet hinter dem Ende der Festplatte"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partition endet im letzten teilweisen Zylinder"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logische Partitionen nicht in Platten-Reihenfolge"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logische Partitionen überlappen"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "vergrößerte logische Partitionen überlappen"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!! Interner Fehler beim Erzeugen einer log. Part. ohne eine erw. Part. !!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kann hier keine log. Part. anlegen -- eine zweite erw. müsste erzeugt werden."
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menüeintrag ist zu lang. Das Menü könnte ungewöhnlich aussehen"
 
 # "Ausrichtung" "Nehme horizontale Voreinstellung."
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menü ohne Richtung, verwende horizontal."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Diese Taste ist hier nicht verwendbar"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Eine Taste drücken, um fortzufahren"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primäre"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Erzeuge eine neue primäre Partition"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logische"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Erzeuge eine neue logische Partition"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Erzeuge keine neue Partition"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Interner Fehler !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Größe (in MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Anfang"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Erzeuge Partition am Anfang des freien Bereiches"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Ende"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Erzeuge Partition am Ende des freien Bereiches"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Kein Platz, um die erweiterte Partition anzulegen"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Keine Partitionstabelle.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Keine Partitionstabelle. Fange mit Null-Tabelle an."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Ungültige Signatur an Partitionstabelle"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Unbekannter Partitionstabellentyp"
 
 # If rpmatch is available, ‘j’ for “ja� will do. If not, my translation
 # is wrong. Anyway, I opt for a full-featured C library.
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Möchten Sie mit einer Null-Tabelle beginnen [j/N]"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Sie haben mehr Zylinder angegeben, als auf die Festplatte passen"
 
 # That's not a direct translation, but I've tried to be
 # more informative.
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Konnte nicht auf die Festplatte zugreifen"
 
 # "Nur lesender Zugriff möglich – Sie haben keine Schreibberechtigung" (joey)
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
-#, fuzzy
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 "Platte wurde nur zum Lesen geöffnet – Sie haben keine Rechte zum Schreiben"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Konnte die Größe der Festplatte nicht feststellen"
 
 # "Ungültige primäre Partition"
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Beschädigte primäre Partition"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Beschädigte logische Partition"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Warnung!!  Dies kann Daten auf der Festplatte zerstören!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Sind Sie sicher, dass Sie die Partitionstabelle schreiben wollen? (ja/nein): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nein"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Die Partitionstabelle wurde nicht auf die Festplatte geschrieben"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Bitte „ja“ oder „nein“ eingeben"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Die Partitionstabelle wird auf die Festplatte geschrieben..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Die Partitionstabelle wurde auf die Festplatte geschrieben"
 
 # That's not a good translation, but I guess, I can't make it longer.
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Die Tabelle wurde geschr., aber das Neueinlesen schlug fehl.  Rebooten Sie."
 
 # This one isn't really correct.
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Keine primäre Partition als bootfähig markiert; der DOS-MBR kann nicht "
 "booten."
 
 # This one isn't really correct.
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
@@ -1668,90 +1624,73 @@ msgstr ""
 
 # "Geben sie einen Dateinamen ein oder drücken Sie Return, um es auf dem Bildschirm anzuzeigen: "
 # is too long
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dateiname oder Return um es auf dem Bildschirm anzuzeigen: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Konnte „%s“ nicht öffnen"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Festplatte: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Keine  "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primäre"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "  Logische"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Boot"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Kein"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabelle von %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Erster   Letzter\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1759,7 +1698,7 @@ msgstr ""
 " # Typ        Sektor      Sektor   Offset    Länge    Dateisystemtyp (ID)  "
 "Flags\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1767,493 +1706,487 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "-----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Anfangs----      -----End------   Anfangs-   Anzahl der\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flags Kopf Sekt Zyl.  ID  Kopf Sekt Zyl    Sektor     Sektoren\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "„Roh“"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Die „rohen“ Daten der Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektoren"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Die Tabelle nach Sektoren sortiert ausgeben"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabelle"
 
 # "Nur die Partitionstabelle ausgeben" (joey)
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Einfach die Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Zeige die Tabelle nicht an"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Hilfe für cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dies ist cfdisk, ein Programm das curses benutzt und es ihnen"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "erlaubt, auf Ihren Festplatten Partitionen anzulegen, zu löschen"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "und zu verändern."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
 # "Befehl"
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Befehl     Bedeutung"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "--------     ---------"
 
 # "  b          Wechselt zwischen bootfähig und nicht bootfähig."
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 "  b          (De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Die Anzahl der Zylinder, Köpfe und Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WARNUNG: Diese Funktion sollte nur von Leuten benutzt"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             werden, die wissen, was sie tun."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Diese Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximieren der Nutzung der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Beachten Sie, dass dies die Partition nicht mehr kompatibel"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             zu DOS, OS/2, ... machen kann"
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Aus dem freien Bereich eine neue Partition erzeugen"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Die Partitionstab. auf dem Bildschirm oder in eine Datei "
 "ausgeben"
 
 # "verschiedene"
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Es gibt mehrere Formate für die Partitionstabelle, aus"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             denen man wählen kann"
 
-#: fdisk/cfdisk.c:2290
-#, fuzzy
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r – „Rohe“ Daten (was auf die Festplatte geschrieben würde)"
 
-#: fdisk/cfdisk.c:2291
-#, fuzzy
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s – Tabelle nach Sektoren sortiert"
 
-#: fdisk/cfdisk.c:2292
-#, fuzzy
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t – Tabelle mit den reinen Daten"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Das Programm beenden ohne die Partitionstabelle zu schreiben"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Den Dateisystemtyp ändern"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Einheit für die Größenanzeige ändern"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Wechselt zwischen MB, Sektoren und Zylindern"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Die Partitionstabelle auf die Festplatte schreiben (großes W)"
 
 # or "Da dieses ..." ?
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Da dies Daten auf der Festplatte zerstören kann, müssen"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             Sie das Schreiben mit „yes“ oder „no“ bestätigen oder"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             ablehnen"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pfeil-hoch   Den Cursor zur vorherigen Partition bewegen"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pfeil-runter Den Cursor zur nächsten Partition bewegen"
 
 # "Baut den Bildschirm neu auf"
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "Strg-L       Zeichnet den Bildschirm erneut"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Diese Hilfe anzeigen"
 
 # "Hinweis"
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Hinweis: Alle Befehle können mit Klein- oder Großbuchstaben "
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "eingegeben werden (außer W zum Schreiben)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr " Zylinder"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Die Anzahl der Zylinder ändern"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Köpfe"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Die Anzahl der Köpfe ändern"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Die Anzahl der Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Fertig"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Ändern der Geometrie beenden"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Geben Sie die Anzahl der Zylinder ein: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Ungültiger Wert für die Anzahl der Zylinder"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Geben Sie die Anzahl der Köpfe ein: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Ungültiger Wert für die Anzahl der Köpfe"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Geben Sie die Anzahl der Sektoren pro Spur ein: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Ungültiger Wert für die Anzahl der Sektoren"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Geben Sie den Dateisystemtyp ein: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Der Dateisystemtyp kann nicht auf „leer“ gesetzt werden"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Der Dateisystemtyp kann nicht auf „erweitert“ gesetzt werden"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unb(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Unbekannt (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Festplatte: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Größe: %lld Bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Größe: %lld Bytes, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Köpfe: %d   Sektoren pro Spur: %d   Zylinder: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Name"
 
 # I currently don't know a better translation
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flags"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part. Typ"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Dateisystemtyp"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Bezeichner]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Sektoren"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "   Zylinder"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr " Größe (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr " Größe (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr " Bootbar"
 
 # "Bootfähigkeit der aktuellen Partition ändern" (joey)
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "(De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
 # "Löschen"
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Löschen"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Die Festplattengeometrieparameter ändern (nur für Experten)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Hilfe"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Die Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maxim."
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximieren der Nutzung der aktuellen Partition (nur für Experten)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Neue"
 
 # "Erzeuge aus dem freien Bereich eine neue Partition"
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Neue Partition im freiem Bereich anlegen"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Ausgabe"
 
 # "Gib die Partitionstabelle auf dem Bildschirm oder in eine Datei aus"
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitionstabelle auf dem Bildschirm oder in Datei ausgeben"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Ende"
 
 # "Beende das Programm ohne die Partitionstabelle zu schreiben"
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Das Programm beenden, ohne die Partitionstabelle zu speichern"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Den Typ des Dateisystems (DOS, Linux, OS/2, etc.) ändern"
 
 # Maybe without the dot.
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Einheit."
 
 # "Ändert die Einheiten der Größenanzeige ("
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Zwischen den Einheiten für die Größenanzeige wechseln (MB, Sekt., Zyl.)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Schreib."
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Die Partitionstabelle schreiben (dies kann Daten zerstören)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Diese Partition kann nicht als bootfähig markiert werden"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Eine leere Partition kann nicht gelöscht werden"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Die Nutzung dieser Partition kann nicht maximiert werden"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Diese Partition ist unbenutzbar"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Diese Partition ist bereits in Benutzung"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Der Dateisystemtyp einer leeren Partition kann nicht geändert werden"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Keine weiteren Partitionen"
 
 # "Ungültige Taste"
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Unzulässiger Befehl"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2325,9 +2258,9 @@ msgstr ""
 "\n"
 "„BSD label“ für Gerät: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Befehl  Bedeutung"
 
@@ -2347,10 +2280,9 @@ msgstr "   i   Bootstrap installieren"
 msgid "   l   list known filesystem types"
 msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   Dieses Menü anzeigen"
 
@@ -2362,14 +2294,14 @@ msgstr "   n   Eine neue BSD-Partition anlegen"
 msgid "   p   print BSD partition table"
 msgstr "   p   Die BSD-Partitionstabelle anzeigen"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   Ende ohne Speichern der Änderungen"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   Zurück zum Hauptmenü"
 
@@ -2413,13 +2345,13 @@ msgid "BSD disklabel command (m for help): "
 msgstr "„BSD disklabel“ Befehl (m für Hilfe): "
 
 # %s can be "Sektor" or "Zylinder".
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Erster %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Letzter %s oder +Größe, +GrößeK oder +GrößeM"
@@ -2465,8 +2397,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2567,8 +2497,8 @@ msgstr "Sektoren/Spur"
 msgid "tracks/cylinder"
 msgstr "Spuren/Zylinder"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "Zylinder"
 
@@ -2625,7 +2555,7 @@ msgstr "Bootstrap auf %s installiert.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Die maximale Anzahl von Partitionen wurde erzeugt\n"
@@ -2649,7 +2579,7 @@ msgstr ""
 "\n"
 "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2671,7 +2601,7 @@ msgstr ""
 "-u: „Anfang“ und „Ende“ werden in Sektoren statt in Zylindern angegeben\n"
 "-b 2048: (für bestimmte MO-Geräte) 2048-Byte-Sektoren benutzen\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2688,202 +2618,188 @@ msgstr ""
 "        oder: fdisk /dev/ida/c0d0  (RAID-Festplatten)\n"
 "        ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Konnte %s nicht lesen\n"
 
 # "Konnte in %s nicht positionieren"
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Konnte in %s nicht positionieren\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Konnte %s nicht schreiben\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-IOCTL fehlgeschlagen bei %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Konnte keinen weiteren Speicher reservieren\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fataler Fehler\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   (De)Aktivieren eines Nur-Lese-Flags"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   „bsd disklabel“ bearbeiten"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   (De)Aktivieren des Mountable(Einhängbarkeit)-Flags"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   Eine Partition löschen"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   Eine neue Partition anlegen"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Eine neue leere DOS Partitionstabelle anlegen"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   Die Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Einen neuen leeren „Sun disklabel“ anlegen"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   Den Dateisystemtyp einer Partition ändern"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   Die Einheit für die Anzeige/Eingabe ändern"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   Die Partitionstabelle überprüfen"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr ""
 "   w   Die Tabelle auf die Festplatte schreiben und das Programm beenden"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Zusätzliche Funktionen (nur für Experten)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   Wählen der bootfähigen Partition"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   Bearbeiten des „bootfile“-Eintrags"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   Die sgi-swap-Partition auswählen"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   (De)Aktivieren des bootfähig-Flags"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   (De)Aktivieren des DOS Kompatibilitätsflags"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Die Anzahl der alternierenden Zylinder ändern"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   Die Anzahl der Zylinder ändern"
 
 # XXX
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Die „raw“-Daten der Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Die Anzahl der Extra-Sektoren pro Zylinder ändern"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   Die Anzahl der Köpfe ändern"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   Den Interleave-Faktor ändern"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Umdrehungsgeschwindigkeit ändern (U/min)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   Die Anzahl der Sektoren/Spur ändern"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Die Anzahl der physischen Zylinder ändern"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   Den Datenanfang einer Partition verschieben"
 
 # XXX – Or should this be "logical" instead of "extended" ?
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   Erweiterte Partitionen anzeigen"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   Eine IRIX-Partitionstabelle (SGI) anlegen"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   Partitionsreihenfolge korrigieren"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Sie müssen angeben"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "Köpfe"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "Sektoren"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2892,11 +2808,11 @@ msgstr ""
 "%s%s.\n"
 "Sie können dies im Zusatzfunktionsmenü tun.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " und "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2915,29 +2831,31 @@ msgstr ""
 "2) Boot- und Partitionierungssoftware anderer Betriebssysteme\n"
 "   (z. B. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ungültiges Offset in primärer erweiterter Partition\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
+"Warnung: Lasse Partition hinter #%d aus.\n"
+"Sie werden gelöscht, wenn Sie diese Partitionstabelle schreiben.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Warnung: zusätzlicher Link-Pointer in Partitionstabelle %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Warnung: ignoriere weitere Daten in Partitionstabelle %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2952,18 +2870,18 @@ msgstr ""
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Hinweis: Die Sektorgröße ist %d (nicht %d)\n"
 
 # XXX
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Sie werden die Partitionstabelle nicht schreiben können.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2972,7 +2890,7 @@ msgstr ""
 "Diese Platte hat sowohl DOS- als auch BSD-Magic.\n"
 "Nutzen Sie den „b“-Befehl, um in den BSD-Modus zu gehen.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2981,17 +2899,17 @@ msgstr ""
 "Das Gerät enthält weder eine gültige DOS-Partitionstabelle,\n"
 "noch einen „Sun“, „SGI“ oder „OSF disklabel“\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Die zusätzliche erweiterte Partition %d ignorieren\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3000,8 +2918,8 @@ msgstr ""
 "Warnung: Schreiben wird ungültiges Flag 0x%04x in Part.-tabelle %d "
 "korrigieren\n"
 
-#: fdisk/fdisk.c:1026
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1028
+#, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -3009,83 +2927,83 @@ msgstr ""
 "\n"
 "dreimalig EOF bekommen – beende...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Hex code (L um eine Liste anzuzeigen): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, Vorgabe: %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Benutze den Standardwert %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Wert außerhalb des Bereichs.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Warnung: Partition %d hat leeren Typ\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d ausgewählt\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Noch keine Partition definiert!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primären Partitionen sind schon definiert worden!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "Sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Die Einheit für die Anzeige/Eingabe ist nun %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WARNUNG: Partition %d ist eine erweiterte Partition\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-Kompatibilitätsflag ist gesetzt\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-Kompatibilitätsflag ist nicht gesetzt\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d existiert noch nicht!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3098,7 +3016,7 @@ msgstr ""
 "ist wahrscheinlich unklug. Sie können eine Partition\n"
 "mit dem „d“-Kommando löschen.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3107,7 +3025,7 @@ msgstr ""
 "Es ist nicht möglich, eine Partition in eine Erweiterte zu ändern oder\n"
 "umgekehrt.  Bitte löschen Sie die Partition zuerst.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3118,7 +3036,7 @@ msgstr ""
 "zu lassen, wie es SunOS/Solaris erwartet und sogar Linux es mag.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3130,52 +3048,52 @@ msgstr ""
 "als gesamte Platte zu lassen, wie es IRIX erwartet.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Der Dateisystemtyp der Partition %d ist nun %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d hat unterschiedliche phys./log. Anfänge (nicht-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d hat unterschiedliche phys./log. Enden:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "sollte sein (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i endet nicht an einer Zylindergrenze.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "sollte sein (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3184,7 +3102,7 @@ msgstr ""
 "\n"
 "Platte %s: %ld MByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3193,17 +3111,17 @@ msgstr ""
 "\n"
 "Platte %s: %ld.%ld GByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d Köpfe, %d Sektoren/Spuren, %d Zylinder"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", zusammen %llu Sektoren"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3212,7 +3130,7 @@ msgstr ""
 "Einheiten = %s von %d × %d = %d Bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3221,7 +3139,7 @@ msgstr ""
 "Keine Änderungen notwendig.  Die Anordnung ist schon korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3236,16 +3154,16 @@ msgstr ""
 # "   Device"
 # "    Gerät"
 # 2002-05-10 12:15:13 CEST -ke-
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s  boot.     Anfang        Ende     Blöcke   Id  System\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Gerät"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3254,7 +3172,7 @@ msgstr ""
 "\n"
 "Partitionstabelleneinträge sind nicht in Platten-Reihenfolge\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3267,83 +3185,83 @@ msgstr ""
 
 # Ist "Kp" eine gute Abkürzung für "Kopf" ?
 # Kf ist besser (2001-11-24 21:30:51 CET -ke-)
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Kp Sek  Zyl  Kp Sek  Zyl     Anfang     Größe ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Warnung: Partition %d enthält Sektor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: Kopf %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: Sektor %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partition %d: Zylinder %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partition %d: verheriger Sektor %d widerspricht sich mit gesamt %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Warnung: ungültiger Anfang-der-Daten in Partition %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Warnung: Partition %d überlappt mit Partition %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Warnung: Partition %d ist leer\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 "Logische Partition %d ist nicht vollständig in Partition %d enthalten\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Gesamtanzahl belegter Sektoren %d größer als Maximum %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld unbenutzte Sektoren\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partition %d ist schon festgelegt.  Vor Wiederanlegen bitte löschen.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Es sind keine freien Sektoren verfügbar\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3356,23 +3274,23 @@ msgstr ""
 "\tzuerst eine neue, leere DOS-Partitionstabelle (mit o).\n"
 "\tWARNUNG: Das zerstört den momentanen Inhalt Ihrer Platte.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Sie müssen erst eine Partion löschen und eine erweiterte anlegen.\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Alle logischen Partitionen sind in Benutzung\n"
 
 # "Ungültige primäre Partition"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Füge primäre Partition hinzu\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3383,20 +3301,20 @@ msgstr ""
 "   %s\n"
 "   p      Primäre Partition (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l      Logische Partition (5 oder größer)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e      Erweiterte"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ungültige Partitionsnummer für den Typ „%c“\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3405,12 +3323,12 @@ msgstr ""
 "Die Partitionstabelle wurde verändert!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Rufe ioctl() um Partitionstabelle neu einzulesen.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3423,7 +3341,7 @@ msgstr ""
 "Der Kernel benutzt noch die alte Tabelle.\n"
 "Die neue Tabelle wird beim nächsten Neustart verwendet.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3436,75 +3354,77 @@ msgstr ""
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "fdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/fdisk.c:2197
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2199
+#, c-format
 msgid ""
 "\n"
 "Error closing file\n"
-msgstr "Fehler beim Schließen von %s\n"
+msgstr ""
+"\n"
+"Fehler beim Schließen von Datei\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d hat keinen Datenbereich\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Neuer Datenanfang"
 
 # That sounds pretty ummm...
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Expertenkommando (m für Hilfe): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Anzahl der Zylinder"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Anzahl der Köpfe"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Anzahl der Sektoren"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Warnung: setze Sektoren-Offset für DOS-Kompatibilität\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Festplatte %s enthält keine gültige Partitionstabelle\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: Unbekannter Befehl\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Dieser Kernel stellt Sektorengröße selbst fest – Option -b ignoriert\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3513,17 +3433,16 @@ msgstr ""
 "Warnung: Option -b (Sektorengröße setzen) sollte nur mit einem\n"
 "angegebenen Gerät benutzt werden\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Ein ODF/1-Disklabel auf %s entdeckt, gehe in Disklabel-Modus.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Befehl (m für Hilfe): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3532,16 +3451,16 @@ msgstr ""
 "\n"
 "Momentane Bootdatei ist: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Bitte geben Sie den Namen der neuen Boot-Datei an: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot-Datei unverändert\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3608,15 +3527,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux Swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3639,7 +3558,7 @@ msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "SGI-Disklabel mit falscher Prüfsumme entdeckt.\n"
 
 #: fdisk/fdisksgilabel.c:200
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors\n"
@@ -3654,11 +3573,11 @@ msgstr ""
 "%d Zylinder, %d physische Zylinder\n"
 "%d Extrasekt./Zyl, Interleave %d:1\n"
 "%s\n"
-"Einheiten = %s mit %d × 512 Bytes\n"
+"Einheiten = %s mit %d × %d Bytes\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
@@ -3667,7 +3586,7 @@ msgid ""
 msgstr ""
 "\n"
 "Platte %s („SGI disklabel“): %d Köpfe, %d Sektoren, %d Zylinder\n"
-"Einheiten: %s mit %d × 512 Bytes\n"
+"Einheiten: %s mit %d × %d Bytes\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:220
@@ -3695,7 +3614,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s Sektor%5u Größe%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3752,7 +3670,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Mehr als ein Eintrag für ‚gesamte Platte‘ vorhanden.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Keine Partitionen definiert\n"
@@ -3837,7 +3755,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tSie haben einen unüblichen Boot-Dateinamen gewählt.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3860,11 +3777,10 @@ msgstr ""
 "Geben Sie JAWOHL ein, wenn Sie sicher sind, diese\n"
 "Partition von anderem Typ sein lassen zu wollen.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "JAWOHL\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3932,6 +3848,9 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"Warnung:  BLKGETSIZE-Ioctl fehlgeschlagen auf %s. Benutze "
+"Geometriezylinderwert\n"
+"von %d. Dieser Wert kann für Geräte > 33,8 GB abgeschnitten sein.\n"
 
 #: fdisk/fdisksgilabel.c:741
 #, c-format
@@ -3943,44 +3862,43 @@ msgstr "Versuche, Parameter der Partition %d zu erhalten.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tANFANG=%d\tLÄNGE=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Leer"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS Swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Gesamte Platte"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3993,12 +3911,12 @@ msgstr ""
 "Zylinder und Partitionen, setzen müssen oder mit einem\n"
 "frischen Label beginnen (s im Hauptmenü).\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Autoconfigure gefunden bei %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4013,7 +3931,7 @@ msgstr ""
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -4023,79 +3941,82 @@ msgstr ""
 "   ?   Auto-Konfiguration\n"
 "   0   von Hand (mit Voreinstellungen aus der Hardwareerkennung)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
-msgstr ""
+msgstr "Typ wählen (? für Auto, 0 für von Hand): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Auto-Konfiguration fehlgeschlagen.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektoren/Spur"
 
-#: fdisk/fdisksunlabel.c:323
+# XXX Oder abwechselnde?
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
-msgstr ""
+msgstr "Alternative Zylinder"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
-msgstr ""
+msgstr "Physikalische Zylinder"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
-msgstr ""
+msgstr "Rotationsgeschwindigkeit (U/min)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
-msgstr ""
+msgstr "Interleave-Faktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
-msgstr ""
+msgstr "Extra-Sektoren pro Zylinder"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
-msgstr ""
+msgstr "Sie können alle Plattenparameter aus dem x-Menü heraus ändern"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5″-Diskette"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partition %d überlappt mit anderen in Sektoren %d–%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Unbenutzter Bereich – Sektor 0–%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Unbenutzter Bereich – Sektor %d–%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
+"Andere Partition überdecken bereits die ganze Platte.\n"
+"Löschen/verkleinern Sie sie vor einem erneuten Versuch.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4103,14 +4024,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4119,7 +4040,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4131,7 +4052,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4144,18 +4065,18 @@ msgstr ""
 "Einheiten: %s mit %d × 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr ""
+msgstr "%*s Flag    Start       Ende   Blöcke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
-msgstr ""
+msgstr "Anzahl der alternierenden Zylinder"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
-msgstr ""
+msgstr "Anzahl der physikalischen Zylinder"
 
 #: fdisk/i386_sys_types.c:7
 msgid "FAT12"
@@ -4177,33 +4098,27 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Erweiterte"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
 # "bootfähig"
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX bootfähig"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Bootmanager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4212,7 +4127,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4305,12 +4219,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4331,8 +4243,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4342,7 +4252,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD / SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4363,12 +4272,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux Swap / Solaris"
@@ -4386,9 +4293,8 @@ msgid "NTFS volume set"
 msgstr "NTFS volume set"
 
 #: fdisk/i386_sys_types.c:62
-#, fuzzy
 msgid "Linux plaintext"
-msgstr "Linux ext3"
+msgstr "Linux Plaintext"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4398,12 +4304,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4412,7 +4316,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4477,30 +4380,22 @@ msgstr "Nicht-DS-Daten"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4509,118 +4404,111 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekundär"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Seek-Fehler auf %s – kann nicht nach %lu springen\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr ""
+msgstr "Seek-Fehler: wollte 0x%08x%08x, bekam 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "Speicher ist aufgebraucht – Abbruch\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Fehler beim Lesen von %s – Sektor %lu konnte nicht gelesen werden\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
-msgstr ""
+msgstr "FEHLER: Sektor %lu hat keine MS-DOS-Signatur\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 "Fehler beim Schreiben auf %s – der Sektor %lu konnte nicht geschrieben "
 "werden\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "Fehler beim Schreiben auf %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "Speicher aufgebraucht?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "Konnte das Gerät %s nicht zum Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Fehler beim Schreiben des Sektors %lu auf %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Festplatte %s: Die Geometrie konnte nicht festgestellt werden\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4628,29 +4516,29 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4659,27 +4547,27 @@ msgstr ""
 "\n"
 "Festplatte %s: %lu Zylinder, %lu Köpfe, %lu Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4688,42 +4576,42 @@ msgstr ""
 "Id  Name\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Die Partitionstabelle wird erneut gelesen...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fehler beim Schließen von %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: es gibt keine derartige Partition\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# Partitionstabelle von %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr ""
+msgstr "nicht implementiertes Format – benutze %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4733,12 +4621,12 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Gerät  boot. Anfang   Ende  #Zyl.    #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4747,12 +4635,12 @@ msgstr ""
 "Einheit = Sektoren von 512 Bytes, Zählung beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Gerät  boot.   Anfang      Ende  #Sektoren Id  System\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4761,12 +4649,12 @@ msgstr ""
 "Einheit = Blöcke von 1024 Bytes, Zählung beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Gerät  boot.  Anfang      Ende   #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4776,31 +4664,31 @@ msgstr ""
 "beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Gerät  boot. Anfang Ende   MiB    #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Keine Partitionen gefunden\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4808,86 +4696,86 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
 # XXX – Merge with next strings.
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
 # XXX – Merge with next strings.
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Warnung: Partition %s fängt bei Sektor 0 an\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
-msgstr ""
+msgstr "Warnung: Partition %s reicht über das Ende der Platte hinaus\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Warnung: Partition %s beginnt nicht an einer Zylindergrenze\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Warnung: Partition %s endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4897,13 +4785,15 @@ msgstr ""
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird diese\n"
 "         Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
+"Warnung: Normalerweise kann man nur von primäre Partitionen booten.\n"
+"LILO ignoriert die „bootfähig“-Einstellung komplett.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4912,40 +4802,40 @@ msgstr ""
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird auf\n"
 "         dieser Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "Anfang"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Anfang: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "Ende"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Ende: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partition %s endet am Zylinder %ld, hinter dem Ende der Platte\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4953,348 +4843,342 @@ msgstr ""
 "Warnung: erweiterte Partition beginnt nicht an einer Zylindergrenze\n"
 "DOS und Linux werden den Inhalt unterschiedlich interpretieren.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "Zu viele Partitionen - ignoriere alle hinter Nr. (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "Partitionsbaum?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager erkannt – kann das nicht handhaben\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-Signatur gefunden – gebe auf\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "merkwürdig... eine erweiterte Partition der Größe 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "merkwürdig... eine BSD-Partition der Größe 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: nicht erkannte Partitiontabellentyp\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Die Option „-n“ wurde verwendet: Es wurde nichts verändert\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Speichern der alten Sektoren fehlgeschlagen – Abbruch\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "Zahl zu groß\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr ""
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Für mehr kein Platz\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "ungültige Eingabe\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "Zu viele Partitionen\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr ""
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
-msgstr "Konnte die Geometrie nicht aus der Partitionstabelle ableiten"
+msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "zusammen: %llu Blöcke\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Aufruf: sfdisk --print-id Gerät Partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Aufruf: sfdisk --change-id Gerät Partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Aufruf: sfdisk --id Gerät Partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "Man kann nur ein Gerät angeben (außer mit -l oder -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "Konnte %s nicht zum Lesen/Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "Konnte %s nicht zum Lesen öffnen\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
 # And again one for show_geometry()...
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld Zylinder, %ld Köpfe, %ld Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kann die Größe von %s nicht feststellen\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ungültiges Aktiv-Byte: 0x%x anstelle von 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5302,7 +5186,7 @@ msgstr ""
 "Fertig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5311,36 +5195,36 @@ msgstr ""
 "Sie haben %d aktive primäre Partitionen.  Dies spielt bei LILO keine Rolle,\n"
 "aber der DOS-MBR bootet nur Festplatten mit einer aktiven Partition.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr ""
+msgstr "Partition %s hat ID %x und ist nicht versteckt\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Diese Platte ist momentan in Benutzung.\n"
 
 # This is a stat()
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5348,66 +5232,66 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Alte Aufteilung:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Neue Aufteilung:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5416,7 +5300,7 @@ msgstr ""
 "Die neue Partitionstabelle wurde erfolgreich geschrieben\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5515,24 +5399,24 @@ msgstr "getopt (enhanced) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "Interner Fehler, kontaktieren Sie den Autor."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "von MILO gebootet\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Bösartige BCD-Uhr\n"
 
 # Egger
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "Uhrport auf 0x%x gestellt\n"
 
 # debug
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "„funky TOY“!\n"
@@ -5540,24 +5424,24 @@ msgstr "„funky TOY“!\n"
 # The second %s can be:
 # "clock read"
 # "set time"
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomares „%s“ schlug bei 1000 Iterationen fehl!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Konnte /dev/port nicht öffnen: %s"
 
 # Egger, not really nice
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Ich bekam keine Erlaubnis, weil ich es nicht versucht habe.\n"
 
 # Egger
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
@@ -5565,54 +5449,54 @@ msgstr ""
 
 # This is not the correct translation, but it
 # explains the situation better.
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Sie benötigen root-Rechte.\n"
 
 # debug
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Die Hardwareuhr läuft vermutlich in %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "lokaler Zeit"
 
 # merge with next
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Warnung: Unbekannte dritte Zeile in der adjtime-Datei\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Erwartet: „UTC“ oder „LOCAL“ oder nichts.)\n"
 
 # XXX
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Letzte Abweichungskorrektur vorgenommen bei %ld Sekunden nach 1969\n"
 
 # XXX
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Letzte Kalibrierung vorgenommen bei %ld Sekunden nach 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Hardwareuhr geht nach %s Zeit\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "unbekannter"
 
@@ -5621,45 +5505,45 @@ msgstr "unbekannter"
 #   kein sendeausfall... ich wart nur auf das anbrechen der nächsten für mich
 #   relevanten zeiteinheit.
 # Egger
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Warte auf Uhrtick...\n"
 
 # Egger
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "... erhielt Uhrtick\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Ungültige Werte in Hardwareuhr: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Zeit der Hardwareuhr: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld Sekunden seit 1969\n"
 
 # Egger
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Zeit gelesen aus Hardwareuhr: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Stelle die Hardwareuhr auf %.2d:%.2d:%.2d = %ld Sekunden seit 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Die Uhrzeit der Hardwareuhr wurde nicht verstellt – Testmodus.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5669,9 +5553,9 @@ msgstr ""
 "Es wird weiter gewartet, um die nächste ganze Sekunde zu erreichen.\n"
 
 # Die Registereinträge der Hardwareuhr enthalten Werte, die ungültig
-#   sind (z.B. der 50. Tag des Monats) oder ausserhalb des unterstützen
+#   sind (z.B. der 50. Tag des Monats) oder außerhalb des unterstützen
 #   Bereiches (z.B. das Jahr 2095) liegen.
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5681,23 +5565,23 @@ msgstr ""
 "Monats), oder die Werte liegen außerhalb des Bereiches, der unterstützt\n"
 "wird (z.B. das Jahr 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f Sekunden\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date-Argument zu lang\n"
 
 # The english version is already a little misleading.
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5706,21 +5590,21 @@ msgstr ""
 "Der Wert der „--date“-Option ist kein gültiges Datum.\n"
 "Es darf kein Anführungszeichen enthalten.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Der „date“-Befehl wird aufgerufen: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "Konnte „date“ nicht in der /bin/sh-Shell starten. popen() schlug fehl"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "Ausgabe des „date“-Befehls: %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5736,7 +5620,7 @@ msgstr ""
 "Die Ausgabe war:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5754,12 +5638,12 @@ msgstr ""
 "  %s\n"
 
 # Egger, fixed %s->%d
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "Die Zeichenkette %s entspricht %ld Sekunden seit 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5769,40 +5653,40 @@ msgstr ""
 "es nicht möglich, die Systemzeit zu setzen.\n"
 
 # debug
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "settimeofday() wird aufgerufen:\n"
 
 # not much to translate
 # debug
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
 # not much to translate
 # debug
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Keine Änderung an der Systemuhr vorgenommen – Testmodus.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Sie müssen root sein, um die Systemuhr zu verändern.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() schlug fehl"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5811,7 +5695,7 @@ msgstr ""
 "Der Driftfaktor wird nicht verändert, da die Hardwareuhr vorher keinen "
 "sinnvollen Wert enthielt.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5822,7 +5706,7 @@ msgstr ""
 "ist, also die Aufzeichnungen beschädigt sind und die Kalibrierung von neuem\n"
 "starten muss.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5832,7 +5716,7 @@ msgstr ""
 "letzten Kalibrierung vergangen ist.\n"
 
 # Egger
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5844,13 +5728,13 @@ msgstr ""
 "Der Faktor wird um %4$f Sekunden/Tag geändert.\n"
 
 # Egger
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Es vergingen %d Sekunden seit der letzten Anpassung.\n"
 
 # Egger
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
@@ -5858,14 +5742,14 @@ msgstr ""
 "Sekunden zugegriffen werden\n"
 
 # merge with next
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Die adjtime Datei wird nicht aktualisiert – Testmodus \n"
 
 # "Hätte das folgende in die Datei %s geschrieben:\n"
 # passiv, Konjunktiv in der Umschreibungsform
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5875,13 +5759,13 @@ msgstr ""
 "%s"
 
 # "Abweichungsparameter"
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Die Abweichungsparameter wurden nicht verändert.\n"
 
 # "anpassen"
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5890,31 +5774,31 @@ msgstr ""
 "werden.\n"
 
 # "Justierung"
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "Da die Anpassung weniger als eine Sekunde betragen hätte, wird sie nicht "
 "durchgeführt.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Benutze %s.\n"
 
 # "Schnittstelle"
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Keine brauchbare Uhrschnittstelle gefunden.\n"
 
 # "stellen"
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Konnte die Systemuhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5929,19 +5813,19 @@ msgstr ""
 "gemacht.\n"
 
 # Egger
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Kann den Epochenwert nicht vom Kernel bekommen.\n"
 
 # Egger
 # "Epochenwert"
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernel geht von einem Epochenwert von %lu aus.\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5950,19 +5834,26 @@ msgstr ""
 "Um den Epochenwert zu ändern, müssen sie die „epoch“-Option benutzen, um "
 "anzugeben auf welchen Wert er gesetzt werden soll.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Der Epochenwert wird nicht auf %d gesetzt – Testmodus.\n"
 
 # Egger
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kann den Epochenwert im Kernel nicht ändern.\n"
 
+# "mkfs aus util-linux-2.10d"
+# "mkfs von util-linux-2.10d"
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s von %s\n"
+
 # "Universalzeit"
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6023,7 +5914,7 @@ msgstr ""
 "  --noadjfile   nicht auf /etc/adjtime zugreifen; erfordert Benutzung von\n"
 "                 entweder --utc oder --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -6033,12 +5924,12 @@ msgstr ""
 "                hwclock mitteilen, um welchen Alpha-Typ es sich handelt\n"
 "                  (siehe hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s nimmt keine Nicht-Options-Argumente. Sie gaben %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6047,7 +5938,7 @@ msgstr ""
 "Sie haben mehrere Funktionen angefordert.\n"
 "Sie können immer nur eine Funktion gleichzeitig ausführen.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6056,7 +5947,7 @@ msgstr ""
 "%s: Die Optionen --utc und --localtime schließen sich aus. Sie gaben beide "
 "an.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6065,42 +5956,42 @@ msgstr ""
 "%s: Die Optionen --adjust und --noadjfile schließen sich aus. Sie gaben "
 "beide an.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Ohne --noadjfile müssen Sie entweder --utc oder --localtime angeben.\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Keine brauchbare Zeitangabe. Kann Uhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Sie müssen root sein, um die Hardwareuhr zu ändern.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Sie müssen root sein, um die Systemuhr zu ändern.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr "Sie müssen root sein, um den „epoch“-Wert zu ändern.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "Es wurde keine Zugriffsart gefunden, mit der auf die Hardwareuhr zugegriffen "
 "werden konnte.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6137,7 +6028,6 @@ msgstr "ioctl() konnte Zeit nicht von %s lesen."
 msgid "ioctl KDSHWCLK failed"
 msgstr "Ioctl KDSHWCLK fehlgeschlagen"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Konnte /dev/tty1 oder /dev/vc/1 nicht öffnen"
@@ -6233,9 +6123,6 @@ msgstr "ioctl(RTC_EPOCH_READ) auf %s fehlgeschlagen"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "Wir haben Epoche %ld aus %s mit dem RTC_EPOCH_READ-Ioctl gelesen.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6263,7 +6150,6 @@ msgstr "ioctl(RTC_EPOCH_SET) auf %s fehlt"
 msgid "calling open_tty\n"
 msgstr "calling open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "calling termio_init\n"
@@ -6272,7 +6158,6 @@ msgstr "calling termio_init\n"
 msgid "writing init string\n"
 msgstr "writing init string\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "before autobaud\n"
@@ -6286,7 +6171,6 @@ msgstr "waiting for cr-lf\n"
 msgid "read %c\n"
 msgstr "read %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "reading login name\n"
@@ -6341,7 +6225,6 @@ msgid "/dev/%s: not a character device"
 msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
 
 # debug
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6356,12 +6239,10 @@ msgstr "Konnte /dev/%s nicht als Standardeingabe öffnen: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: nicht offen für Lesen/Schreiben"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duping\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6404,32 +6285,27 @@ msgstr ""
 " oder:   [-hiLmw] [-l login_programm] [-t zeitlimit] [-I initstring] [-H "
 "login_host] zeile baud_rate,... [termtype]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: wenig Speicher, Einloggen könnte fehlschlagen\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "can't malloc for ttyclass"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "can't malloc for grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login on %s from %s denied by default.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login on %s from %s denied.\n"
@@ -6457,11 +6333,12 @@ msgstr "unbekannter Nutzerkontext"
 #, c-format
 msgid "%s: %s is not authorized to change the finger info of %s\n"
 msgstr ""
+"%s: %s ist nicht autorisiert, die Finger-Informationen für %s zu ändern\n"
 
 #: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: Kann keinen voreingestellten Kontext für /etc/passwd setzen"
 
 #: login-utils/chfn.c:173
 #, c-format
@@ -6474,8 +6351,8 @@ msgstr "Ändere finger-Information für %s.\n"
 msgid "Password error."
 msgstr "Passwort�Fehler."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Passwort: "
@@ -6501,7 +6378,7 @@ msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
-"[ -p Bureau-Telefon ]\n"
+"[ -p Büro-Telefon ]\n"
 "\t[ -h Heim-Telefon ] "
 
 #: login-utils/chfn.c:321
@@ -6550,7 +6427,7 @@ msgstr "„malloc“ schlug fehl"
 #: login-utils/chsh.c:137
 #, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: „%s“ ist nicht authorisiert, die Shell für %s zu ändern\n"
+msgstr "%s: „%s“ ist nicht autorisiert, die Shell für %s zu ändern\n"
 
 #: login-utils/chsh.c:157
 #, c-format
@@ -6558,11 +6435,14 @@ msgid ""
 "%s: Running UID doesn't match UID of user we're altering, shell change "
 "denied\n"
 msgstr ""
+"%s: Laufende UID stimmt nicht mit der UID des zu ändernden Nutzers überein,\n"
+"Shell-Änderung abgelehnt.\n"
 
 #: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr "%s: Ihre Shell fehlt in /etc/shells, Shell ändern ist fehlgeschlagen\n"
+msgstr ""
+"%s: Ihre Shell fehlt in /etc/shells, Shell-Änderung ist fehlgeschlagen\n"
 
 #: login-utils/chsh.c:170
 #, c-format
@@ -6653,34 +6533,6 @@ msgstr "Rufen Sie „%s -l“ auf, um die Liste zu sehen.\n"
 msgid "No known shells.\n"
 msgstr "Keine bekannten Shells.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "Konnte /dev/urandom nicht öffnen"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "konnte keine zufälligen Daten aus /dev/urandom lesen"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "Konnte %s nicht zum Lesen öffnen"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "stat(%s) fehlgeschlagen"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s hat nicht den korrekten Dateimodus"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "kann keine Daten von %s lesen"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6690,11 +6542,11 @@ msgstr "Kann %s nicht lesen, beende."
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "Aufruf: last [-#] [-f datei] [-t tty] [-h hostame] [nutzer ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  noch immer eingeloggt"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6703,15 +6555,15 @@ msgstr ""
 "\n"
 "wtmp beginnt %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: malloc-Fehlschlag.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6720,54 +6572,48 @@ msgstr ""
 "\n"
 "unterbrochen %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATAL: kann TTY nicht erneut öffnen: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "FATAL: ungültiges TTY"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h nur für den Superuser.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Aufruf: login [-fp] [Benutzername]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-Fehlschlag, breche ab: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Konnte PAM nicht initialisieren: %s"
 
 # unten nochmal mit NL
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Anmeldung: "
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
 # unten noch zwei mal mit anderen NL
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6777,17 +6623,17 @@ msgstr ""
 "\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6796,7 +6642,7 @@ msgstr ""
 "\n"
 "Login inkorrekt\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6805,137 +6651,122 @@ msgstr ""
 "\n"
 "Problem beim Aufsetzen der Sitzung, Abbruch.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Leerer Benutzername in %s:%d. Abbruch."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ungültiger Nutzername „%s“ in %s:%d. Abbruch."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Speicher ist alle!\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Ungültiger Nutzername"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s Login auf diesem Terminal verweigert.\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSED FROM %s ON TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSED ON TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login inkorrekt\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Bereits zu viele Nutzer eingeloggt.\n"
-"Versuchen Sie es später wieder.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Sie haben zu viele Prozesse am Laufen.\n"
-
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Sie haben neue E-Mail.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Sie haben E-Mail.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Kann keinen neuen Prozess erzeugen: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY fehlgeschlagen: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() fehlgeschlagen"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logge ein mit Heimatverzeichnis = „/“.\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: kein Speicher für Shellskipt.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: konnte Shellskipt nicht ausführen: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: keine Shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6944,69 +6775,69 @@ msgstr ""
 "\n"
 "%s Anmeldung: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Login-Name viel zu lang.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NAME zu lang"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Benutzernamen dürfen nicht mit einem „-“ anfangen.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "zu viele nackte Zeilenvorschübe\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "EXZESSIV viele Zeilenvorschübe"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login nach %d Sekunden abgebrochen\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Letzte Anmeldung: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "von %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "auf %.*s\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -7026,168 +6857,31 @@ msgstr "is n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Aufruf: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Wer sind Sie?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Keine solche Gruppe."
 
 # libc.po: "Keine Berechtigung"
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Keine Berechtigung"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Keine Shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Das Passwort muss mindesten 6 Zeichen haben, nochmal bitte.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Das Passwort muss Zeichen aus zwei der folgenden Klassen enthalten:\n"
-"Groß- und Kleinbuchstaben, Ziffern und nicht-alphanumerische Zeichen.\n"
-"Siehe auch passwd(1) für weitere Informationen.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Sie können das alte Passwort nicht wiederbenutzen.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Benutzen Sie bitte nicht etwas wie Ihren Nutzernamen als Passwort!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Benutzen Sie bitte nicht etwas wie Ihren echten Namen als Passwort!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Aufruf: passwd [nutzername [passwort]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Nur root kann die ein- und zweiargumentigen Formen benutzen.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Aufruf: passwd [-foqsvV] [nutzer [passwort]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Kann %s nicht ausführen: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kann Login-namen nicht finden"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Nur root kann das Passwort für andere ändern.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Zu viele Argumente.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Kann Nutzernamen nirgends finden. Ist „%s“ wirklich ein Nutzer?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Tut mir leid, ich kann nur lokale Passwörter ändern. Bitte yppasswd benutzen."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID und Nutzername stimmen nicht überein, Hochstapler!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Ändere Passwort für %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Altes Passwort: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Illegales Passwort, Hochstapler."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Neues Passwort: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Passwort nicht geändert."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Neues Passwort wiederholen: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Sie haben sich vertippt. Passwort nicht geändert."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "Passwort geändert, Nutzer %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT-PASSWORT GEÄNDERT"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "Passwort durch root geändert, Nutzer %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "rufe setpwnam, um Passwort zu setzen.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Passwort *NICHT* geändert. Später erneut versuchen.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Passwort geändert.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7236,7 +6930,6 @@ msgstr "neu gestartet durch %s: %s"
 msgid "halted by %s: %s"
 msgstr "angehalten durch %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7275,7 +6968,6 @@ msgstr "Fehler beim Ausführen\t%s\n"
 
 # XXX - Have to look at other OSs translation for Broadcast
 # Message
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7366,7 +7058,6 @@ msgstr "Fehler beim Setzen von „close-on-exec“ auf /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "Fehler beim „exec“ von finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "Fehler beim „fork“ von finalprog\n"
@@ -7395,7 +7086,7 @@ msgstr "Öffnen des Verzeichnisses fehlgeschlagen\n"
 msgid "fork failed\n"
 msgstr "„fork“ fehlgeschlagen\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "„exec“ fehlgeschlagen\n"
 
@@ -7436,7 +7127,7 @@ msgstr "Prozesserzeugung (fork): %s"
 #: login-utils/ttymsg.c:171
 #, c-format
 msgid "%s: BAD ERROR"
-msgstr ""
+msgstr "%s: BAD ERROR"
 
 #: login-utils/vipw.c:143
 #, c-format
@@ -7550,12 +7241,6 @@ msgstr "illegaler Wert für Monat: benutzen Sie 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "illegaler Wert für Jahr: benutzen Sie 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7566,14 +7251,13 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "Aufruf: cal [-13smjyV] [[Monat] Jahr]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Aufruf: %s [+Format] [Tag Monat Jahr]\n"
 
 # The rest is untranslated, leave it (MPi)
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tib’s Day"
 
@@ -7708,7 +7392,7 @@ msgstr "%s: Konnte %s nicht in %s umbenennen: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Aufrug: %s von nach Dateien...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7719,25 +7403,25 @@ msgstr ""
 "Benutzen Sie „%s [optionen] %s“, wenn Sie es tatsächlich starten wollen.\n"
 "Script nicht gestartet.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Aufruf: script [-a] [-f] [-q] [-t] [Datei]\n"
 
 # Not really nice...
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script wurde gestartet, die Datei ist %s\n"
 
 # The %s must be at the end, 'cause it contains the \n
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script wurde gestartet: %s"
 
 # The %s must be at the end, 'cause it contains the \n
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7746,254 +7430,253 @@ msgstr ""
 "\n"
 "Script beendet: %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script wurde beendet, die Datei ist %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Keine ptys mehr.\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Fehler bei den Argumenten; Aufruf:\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term Terminalname ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ Attribut ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabN = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabN = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-Anzahl_Konsolen] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-Anzahl_Konsolen] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file Dumpdateiname ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq Freqnummer ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "kann Stromsparmodus nicht (zurück)setzen\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "„klogctl“ Fehler: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Fehler beim Schreiben des Bildschirmdumps\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "konnte %s nicht lsesn, und kann Ioctl-Dump nicht durchführen\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: Die Umgebungsvariable TERM ist nicht gesetzt.\n"
@@ -8068,10 +7751,6 @@ msgstr "Warnung: Konnte %s nicht öffnen: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: Konnte %s nicht öffnen – benutze %s stattdessen\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8184,7 +7863,7 @@ msgstr "%s: Konnte kein Gerät /dev/loop# finden"
 #: mount/lomount.c:181
 #, c-format
 msgid "%s: no permission to look at /dev/loop#"
-msgstr ""
+msgstr "%s: Keine Zugriffsrechte, um auf /dev/loop# zu schauen"
 
 #: mount/lomount.c:184
 #, c-format
@@ -8204,7 +7883,7 @@ msgstr "%s: Konnte kein freies „loop“-Gerät finden"
 #: mount/lomount.c:287
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
-msgstr ""
+msgstr "Konnte kein Lock im Speicher bekommen, beende.\n"
 
 #: mount/lomount.c:340
 #, c-format
@@ -8277,31 +7956,31 @@ msgid "; rest of file ignored"
 msgstr "; der Rest der Datei wurde ignoriert"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: das Label %s gibt es sowohl auf %s als auch auf %s\n"
+msgstr "%s: Fehler: das Label %s gibt es sowohl auf %s als auch auf %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: werde %s mit %s einhängen\n"
+msgstr "mount: werde %s mittels UUID einhängen\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: werde %s mit %s einhängen\n"
+msgstr "mount: werde %s mittels Label einhängen\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount: konnte %s nicht öffnen, also können UUID- und LABEL-Konvertierung\n"
-"       nicht durchgeführt werden.\n"
+"%s: konnte %s nicht öffnen, also können UUID- und Label-Konvertierung  nicht "
+"durchgeführt werden.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: ungültige UUID"
+msgstr "%s: ungültige UUID"
 
 #: mount/mount.c:382
 #, c-format
@@ -8389,84 +8068,74 @@ msgstr "mount: Kann %s nicht zum Setzen der Geschwindigkeit öffnen"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: Diese Version wurde ohne Unterstützung für den Typ „nfs“ kompiliert"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: Mit NFS Version 4 fehlgeschlagen, versuche Version 3...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: konnte Dateisystemtyp nicht feststellen, und es wurde keiner angegeben"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: Sie müssen den Dateisystemtyp angeben"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: Einhängen ist fehlgeschlagen"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: Einhängepunkt %s ist kein Verzeichnis"
 
 # "mount: Zugriff verweigert"
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: keine Berechtigung"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: muss Superuser sein, um mount zu verwenden"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s wird gerade benutzt"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ist bereits eingehängt"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ist bereits eingehängt oder %s wird gerade benutzt"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: Einhängepunkt %s existiert nicht"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: Einhängepunkt %s ist eine symbolische Verknüpfung auf nirgendwo"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: Gerätedatei %s existiert nicht"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8475,87 +8144,92 @@ msgstr ""
 "mount: Spezialgerät %s existiert nicht\n"
 "       (ein Pfadpräfix ist kein Verzeichnis)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 "mount: %s ist noch nicht eingehängt oder es wurden\n"
 "       ungültige Optionen angegeben"
 
-#: mount/mount.c:966
-#, fuzzy, c-format
+#: mount/mount.c:959
+#, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 "mount: Falscher Dateisystemtyp, ungültige Optionen, der\n"
-"       „Superblock“ von %s ist beschädigt, fehlende Kodierungsseite\n"
-"       oder es sind zu viele Dateisysteme eingehängt"
+"       Superblock von %s ist beschädigt, fehlende\n"
+"       Kodierungsseite oder ein anderer Fehler"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
+"       (Ist dies vielleicht das IDE-Gerät, an welchem Sie eigentlich\n"
+"       ide-scsi benutzen, so dass sr0 oder sda oder so gebraucht wird?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
+"       (Versuchen Sie nicht eine erweiterte Partition einzuhängen\n"
+"       statt einer der logischen Partitionen darin?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"       Manchmal liefert das Syslog wertvolle Informationen – versuchen\n"
+"       Sie  dmesg | tail  oder so\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "Einhängetabelle ist voll"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: Konnte den Superblock nicht lesen"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: unbekanntes Gerät"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: unbekannter Dateisystemtyp „%s“"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: Wahrscheinlich meinten sie „%s“"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: Vielleicht meinten Sie „iso9660“?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: Vielleicht meinten Sie „vfat“?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s hat eine falsche Geräte-Nummer oder der\n"
 "       Dateisystemtyp %s wird nicht unterstützt"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ist kein blockorientiertes Gerät und „stat“ schlägt fehl?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8565,77 +8239,73 @@ msgstr ""
 "       Gerät (Vielleicht hilft „insmod Treiber“?)"
 
 # "versuchen"
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s ist kein blockorientiertes Gerät\n"
 "       (Vielleicht probieren Sie „-o loop“?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ist kein blockorientiertes Gerät"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ist kein gültiges blockorientiertes Gerät"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blockorientiertes Gerät "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: Konnte %s%s nicht im Nur-Lese-Modus einhängen"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
-msgstr "mount: %s%s is schreibgeschützt, doch Option „-w“ ist explizit gegeben"
+msgstr ""
+"mount: %s%s ist schreibgeschützt, doch Option „-w“ ist explizit gegeben"
 
 # That sounds somehow dumb.
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ist schreibgeschützt, wird eingehängt im Nur-Lese-Modus"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: kein Typ angegeben – aufgrund des Doppelpunkts wird NFS angenommen\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: kein Typ angegeben – aufgrund des //-Präfixes wird smbfs angenommen\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: „%s“ wird im Hintergrund fortgesetzt\n"
 
 # Not really nice
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: „%s“ schlug fehl\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ist bereits auf %s eingehängt\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8683,34 +8353,34 @@ msgstr ""
 "Weitere Optionen: [-nfFrsvw] [-o optionen] [-p passwdfd].\n"
 "Für viele weitere Details: man 8 mount.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: Nur „root“ kann dies tun"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nicht gefunden – Erzeuge sie...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: keine passende Partition gefunden"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: Hänge %s ein\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "nichts wurde eingehängt"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: Konnte %s nicht in %s finden"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: Konnte %s nicht in %s oder %s finden"
@@ -8752,99 +8422,99 @@ msgstr "       Werde den Typ %s versuchen\n"
 msgid "Trying %s\n"
 msgstr "Versuche %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: übermäßig langes host:dir-Argument\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: Mehrere Rechnernamen werden nicht unterstützt\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: einzuhängendes Verzeichnis nicht im host:dir-Format\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: Konnte die Adresse von %s nicht herausfinden\n"
 
 # unten nochmal als Frage, und für umount
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ungültige hp->h_length bekommen\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: übermäßig langes Options-Argument\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Warnung: unbekannte „proto=“-Option.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Warnung: Die Option „namlen“ wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "Unbekannter nfs-Mount-Parameter: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Warnung: Die Option „nolock“ wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "unbekannte nfs-Mount-Option: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ungültige hp->h_length bekommen?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS über TCP wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "NFS-Socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "NFS-bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "NFS-Server meldete Service als nicht verfügbar"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "Portmapper benutzt um NFS-Port zu finden\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "benutze Port %d für NFS-Dämonen\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "NFS-Verbindung"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "unbekannter NFS-Status-Rückgabewert: %d"
@@ -8853,8 +8523,8 @@ msgstr "unbekannter NFS-Status-Rückgabewert: %d"
 msgid "bug in xstrndup call"
 msgstr "Fehler im Aufruf von xstrndup"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8863,10 +8533,10 @@ msgid ""
 msgstr ""
 "Aufruf: %s [-hV]\n"
 "        %s -a [-e] [-v]\n"
-"        %s [-v] [-p Priorität] Spezialdatei ...\n"
+"        %s [-v] [-p Priorität] Spezialdatei|LABEL=Volume_Name ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8878,80 +8548,80 @@ msgstr ""
 "        %s [-v] Spezialdatei ...\n"
 
 # The first %s is swapon/swapoff
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s für %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: Kann das Gerät für %s nicht finden\n"
+msgstr "%s: Konnte das Gerät für %s nicht finden\n"
 
 # stat
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: Konnte „stat“ nicht auf %s anwenden: %s\n"
+msgstr "%s: Konnte „stat“ nicht auf %s anwenden: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "%s: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
 
 # holes
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: Überspringe die Datei %s – sie scheint Löcher zu enthalten.\n"
+msgstr "%s: Überspringe die Datei %s – sie scheint Löcher zu enthalten.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Nicht Superuser.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: Konnte %s nicht öffnen: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: Die Unterstützung für -f wurde nicht mit übersetzt\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "Rechner: %s, Verzeichnis: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: Konnte die Adresse von %s nicht herausfinden\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: ungültige hp->h_length bekommen\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: kein gültiges blockorientiertes Gerät"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s ist nicht eingehängt"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: Konnte den „Superblock“ nicht schreiben"
@@ -8960,64 +8630,62 @@ msgstr "umount: %s: Konnte den „Superblock“ nicht schreiben"
 # libc.po:
 # "Device or resource busy"
 # "Das Gerät oder die Ressource ist belegt"
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: Das Gerät wird momentan noch benutzt"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: Nicht gefunden"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: nur der Superuser kann umount durchführen"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: Blockgeräte auf Dateisystem nicht erlaubt"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "kein umount2, versuche umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "konnte %s nicht aushängen – versuche stattdessen %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s wird momentan noch benutzt – im Nur-Lese-Modus wiedereingehängt\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: konnte %s nicht im Nur-Lese-Modus wieder einhängen\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ausgehängt\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: Kann die Liste der Dateisysteme zum Aushängen nicht finden"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -9028,47 +8696,46 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t VFS-Typen] [-O optionen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis ...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
-msgstr "Kann nicht öffnen \"\"\n"
+msgstr "Kann \"\" nicht aushängen\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Versuche, %s auszuhängen\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Konnte %s nicht in „mtab“ finden\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ist laut „mtab“ nicht eingehängt"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s scheint mehrfach eingehängt zu sein"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: fstab enthält %s nicht (Nur root kann es aushängen)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount und fstab stimmen nicht überein"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: Nur %s kann %s von %s unmounten"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: Nur „root“ kann dies tun"
 
@@ -9088,6 +8755,8 @@ msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
+"Datei %s, für Schwellenwert %lu, maximale Zeichenzahl in FIFO war %d\n"
+"und die maximale Transferrate in Zeichen/Sekunde war %f\n"
 
 #: sys-utils/cytune.c:126
 #, c-format
@@ -9096,6 +8765,9 @@ msgid ""
 "in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
+"Datei %s, für Schwellenwert %lu und Auszeit-Wert %lu, maximale Zeichenzahl "
+"in FIFO war %d\n"
+"und die maximale Transferrate in Zeichen/Sekunde war %f\n"
 
 #: sys-utils/cytune.c:190
 #, c-format
@@ -9140,45 +8812,45 @@ msgstr "Konnte %s nicht öffnen: %s\n"
 #: sys-utils/cytune.c:258
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr ""
+msgstr "Kann %s nicht auf Schwelle %d setzen: %s\n"
 
 #: sys-utils/cytune.c:277
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr ""
+msgstr "Kann %s nicht auf Zeitschwelle %d setzen: %s\n"
 
 #: sys-utils/cytune.c:295 sys-utils/cytune.c:352 sys-utils/cytune.c:383
 #, c-format
 msgid "Can't get threshold for %s: %s\n"
-msgstr ""
+msgstr "Kann Schwelle für %s nicht ermitteln: %s\n"
 
 #: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
 #, c-format
 msgid "Can't get timeout for %s: %s\n"
-msgstr ""
+msgstr "Kann Auszeit für %s nicht ermitteln: %s\n"
 
 #: sys-utils/cytune.c:307
 #, c-format
 msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr ""
+msgstr "%s: %ld aktuelle Schwelle und %ld aktuelle Auszeit\n"
 
 #: sys-utils/cytune.c:310
 #, c-format
 msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr ""
+msgstr "%s: %ld voreingestellte Schwelle und %ld voreingestellte Auszeit\n"
 
 #: sys-utils/cytune.c:328
 msgid "Can't set signal handler"
-msgstr ""
+msgstr "Kann Signalhandler nicht ermitteln"
 
 #: sys-utils/cytune.c:332 sys-utils/cytune.c:367
 msgid "gettimeofday failed"
-msgstr ""
+msgstr "„gettimeofday“ fehlgeschlagen"
 
 #: sys-utils/cytune.c:345 sys-utils/cytune.c:377
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr ""
+msgstr "Kann kein CYGETMON auf %s auslösen: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
@@ -9209,15 +8881,16 @@ msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Aufruf: %s [-c] [-n Level] [-s Puffergröße]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: Unbekannte Option „-%c“\n"
+msgstr "flock: Unbekannte Option, breche ab.\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Aufruf: flock [--shared | --timeout=Sekunden] Dateiname Befehl {Arg Arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9348,7 +9021,7 @@ msgid ""
 "\t-a : all (default)\n"
 msgstr ""
 "\t-s : Semaphoren\n"
-"\r-a : alles (Voreinstellung)\n"
+"\t-a : alles (Voreinstellung)\n"
 
 #: sys-utils/ipcs.c:133
 #, c-format
@@ -9388,8 +9061,6 @@ msgstr ""
 msgid "------ Shared Memory Limits --------\n"
 msgstr "----- Gemeinsamer Speicher: Grenzen -----\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9558,11 +9229,11 @@ msgstr "Nicht gesetzt"
 
 #: sys-utils/ipcs.c:374
 msgid "dest"
-msgstr ""
+msgstr "Ziel"
 
 #: sys-utils/ipcs.c:375
 msgid "locked"
-msgstr ""
+msgstr "gesperrt"
 
 #: sys-utils/ipcs.c:395
 #, c-format
@@ -9693,7 +9364,7 @@ msgstr "zugewiesene Warteschlangen = %d\n"
 #: sys-utils/ipcs.c:513
 #, c-format
 msgid "used headers = %d\n"
-msgstr ""
+msgstr "benutzte Köpfe = %d\n"
 
 #: sys-utils/ipcs.c:514
 #, c-format
@@ -10176,18 +9847,18 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_datei] [-n länge] [-s überspringen] "
 "[datei ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 "Aufruf: %s [-dflpcsu] [+Zeilennummer | +/Muster] Dateiname1 Dateiname2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: Unbekannte Option „-%c“\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10198,8 +9869,7 @@ msgstr ""
 "*** %s: Verzeichnis ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10210,45 +9880,45 @@ msgstr ""
 "******** %s: Keine Textdatei ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Benutzen Sie q oder Q zum Beenden]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Mehr--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Nächste Datei: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Leertaste zum Fortfahren, ›q‹ zum Beenden.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "... %d Seiten zurück"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "... eine Seite zurück"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...überspringe eine Zeile"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...überspringe %d Zeilen"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10258,7 +9928,7 @@ msgstr ""
 "***Zurück***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10271,7 +9941,7 @@ msgstr ""
 "neue\n"
 "Voreinstellung wird.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10316,34 +9986,34 @@ msgstr ""
 ":f                      momentanen Dateinamen und Zeilennummer zeigen\n"
 ".                       letzten Befehl wiederholen\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Drücken Sie ›h‹ für Hilfe.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "„%s“ Zeile %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Keine Datei] Zeile %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Ãœberlauf\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...Ãœberspringe\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Fehler beim Ausführen von „re_exec()“"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10351,15 +10021,15 @@ msgstr ""
 "\n"
 "Muster wurde nicht gefunden\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Muster wurde nicht gefunden"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "Kann keinen neuen Prozess erzeugen\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10367,19 +10037,19 @@ msgstr ""
 "\n"
 "...Ãœberspringe "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Springe zu Datei"
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Springe zurück zu Datei "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Zeile ist zu lang"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Kein vorheriger Befehl, der eingefügt werden könnte"
 
@@ -10432,7 +10102,7 @@ msgstr "hexdump: Ungültiges Format {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ungültiges Umwandlungszeichen %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10440,84 +10110,81 @@ msgstr ""
 "%s: Aufruf: %s [-zahl] [-p zkette] [-cefnrs] [+zeile] [+/muster/] [dateien]\n"
 
 # libc: "Die Option „%s“ erfordert ein Argument\n"
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: Option erfordert ein Argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: unzulässige Option -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...springe vorwärts\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...springe rückwärts\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Keine nächste Datei"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Kein vorhergehende Datei"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Fehler beim Lesen aus %s-Datei\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: unerwartetes Dateiende in %s-Datei\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: unbekannter Fehler in %s-Datei\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Konnte keine temporäre Datei anlegen.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "Fehler in regulärem Ausdruck: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(Dateiende)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Kein gemerkter Suchtext"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Kann nicht öffnen "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "gespeichert"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !befehl im rflag-Modus nicht erlaubt.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() fehlgeschlagen, später versuchen\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Nächste Datei: "
 
@@ -10532,14 +10199,14 @@ msgid "usage: rev [file ...]\n"
 msgstr "Aufruf: rev [Datei ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "Konnte %s nicht zum Lesen öffnen\n"
+msgstr "Konnte „%s“ nicht zum Lesen öffnen\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "Aufruf: %s [Datei]\n"
+msgstr "Aufruf: tailf Logdatei\n"
 
 #: text-utils/ul.c:141
 #, c-format
@@ -10571,6 +10238,156 @@ msgstr "Eingabezeile ist zu lang.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Ungültige Nummer: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaxfehler: „%s“\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Keine solche Parametermenge: „%s“\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] Gerät Name\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] gerät größe sekt köpfe spuren stretch lücke rate spec1 "
+#~ "fmt_lücke\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] Gerät\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] Gerät\n"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "Konnte /dev/urandom nicht öffnen"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "konnte keine zufälligen Daten aus /dev/urandom lesen"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "Konnte %s nicht zum Lesen öffnen"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "stat(%s) fehlgeschlagen"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s hat nicht den korrekten Dateimodus"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "kann keine Daten von %s lesen"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Bereits zu viele Nutzer eingeloggt.\n"
+#~ "Versuchen Sie es später wieder.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Sie haben zu viele Prozesse am Laufen.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Das Passwort muss mindesten 6 Zeichen haben, nochmal bitte.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Das Passwort muss Zeichen aus zwei der folgenden Klassen enthalten:\n"
+#~ "Groß- und Kleinbuchstaben, Ziffern und nicht-alphanumerische Zeichen.\n"
+#~ "Siehe auch passwd(1) für weitere Informationen.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Sie können das alte Passwort nicht wiederbenutzen.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "Benutzen Sie bitte nicht etwas wie Ihren Nutzernamen als Passwort!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "Benutzen Sie bitte nicht etwas wie Ihren echten Namen als Passwort!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Aufruf: passwd [nutzername [passwort]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Nur root kann die ein- und zweiargumentigen Formen benutzen.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Aufruf: passwd [-foqsvV] [nutzer [passwort]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Kann %s nicht ausführen: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kann Login-namen nicht finden"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Nur root kann das Passwort für andere ändern.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Zu viele Argumente.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Kann Nutzernamen nirgends finden. Ist „%s“ wirklich ein Nutzer?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Tut mir leid, ich kann nur lokale Passwörter ändern. Bitte yppasswd "
+#~ "benutzen."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID und Nutzername stimmen nicht überein, Hochstapler!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Ändere Passwort für %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Altes Passwort: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Illegales Passwort, Hochstapler."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Neues Passwort: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Passwort nicht geändert."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Neues Passwort wiederholen: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Sie haben sich vertippt. Passwort nicht geändert."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "Passwort geändert, Nutzer %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT-PASSWORT GEÄNDERT"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "Passwort durch root geändert, Nutzer %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "rufe setpwnam, um Passwort zu setzen.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Passwort *NICHT* geändert. Später erneut versuchen.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Passwort geändert.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: Diese Version wurde ohne Unterstützung für den Typ „nfs“ kompiliert"
+
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Warnung: lasse Partitionen hinter %d aus\n"
 
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
new file mode 100644
index 000000000..fedb6a06d
--- /dev/null
+++ b/po/en@boldquot.header
@@ -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 --git a/po/en@quot.header b/po/en@quot.header
new file mode 100644
index 000000000..a9647fc35
--- /dev/null
+++ b/po/en@quot.header
@@ -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.
+#
diff --git a/po/es.gmo b/po/es.gmo
new file mode 100644
index 000000000..e546cfaef
--- /dev/null
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index cd4ce6a48..e0fc5ba0a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2004-12-22 01:31+0100\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -119,7 +119,7 @@ msgstr "%s: error de ioctl en %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "uso:\n"
@@ -164,13 +164,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "uso: %s [ -n ] dispositivo\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s de %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -195,7 +194,7 @@ msgstr "Doble densidad"
 msgid "Single"
 msgstr "Simple densidad"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -210,103 +209,103 @@ msgstr ""
 " -v         es más explicativo\n"
 " fichero    fichero que se comprueba\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: ¡error %d al descomprimir! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: error de tamaño en el enlace simbólico `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  descomprimiendo bloque en %ld a %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: modo falso en `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  hueco en %ld (%d)\n"
 
 # No me gusta. Se admiten sugerencias.
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: No bloque (%ld) bytes\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: No tamaño (%ld vs %ld) bytes\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: cramfs inválido, longitud de ruta errónea\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: se ha compilado sin soporte para -x\n"
 
 # FIXME: Sobra el espacio final
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 "%s: atención, no se puede determinar el tamaño del sistema de ficheros\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s no es un dispositivo de bloques o un fichero\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: cramfs inválido, longitud de fichero demasiado corta\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: cramfs inválido, magia errónea\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 "%s: atención, longitud de fichero demasiado grande, ¿imagen desplazada?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: error de crc, cramfs inválido\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: atención, imagen cramfs antigua, sin CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: cramfs inválido, supoerbloque erróneo\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: cramfs inválido, el final de los datos de directorios (%ld)\n"
 "es distinto del comienzo de los datos de ficheros (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -790,7 +789,7 @@ msgstr "demasiados nodos-i; el máximo es 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "no hay suficiente espacio, se necesitan al menos %lu bloques"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -860,18 +859,18 @@ msgstr "error al escribir la entrada `..'"
 msgid "error closing %s"
 msgstr "error al cerrar %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Uso: mkfs [-V] [-t tipo_sf] [opciones_sf] dispositivo [tamaño]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: ¡No queda memoria!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versión %s (%s)\n"
@@ -935,7 +934,6 @@ msgstr ""
 "Se excedió MAXENTRIES. Incremente este valor en mkcramfs.c y recompile.\n"
 "Saliendo.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -991,10 +989,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "falló la escritura de la imagen ROM (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1075,7 +1069,6 @@ msgstr "No se pueden escribir los nodos-i"
 msgid "write failed in write_block"
 msgstr "Error de escritura en write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1111,7 +1104,7 @@ msgstr "Error de búsqueda durante comprobación de bloques"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores extraños en do_check: probablemente existan errores\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "Error de búsqueda en check_blocks"
 
@@ -1155,109 +1148,109 @@ msgstr "No se puede ejecutar `stat' sobre %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "No se intentará crear el sistema de ficheros en '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "El tamaño de página %d especificado por el usuario es incorrecto\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Se utiliza el tamaño de página %d especificado por el usuario,\n"
 "en lugar de los valores del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Presuponiendo páginas de tamaño %d (no %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "etiqueta"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTAMPÁG] /dev/nombre [bloques]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "Hay demasiadas páginas incorrectas"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "No queda memoria"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "Una página incorrecta\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu páginas incorrectas\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: error: no se ha especificado dónde configurar el espacio de intercambio\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: error: el tamaño %lu es superior al tamaño del dispositivo %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: error: versión desconocida %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: error: el área de intercambio debe tener como mínimo %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: atención: el área de intercambio se trunca a %ldkB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr ""
 "%s: error: no se ha especificado dónde configurar el espacio de intercambio\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "No se intentará crear el dispositivo de intercambio en '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "muy grave: no se puede leer la primera página"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1272,115 +1265,77 @@ msgstr ""
 "Si realmente desea crear el espacio de intercambio swap v0 en dicho\n"
 "dispositivo, utilice la opción -f para forzar la operación.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "No se puede configurar el espacio de intercambio: no se puede leer"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Configurando espacio de intercambio versión %d, tamaño = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "No se puede rebobinar el dispositivo de intercambio"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "No se puede escribir la página de firma"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync ha fallado"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Número inválido: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Error de sintaxis: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Este parámetro no está establecido: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] dispositivo nombre\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] disp. tamaño sect. cabez. pistas stretch gap rate spec1 "
-"fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] dispositivo\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] dispositivo\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilizable"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Espacio libre"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Se ha modificado el disco.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
@@ -1388,7 +1343,7 @@ msgstr ""
 "bien\n"
 "actualizada.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1401,333 +1356,314 @@ msgstr ""
 "particiones DOS 6.x, consulte la página de manual de cfdisk\n"
 "para obtener más información.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERROR MUY GRAVE"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Pulse una tecla para salir de cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "No se puede buscar en la unidad de disco"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "No se puede leer la unidad de disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "No se puede escribir en la unidad de disco"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Hay demasiadas particiones"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "La partición empieza antes del sector 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "La partición termina antes del sector 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "La partición empieza después del fin de disco"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "La partición termina después del fin de disco"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partición termina en el último cilindro parcial"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "Las particiones lógicas no están en orden de disco"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "Solapamiento de particiones lógicas"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "Solapamiento de particiones lógicas ampliadas"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "¡¡¡¡ Error interno al crear unidad lógica sin partición extendida !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "No se puede crear una unidad lógica aquí; se crearían dos particiones "
 "extendidas"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 "Elemento de menú demasiado largo; la apariencia del menú puede ser extraña."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menú sin dirección; la opción predeterminada es horizontal."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Tecla no permitida"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Pulse una tecla para continuar"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Crea una nueva partición primaria"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Lógica"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Crea una nueva partición lógica"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "No crea ninguna partición"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "¡¡¡¡ Error interno !!!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Tamaño (en MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Principio"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Añade la partición al principio del espacio libre"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Añade la partición al final del espacio libre"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "No hay espacio para crear la partición extendida"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "No hay tabla de particiones.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "No hay tabla de particiones. Se comienza con una tabla vacía."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Firma errónea en la tabla de particiones"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Tipo de tabla de particiones desconocido"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "¿Quiere comenzar con una tabla vacía? [y/N]"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Ha especificado más cilindros de los que caben en el disco"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "No se puede abrir la unidad de disco"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 "El disco abierto es de sólo lectura; no tiene permiso para escribir en él"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "No se puede obtener el tamaño del disco"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partición primaria incorrecta"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partición lógica incorrecta"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "¡Atención!: esta operación puede destruir datos del disco"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "¿Está seguro de que desea escribir la tabla de particiones en el disco?\n"
 "     (sí o no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "No se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "sí"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Por favor escriba `sí' (con acento) o `no'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Se está escribiendo la tabla de particiones en el disco..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Se ha escrito la tabla de particiones, pero la nueva lectura de la tabla\n"
 "ha fallado. Reinicie para actualizar la tabla."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ninguna partición primaria está marcada como iniciable.\n"
 "El MBR de DOS no podrá iniciar esto."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Hay marcada como iniciable más de una partición primaria.\n"
 "El MBR de DOS no puede iniciar esto."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Escriba el nombre de fichero o pulse Intro para visualizar en pantalla: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "No se puede abrir el fichero '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidad de disco: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
 # Masculino, porque se refiere a un tipo de partición.
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Ninguno"
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Lóg"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primaria"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Lógica"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Inicio"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
 # Masculino, porque se refiere a "Indicadores"
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Ninguno"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabla de particiones para %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "              Primer     Último\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1735,7 +1671,7 @@ msgstr ""
 "Nº Tipo       Sector      Sector   Despl.  Longitud  Tipo sist. fich. (ID) "
 "Indicad.\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1743,475 +1679,472 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Inicio----      -----Final----   Comienzo   Número de\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr "Nº Ind.  Cab. Sec. Cil.  ID  Cab. Sec. Cil.    Sector    Sectores\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "En bruto (raw)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Imprime la tabla utilizando el formato de datos en bruto"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sectores"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Imprime la tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabla"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Sólo imprime la tabla de particiones"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "No imprime la tabla"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla de ayuda para cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk es un programa de particiones de disco basado en curses que"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "permite crear, suprimir y modificar particiones en la unidad"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "de disco duro."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Orden        Significado"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-----        -----------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Conmuta el indicador de iniciable de la partición actual"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Suprime la partición actual"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Cambia los parámetros de cilindros, cabezas y sectores por pista"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ATENCIÓN: Se recomienda utilizar esta opción únicamente"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             si se conoce el funcionamiento de la misma."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza la utilización del disco de la partición actual"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Esta opción puede hacer que la partición sea"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             incompatible con DOS, OS/2,..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Crea una nueva partición a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Imprime la tabla de particiones en la pantalla o en un fichero"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Hay varios formatos distintos para la partición"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             entre los que puede elegir:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Datos en bruto (exactamente lo que escribiría en el "
 "disco)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabla con formato en bruto"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Cambia el tipo de sistema de ficheros"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
 "  u          Cambia las unidades de visualización del tamaño de la partición"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, sectores y cilindros"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Escribe la tabla de particiones en el disco (W en mayúsculas)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Esta operación de escritura puede causar la destrucción"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             de datos del disco, por lo que debe confirmarla o rechazarla"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             escribiendo `sí' o `no'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Flecha arriba  Desplaza el cursor a la partición anterior"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Flecha abajo   Desplaza el cursor a la partición siguiente"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Vuelve a dibujar la pantalla"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: todas las órdenes pueden escribirse en mayúsculas o minúsculas"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "(salvo W para operaciones de escritura)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Cambia la geometría de cilindros"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Cabezas"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Cambiar geometría de cabezas"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Cambiar geometría de sectores"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Ha finalizado la operación de cambio de geometría"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Escriba el número de cilindros: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros no permitido"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Escriba el número de cabezas: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Valor de cabezas no permitido"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Escriba el número de sectores por pista: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Valor de sectores no permitido"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Escriba el tipo de sistema de ficheros: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a vacío"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a extendido"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Lóg"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconocido (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unidad de disco: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Tamaño: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Tamaño: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Cabezas: %d   Sectores por pista: %d   Cilindros: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nombre"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Indicadores"
 
 # Este espacio inicial es para que no se pegue con la s de Indicadores
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr " Tipo"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Tipo de S.F."
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Sectores"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cilindros"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr " Tamaño(MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "Tamaño (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Iniciable"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Conmuta el indicador de iniciable de la partición actual"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Suprimir"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Suprime la partición actual"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometría"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Cambia la geometría del disco (sólo para usuarios avanzados)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Ayuda"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximiza el uso de disco de la partición actual (sólo usuarios avanzados)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nueva"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Crea una nueva partición a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Imprimir"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Imprime la tabla de particiones en la pantalla o en un fichero"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Salir"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Cambia el tipo de sistema de ficheros (DOS, Linux, OS/2, etc.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Cambia las unidades para el tamaño de la partición (MB, sect., cil.)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Escribir"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Escribe la tabla de particiones en el disco (puede destruirse información)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "No se puede convertir esta partición en una partición iniciable"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "No se puede suprimir una partición vacía"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "No se puede maximizar esta partición"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Esta partición se encuentra en estado inutilizable"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Esta partición ya está en uso"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "No se puede cambiar el tipo de una partición vacía"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "No hay más particiones"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Orden ilegal"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2283,9 +2216,9 @@ msgstr ""
 "\n"
 "Etiqueta BSD para el dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Orden  Acción"
 
@@ -2305,10 +2238,9 @@ msgstr "   i   Instala secuencia de inicio"
 msgid "   l   list known filesystem types"
 msgstr "   l   Lista los tipos de sistemas de ficheros conocidos"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   Imprime este menú"
 
@@ -2320,14 +2252,14 @@ msgstr "   n   Añade una nueva partición BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   Imprime la tabla de particiones BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   Sale sin guardar los cambios"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   Vuelve al menú principal"
 
@@ -2371,13 +2303,13 @@ msgstr "No hay ninguna partición *BSD en %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Orden de etiqueta de disco BSD (m para obtener ayuda): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primer %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Último %s o +tamaño o +tamañoM o +tamañoK"
@@ -2422,8 +2354,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2524,8 +2454,8 @@ msgstr "sectores/pista"
 msgid "tracks/cylinder"
 msgstr "pistas/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cilindros"
 
@@ -2582,7 +2512,7 @@ msgstr "Secuencia de inicio instalada en %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partición (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Se ha creado el número máximo de particiones\n"
@@ -2606,7 +2536,7 @@ msgstr ""
 "\n"
 "Se están sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2627,7 +2557,7 @@ msgstr ""
 "-u: Obtener Principio y Final en sectores (en lugar de cilindros)\n"
 "-b 2048: (Para algunas unidades MO) Utilizar sectores de 2048 bytes\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2643,198 +2573,184 @@ msgstr ""
 "  o:  fdisk /dev/rd/c0d0  o fdisk /dev/ida/c0d0  (para dispositivos RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "No se puede leer %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "No se puede buscar en %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "No se puede escribir %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE ha fallado en %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "No se puede asignar más memoria\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Error muy grave\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   Conmuta el indicador de sólo lectura"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   Modifica la etiqueta de disco bsd"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   Conmuta indicador de montable"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   Suprime una partición"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   Lista los tipos de particiones conocidos"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   Añade una nueva partición"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Crea una nueva tabla de particiones DOS vacía"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   Imprime la tabla de particiones"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Crea una nueva etiqueta de disco Sun"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   Cambia el identificador de sistema de una partición"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   Cambia las unidades de visualización/entrada"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   Verifica la tabla de particiones"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   Escribe la tabla en el disco y sale"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Funciones adicionales (sólo para usuarios avanzados)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   Selecciona partición iniciable"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   Modifica entrada de fichero de inicio"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   Selecciona partición de intercambio sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   Conmuta el indicador de iniciable"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   Conmuta el indicador de compatibilidad con DOS"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Cambia el número de cilindros alternativos"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   Cambia el número de cilindros"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Imprime los datos en bruto de la tabla de particiones"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Cambia el número de sectores adicionales por cilindro"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   Cambia el número de cabezas"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   Cambia el factor de interleave"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Cambia la velocidad de rotación (r.p.m.)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   Cambia el número de sectores por pista"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Cambia el número de cilindros físicos"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   Mueve el principio de los datos de una partición"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   Lista las particiones extendidas"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   Crea una tabla de particiones IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   Corrige el orden de las particiones"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Debe establecer"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "cabezas"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sectores"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2843,11 +2759,11 @@ msgstr ""
 "%s%s.\n"
 "Puede efectuar esta operación desde el menú de funciones adicionales.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " y "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2866,12 +2782,12 @@ msgstr ""
 "2) software de arranque o particionamiento de otros sistemas operativos\n"
 "   (p.ej. FDISK de DOS, FDISK de OS/2)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplazamiento incorrecto en particiones extendidas primarias\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2880,19 +2796,19 @@ msgstr ""
 "Atención: se omiten las particiones después de la número %d.\n"
 "Se borrarán si guarda esta tabla de particiones.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Atención: puntero de enlace adicional en tabla de particiones %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Atención: no se tienen en cuenta los datos adicionales de la tabla de "
 "particiones %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2905,17 +2821,17 @@ msgstr ""
 "operación, el contenido anterior no se podrá recuperar.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: el tamaño del sector es %d (no %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "No podrá escribir la tabla de particiones.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2924,7 +2840,7 @@ msgstr ""
 "Este disco tiene tanto magia DOS como BSD.\n"
 "Utilice la orden 'b' para ir al modo BSD.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2933,17 +2849,17 @@ msgstr ""
 "El dispositivo no contiene una tabla de particiones DOS válida ni una "
 "etiqueta de disco Sun o SGI o OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Error interno\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "No se tiene en cuenta la partición extendida adicional %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2952,7 +2868,7 @@ msgstr ""
 "Atención: el indicador 0x%04x inválido de la tabla de particiones %d se "
 "corregirá mediante w(rite)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2961,83 +2877,83 @@ msgstr ""
 "\n"
 "se ha detectado EOF tres veces - saliendo...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Código hexadecimal (escriba L para ver los códigos): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, valor predeterminado %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Se está utilizando el valor predeterminado %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "El valor está fuera del rango.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Número de partición"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Atención: la partición %d es de tipo vacío\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Se ha seleccionado la partición %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "¡No hay ninguna partición definida!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "¡Ya se han definido todas las particiones primarias!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Se cambian las unidades de visualización/entrada a %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ATENCIÓN: la partición %d es una partición extendida\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "El indicador de compatibilidad con DOS está establecido\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "El indicador de compatibilidad con DOS no está establecido\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partición %d todavía no existe\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3050,7 +2966,7 @@ msgstr ""
 "tener particiones de tipo 0. Puede suprimir una\n"
 "partición con la orden `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3059,7 +2975,7 @@ msgstr ""
 "No puede convertir una partición en extendida ni viceversa.\n"
 "Primero debe suprimirla.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3070,7 +2986,7 @@ msgstr ""
 "ya que así lo prevé SunOS/Solaris e incluso es adecuado para Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3081,53 +2997,53 @@ msgstr ""
 "y la partición 11 como volumen completo (6) ya que IRIX así lo espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Se ha cambiado el tipo de sistema de la partición %d por %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "La partición %d tiene distintos principios físicos/lógicos (¿no Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " físicos=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lógicos=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partición %d tiene distintos finales físicos/lógicos:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partición %i no empieza en el límite del cilindro:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "debe ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partición %i no termina en un límite de cilindro.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "debe ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3136,7 +3052,7 @@ msgstr ""
 "\n"
 "Disco %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3145,17 +3061,17 @@ msgstr ""
 "\n"
 "Disco %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d cabezas, %d sectores/pista, %d cilindros"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", %llu sectores en total"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3164,7 +3080,7 @@ msgstr ""
 "Unidades = %s de %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3173,7 +3089,7 @@ msgstr ""
 "No hay nada que hacer. El orden ya es correcto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3183,17 +3099,17 @@ msgstr ""
 "Esto no parece una tabla de particiones\n"
 "Probablemente ha seleccionado el dispositivo que no era.\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Inicio    Comienzo      Fin      Bloques  Id  Sistema\n"
 
 # Nota: si se pone Dispositivo no queda bien el resto de la línea.
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Disposit."
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3202,7 +3118,7 @@ msgstr ""
 "\n"
 "Las entradas de la tabla de particiones no están en el orden del disco\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3213,83 +3129,83 @@ msgstr ""
 "Disco %s: %d cabezas, %d sectores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nº IA Cab Sect Cil Cab Sect Cil     Inicio    Tamaño ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Atención: la partición %d contiene el sector 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partición %d: el cabeza %d supera el máximo %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partición %d: el sector %d supera el máximo %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partición %d: el cilindro %d supera el máximo %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partición %d: sectores anteriores %d no concuerdan con total %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Atención: inicio de datos incorrecto en partición %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Atención: la partición %d se solapa con la partición %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Atención: la partición %d está vacía\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partición lógica %d no está por completo en la partición %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "El total de sectores asignados %d supera el máximo %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld sectores no asignados\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partición %d ya está definida. Suprímala antes de volver a añadirla.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ya está asignado\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "No hay disponible ningún sector libre\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3302,23 +3218,23 @@ msgstr ""
 "        tabla de particiones DOS vacía primero. (Use o.)\n"
 "        ATENCIÓN: Esto destruirá el contenido de este disco.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Primero debe suprimir alguna partición y añadir una partición extendida\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Se están usando todas las particiones lógicas\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Se añade una partición primaria\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3329,20 +3245,20 @@ msgstr ""
 "%s\n"
 "   p   Partición primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   Partición lógica (5 o superior)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   Partición extendida"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Número de partición inválido para el tipo `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3351,12 +3267,12 @@ msgstr ""
 "¡Se ha modificado la tabla de particiones!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Llamando a ioctl() para volver a leer la tabla de particiones.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3370,7 +3286,7 @@ msgstr ""
 "El núcleo todavía usa la tabla antigua.\n"
 "La nueva tabla se usará en el próximo reinicio.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3383,7 +3299,7 @@ msgstr ""
 "particiones DOS 6.x, consulte la página man de fdisk\n"
 "para ver información adicional.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -3392,71 +3308,71 @@ msgstr ""
 "\n"
 "Error al cerrar el fichero\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Se están sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partición %d no tiene ninguna área de datos\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nuevo principio de datos"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Orden avanzada (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Número de cilindros"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Número de cabezas"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Número de sectores"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Atención: estableciendo desplazamiento de sector para compatibilidad con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "El disco %s no contiene una tabla de particiones válida\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: orden desconocida\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Este núcleo encuentra el tamaño del sector por sí mismo; no se tiene en "
 "cuenta la opción -b\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3465,19 +3381,18 @@ msgstr ""
 "Atención: la opción -b (establecer tamaño de sector) debe utilizarse con un "
 "dispositivo especificado\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco OSF/1 en %s, entrando en el modo de\n"
 "etiqueta de disco.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Orden (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3486,16 +3401,16 @@ msgstr ""
 "\n"
 "El fichero de inicio actual es: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Escriba el nombre del nuevo fichero de inicio: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "No se ha modificado el fichero de inicio\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3562,15 +3477,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3651,7 +3566,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sector%5u tamaño%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3709,7 +3623,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Existe más de una entrada de disco completo.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "No hay ninguna partición definida\n"
@@ -3795,7 +3709,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tHa elegido un nombre de fichero de inicio no habitual.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3817,11 +3730,10 @@ msgstr ""
 "Escriba SÍ si está seguro de querer dar una etiqueta distinta a esta "
 "partición.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "SÍ\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3900,44 +3812,43 @@ msgstr "Intentando conservar los parámetros de la partición %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tPRINCIPIO=%d\tLONGITUD=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Vacía"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disco completo"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3951,12 +3862,12 @@ msgstr ""
 "como cabezas, sectores, cilindros y particiones\n"
 "o forzar una nueva etiqueta (orden s en menú principal)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "La configuración automática ha encontrado %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3969,7 +3880,7 @@ msgstr ""
 "operación, el contenido anterior no se podrá recuperar.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3979,72 +3890,72 @@ msgstr ""
 "   ?   Con configuración automática\n"
 "   0   Personalizada (con valores predeterminados detectados por hardware)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Seleccionar tipo (? para automático, 0 para personalizado): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Error de configuración automática.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sectores/pista"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cilindros físicos"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Velocidad de rotación (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Factor de interleave"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Sectores adicionales por cilindro"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Puede cambiar todos los parámetros de disco desde el menú x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "Disquete 3,5 pulg."
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partición %d no termina en un límite de cilindro\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partición %d se solapa con otras en los sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Espacio no utilizado - sectores 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espacio no utilizado - sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4053,7 +3964,7 @@ msgstr ""
 "Ya hay otras particiones que abarcan el disco completo.\n"
 "Suprima algunas o reduzca su tamaño antes de volver a intentarlo.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4064,7 +3975,7 @@ msgstr ""
 "el valor %d %s que ha especificado se solapa con otra partición.\n"
 "La entrada que ha realizado se ha cambiado por %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4073,7 +3984,7 @@ msgstr ""
 "Si desea mantener la compatibilidad con SunOS/Solaris, se recomienda dejar\n"
 "esta partición como disco completo (5), con principio en 0, con %u sectores\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4087,7 +3998,7 @@ msgstr ""
 "Escriba SÍ si está seguro de que desea que la partición\n"
 "esté marcada con 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4106,7 +4017,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4119,16 +4030,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Indic.  Principio   Fin    Bloques  Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Número de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Número de cilindros físicos"
 
@@ -4152,32 +4063,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Extendida"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX bootable"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4186,7 +4091,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4279,12 +4183,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4305,8 +4207,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4316,7 +4216,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD o SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4337,12 +4236,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
@@ -4371,12 +4268,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "Hibernación de IBM Thinkpad"
@@ -4385,7 +4280,6 @@ msgstr "Hibernación de IBM Thinkpad"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4450,30 +4344,22 @@ msgstr "Datos sin SF"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Utilidad Dell"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4482,118 +4368,111 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "inicio Linux/PA-RISC"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secondary"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Error de búsqueda en %s; no se puede buscar en %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Error de búsqueda: se esperaba 0x%08x%08x, se ha obtenido 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "No queda memoria; se abandona el intento\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Error de lectura en %s; no se puede leer el sector %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERROR: el sector %lu no tiene una firma msdos\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Error de escritura en %s; no se puede escribir el sector %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "No se puede abrir el fichero de guardar sector de partición (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "Error de escritura en %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "No se puede ejecutar stat para fichero de restaurar partición (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "Tamaño incorrecto de fichero de restaurar partición; no se efectúa "
 "restauración\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "¿No queda memoria?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "No se puede abrir fichero de restaurar partición (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "Error al leer %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "No se puede abrir el dispositivo %s para escribir\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Error al escribir el sector %lu en %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: no se puede obtener la geometría\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: no se puede obtener el tamaño\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4604,22 +4483,22 @@ msgstr ""
 "disco entero. Usar fdisk con ella probablemente no tiene sentido.\n"
 "[Use la opción --force si realmente desea realizar esta operación.]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Atención: HDIO_GETGEO indica que hay %lu cabezas\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Atención: HDIO_GETGEO indica que hay %lu sectores\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Atención: HDIO_GETGEO indica que hay %lu cilindros\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4628,7 +4507,7 @@ msgstr ""
 "Atención: número improbable de sectores (%lu); normalmente 63 como máximo\n"
 "Esto causará problemas con el software que direccione con Cil./Cab./Sector\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4637,7 +4516,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabezas, %lu sectores/pista\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4645,7 +4524,7 @@ msgstr ""
 "%s de partición %s tiene un valor imposible para cabeza: %lu\n"
 "(debe estar entre 0 y %lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4654,7 +4533,7 @@ msgstr ""
 "%s de partición %s tiene un valor imposible para sector: %lu\n"
 "(debe estar entre 1 y %lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4663,7 +4542,7 @@ msgstr ""
 "%s de partición %s tiene un valor imposible para cilindros: %lu\n"
 "(debe estar entre 0 y %lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4672,12 +4551,12 @@ msgstr ""
 "Id  Nombre\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Volviendo a leer la tabla de particiones...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4685,31 +4564,31 @@ msgstr ""
 "La orden para volver a leer la tabla de particiones ha fallado.\n"
 "Reinicie el sistema ahora, antes de utilizar mkfs.\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Error al cerrar %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: esta partición no existe\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "Formato no reconocido; utilizando sectores\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabla de particiones de %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato no implementado; utilizando %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4718,12 +4597,12 @@ msgstr ""
 "Unidades = cilindros de %lu bytes, bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp.  Inic. Princ.   Fin   Nºcil    Nºbloq.   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4732,12 +4611,12 @@ msgstr ""
 "Unidades = sectores de 512 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp.  Inicio  Principio   Fin   Nº sect.  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4746,13 +4625,13 @@ msgstr ""
 "Unidades = bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp.  Inic.  Principio   Fin    Nºbloques Id  Sistema\n"
 
 # FIXME: ¿Qué es un mebibyte?
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4762,35 +4641,35 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp.  Inic Princ.  Fin    MiB    Nºbloques Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tprincipio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,%"
 "ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partición termina en el cilindro %ld, más allá del final del disco\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "No se ha encontrado ninguna partición\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4801,53 +4680,53 @@ msgstr ""
 "  para Cil./Cab./Sect.=*/%ld/%ld (en lugar de %ld/%ld/%ld).\n"
 "Para este listado se presupondrá esta geometría.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "No existe ninguna tabla de particiones.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Extrañamente sólo hay %d particiones definidas.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Atención: la partición %s tiene tamaño 0 pero no está marcada como vacía\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Atención: la partición %s tiene tamaño 0 y es iniciable\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Atención: la partición %s tiene tamaño 0 y principio distinto de cero\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Atención: la partición %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "no se encuentra dentro de la partición %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Atención: las particiones %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "y %s se solapan\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4856,17 +4735,17 @@ msgstr ""
 "Atención: la partición %s contiene parte de la tabla de particiones\n"
 "(sector %lu), y la destruirá cuando se llene\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Atención: la partición %s empieza en el sector 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Atención: la partición %s finaliza más allá del final del disco\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4874,17 +4753,17 @@ msgstr ""
 "Como máximo una de las particiones primarias puede ser extendida\n"
 " (aunque esto no es un problema bajo Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Atención: la partición %s no empieza en un límite de cilindro\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Atención: la partición %s no termina en un límite de cilindro\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4893,7 +4772,7 @@ msgstr ""
 "Esto no es poblema para LILO, pero el MBR de DOS no se iniciará con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4901,7 +4780,7 @@ msgstr ""
 "Atención: normalmente sólo es posible iniciar desde particiones primarias.\n"
 "LILO no tiene en cuenta el indicador de iniciable.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4911,11 +4790,11 @@ msgstr ""
 "Esto no es problema para LILO, pero el MBR de DOS no iniciará con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "comienzo"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4923,24 +4802,24 @@ msgstr ""
 "Partición %s: principio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "final"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partición %s: fin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%"
 "ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partición %s termina en el cilindro %ld, más allá del final del disco\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4949,7 +4828,7 @@ msgstr ""
 "Atención: se desplaza el comienzo de la partición extd de %ld a %ld\n"
 "(Solamente para visualizarlo. No se cambia su contenido.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4958,133 +4837,132 @@ msgstr ""
 "DOS y Linux interpretarán el contenido de forma diferente.\n"
 "\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "demasiadas particiones - se ignoran las posteriores al nº (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "¿árbol de particiones?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Administrador de disco detectado; no se puede tratar esto\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "Detectada firma DM6 - abandonando\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "Situación anómala: ¿partición extendida de tamaño 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "Situación anómala: ¿partición BSD de tamaño 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: tipo de tabla de particiones no reconocido\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Se ha especificado el indicador -n: no se ha producido ningún cambio\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Error al guardar los sectores antiguos; anulando la operación\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Error al escribir la partición en %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "Línea de entrada larga o incompleta; se abandona la operación\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "Error de entrada: se esperaba `=' después del campo %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "Error de entrada: carácter inesperado %c tras campo %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Entrada no reconocida: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "Número demasiado elevado\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "Datos extraños tras el número\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "No hay espacio para descriptor de partición\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "No se puede crear partición extendida adyacente\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "Demasiados campos de entrada\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "No queda más espacio\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Tipo no permitido\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Atención: el tamaño dado (%lu) supera el tamaño máximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Atención: partición vacía\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Atención: principio de partición incorrecto (antes %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Indicador de iniciable no reconocido; elija - o *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "¿Especificación parcial de cil,cab,sect?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Partición extendida en ubicación no esperada\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "Entrada incorrecta\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "Hay demasiadas particiones\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5096,48 +4974,44 @@ msgstr ""
 "<cil,cab,sec>\n"
 "Normalmente sólo debe especificar <principio> y <tamaño> (y quizás <tipo>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versión"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: similar a /dev/hda or /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "opciones útiles:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]:  Muestra el tamaño de una partición"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprime o cambia el identificador de partición"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Muestra las particiones de cada dispositivo"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [o --dump]:       Igual, pero con un formato adecuado para entrada\n"
 "                         posterior"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]:  Número de cilindros, etc. desde 1 y no desde 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5145,60 +5019,60 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Acepta/muestra en unidades de\n"
 "                         sectores/bloques/cilindros/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Muestra los tipos de particiones conocidos"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [o --DOS]:        Para compatibilidad con DOS: se pierde algo de "
 "espacio"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:    Hace que el núcleo vuelva a leer la tabla de\n"
 "                         particiones"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                Cambia únicamente la partición con el número #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 No escribe realmente en el disco"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fichero :         Guarda los sectores que se van a sobreescribir\n"
 "                         en `fichero'"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichero:          Restaura estos sectores de nuevo"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprime la versión"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprime este mensaje"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "opciones peligrosas:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]:  Imprime la idea del núcleo sobre la geometría"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
@@ -5206,7 +5080,7 @@ msgid ""
 msgstr ""
 "    -g [o --show-geometry]:  Imprime la idea del núcleo sobre la geometría"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5214,7 +5088,7 @@ msgstr ""
 "    -x [o --show-extended]:  Muestra también las particiones extendidas en\n"
 "                             salida o espera sus descriptores en entrada"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
@@ -5222,114 +5096,114 @@ msgstr ""
 "para\n"
 "                           Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:       Suprime mensajes de aviso"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Puede modificar la geometría detectada utilizando:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [o --cylinders #]: Establece el número de cilindros que se utilizarán"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 "    -H# [o --heads #]:     Establece el número de cabezas que se utilizarán"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S# [o --sectors #]:   Establece el número de sectores que se utilizarán"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Puede desactivar toda comprobación de coherencia con:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [o --force]:       Hace lo que ordene el usuario, aunque sea ilógico"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\t Enumera las particiones activas del dispositivo\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositivo n1 n2 ... activar particiones n1 ..., desactivar el resto\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An dispositivo\t activa la partición n, desactiva el resto\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "¿ninguna orden?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu bloques\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uso: sfdisk --print-id dispositivo número-partición\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "uso: sfdisk --change-id dispositivo número-partición Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uso: sfdisk --id dispositivo número-partición [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "puede especificar sólo un dispositivo (salvo con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "No se puede abrir %s para lectura-escritura\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "No se puede abrir %s para lectura\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcto\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindros, %ld cabezas, %ld sectores por pista\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte activo incorrecto: 0x%x en lugar de 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5337,7 +5211,7 @@ msgstr ""
 "Fin\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5346,35 +5220,35 @@ msgstr ""
 "Tiene %d particiones primarias activas. No tiene importancia para LILO,\n"
 "pero el MBR de DOS sólo puede iniciar discos con una partición activa.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partición %s tiene el identificador %x y no está oculta\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador %lx incorrecto\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Actualmente este disco está en uso.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Error muy grave: no se puede encontrar %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Atención: %s no es un dispositivo de bloques\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Comprobando que nadie esté utilizando este disco en este momento...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5389,30 +5263,30 @@ msgstr ""
 "esta\n"
 "comprobación.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "Correcto\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Situación anterior:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partición %d no existe; no se puede cambiar\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Situación nueva:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5421,23 +5295,23 @@ msgstr ""
 "nada.\n"
 "(Si realmente desea realizar esta operación, use la opción --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 "El sistema no encuentra adecuada esta operación; probablemente deba "
 "responder No\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "¿Está satisfecho con esta operación? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "¿Desea escribir esta información en el disco? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5446,16 +5320,16 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada antes de lo previsto\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Se está saliendo; no se ha cambiado nada\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda con una de las entradas siguientes: y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5464,7 +5338,7 @@ msgstr ""
 "La nueva tabla de particiones se ha escrito correctamente\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5571,133 +5445,133 @@ msgstr "getopt (mejorado) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "Error interno; contacte con el desarrollador."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "iniciado desde MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Reloj BCD Ruffian\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "puerto de reloj ajustado a 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: %s atómico ha fallado para 1000 iteraciones."
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "No se puede abrir /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "No se ha podido obtener permiso porque no se ha intentado.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s no puede obtener acceso al puerto de E/S: la llamada iopl(3) ha fallado.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Probablemente son necesarios los privilegios de usuario root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Se presupone que el reloj de hardware tiene la hora %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "local"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: atención: tercera línea no reconocida en el fichero adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Se esperaba: `UTC', `LOCAL' o nada.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Último ajuste de desfase realizado %ld segundos después de 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Última calibración realizada %ld segundos después de 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "El reloj de hardware tiene la hora %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "desconocido"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Esperando señal de reloj...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...recibida señal de reloj\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Valores inválidos en reloj de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hora del reloj de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos "
 "desde 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Hora leída del reloj de hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Estableciendo reloj de hardware en %.2d:%.2d:%.2d = %ld segundos desde 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "El reloj no se ha modificado; sólo se está probando.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5706,7 +5580,7 @@ msgstr ""
 "El tiempo transcurrido desde la hora de referencia es de %.6f segundos.\n"
 "Aumentando el retardo hasta el siguiente segundo completo.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5716,22 +5590,22 @@ msgstr ""
 "(por ejemplo, día 50 del mes) o exceden el rango que puede utilizarse\n"
 "(por ejemplo, el año 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f segundos\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "No se ha especificado la opción --date.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "argumento --date demasiado largo\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5740,23 +5614,23 @@ msgstr ""
 "El valor de la opción --date no es una fecha válida.\n"
 "En concreto, contiene comillas.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Ejecutando orden date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "No se puede ejecutar el programa 'date' en intérprete de órdenes /bin/sh. "
 "popen() ha fallado"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "respuesta de la orden date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5771,7 +5645,7 @@ msgstr ""
 "La respuesta fue:\n"
 "%s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5788,12 +5662,12 @@ msgstr ""
 "La respuesta fue:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "La cadena de fecha %s equivale a %ld segundos desde 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5802,38 +5676,38 @@ msgstr ""
 "El reloj de hardware no contiene una hora válida, por lo que no se puede "
 "establecer la hora del sistema a partir de ese valor.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Se está llamando settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "No se establece el reloj del sistema ya que la ejecución es en modo de "
 "prueba.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Debe ser superusuario para establecer el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ha fallado"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5842,7 +5716,7 @@ msgstr ""
 "No se ajusta el factor de desfase debido a que el reloj de hardware\n"
 "contenía anteriormente datos extraños.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5852,7 +5726,7 @@ msgstr ""
 "calibración es cero, así que el historial es erróneo y es necesaria una\n"
 "calibración desde el principio.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5861,7 +5735,7 @@ msgstr ""
 "No se ajusta el factor de desfase debido a que hace menos de un día que se\n"
 "realizó la última calibración.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5874,24 +5748,24 @@ msgstr ""
 "de\n"
 "desfase en %f segundos por día\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "El tiempo transcurrido desde el último ajuste es de %d segundos\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Es preciso insertar %d segundos y establecer como referencia la hora %.6f "
 "segundos hacia atrás\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "No se está actualizando el fichero adjtime debido al modo de prueba.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5900,12 +5774,12 @@ msgstr ""
 "Se habría escrito lo siguiente en %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Parámetros de ajuste del desfase no actualizados.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5913,29 +5787,29 @@ msgstr ""
 "El reloj de hardware no contiene una hora válida, por lo que no se puede "
 "ajustar.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "El ajuste necesario es inferior a un segundo, por lo que no se establece el "
 "reloj.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Utilizando %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "No se ha encontrado ninguna interfaz de reloj utilizable.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "No se puede establecer el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5948,17 +5822,17 @@ msgstr ""
 "Alpha (por lo que posiblemente no se está ejecutando en una máquina Alpha).\n"
 "No se efectúa ninguna acción.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "No se puede obtener el valor de época del núcleo.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "El núcleo presupone el valor de época %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5967,18 +5841,23 @@ msgstr ""
 "Para establecer el valor de época, debe utilizar la opción 'epoch' para "
 "indicar en qué valor debe definirse.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 "No se está estableciendo el valor de época en %d; sólo se está probando.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "No se puede establecer el valor de época en el núcleo.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s de %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6043,7 +5922,7 @@ msgstr ""
 "  --noadjfile   No accede a /etc/adjtime. Necesita del uso de --utc\n"
 "                o de --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -6053,12 +5932,12 @@ msgstr ""
 "                Indica al reloj de hardware el tipo de Alpha (ver hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s no admite argumentos que no sean opciones. Ha especificado %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6067,7 +5946,7 @@ msgstr ""
 "Ha especificado varias funciones.\n"
 "Sólo puede llevar a cabo una función a la vez.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6076,7 +5955,7 @@ msgstr ""
 "%s: las opciones --utc y --localtime se excluyen mutuamente. Ha especificado "
 "ambas.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6085,28 +5964,28 @@ msgstr ""
 "%s: las opciones --adjust y --noadjfile se excluyen mutuamente. Ha "
 "especificado ambas.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Con --noadjfile, debe especificarse o bien --utc o bien --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Hora no utilizable. No se puede establecer el reloj.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Únicamente el superusuario puede cambiar el reloj de hardware.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Únicamente el superusuario puede cambiar el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6115,12 +5994,12 @@ msgstr ""
 "Sólo el superusuario puede cambiar el valor de época del reloj de hardware "
 "del núcleo.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "No se puede acceder al reloj de hardware por ningún método conocido.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6156,7 +6035,6 @@ msgstr "ioctl() no ha podido leer la hora de %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "Error de ioctl KDGHWCLK"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "No se puede abrir /dev/tty1 o /dev/vc/1"
@@ -6253,9 +6131,6 @@ msgstr "Error de ioctl(RTC_EPOCH_READ) con %s"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "Se ha leído el valor de época %ld de %s con ioctl RTC_EPOCH_READ.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6283,7 +6158,6 @@ msgstr "Error de ioctl(RTC_EPOCH_SET) de %s"
 msgid "calling open_tty\n"
 msgstr "calling open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "calling termio_init\n"
@@ -6292,7 +6166,6 @@ msgstr "calling termio_init\n"
 msgid "writing init string\n"
 msgstr "writing init string\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "before autobaud\n"
@@ -6306,7 +6179,6 @@ msgstr "waiting for cr-lf\n"
 msgid "read %c\n"
 msgstr "read %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "reading login name\n"
@@ -6360,7 +6232,6 @@ msgstr "/dev: chdir() ha fallado: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: no es un dispositivo de caracteres"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6375,12 +6246,10 @@ msgstr "/dev/%s: no se puede abrir como entrada estándar: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: no abierto para lectura/escritura"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duping\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6425,30 +6294,25 @@ msgstr ""
 "cadena_inicialización] [-H host_inicio_sesión]línea velocidad_baudios,... "
 "[tipo_terminal]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: poca memoria; el inicio de sesión puede fallar\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "No se puede realizar asignación de memoria para ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "No se puede realizar asignación de memoria para grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Inicio de sesión en %s desde %s denegado de forma predeterminada.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Inicio de sesión en %s desde %s denegado.\n"
@@ -6494,8 +6358,8 @@ msgstr "Cambiando información de finger para %s.\n"
 msgid "Password error."
 msgstr "Error de contraseña."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Contraseña: "
@@ -6679,34 +6543,6 @@ msgstr "Utilice %s -l para ver una lista.\n"
 msgid "No known shells.\n"
 msgstr "No hay ningún intérprete de órdenes conocido.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "No se ha podido abrir /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "No se han podido leer datos aleatorios de /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "No se puede abrir %s para lectura"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "No se puede realizar stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s no tiene los modos de fichero correctos"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "No se puede leer datos de %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6716,11 +6552,11 @@ msgstr "No se puede leer %s; saliendo."
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "uso: last [-#] [-f fichero] [-t tty] [-h nombrehost] [usuario ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  todavía tiene iniciada la sesión"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6729,15 +6565,15 @@ msgstr ""
 "\n"
 "wtmp empieza %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: error de asignación de memoria (malloc).\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6746,51 +6582,45 @@ msgstr ""
 "\n"
 "interrumpido %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Error fatal: no se puede reabrir la terminal: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "ERROR FATAL: Terminal errónea"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h sólo para superusuario.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "uso: login [-fp] [nombreusuario]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: error de PAM; anulando: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "No se ha podido inicializar PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Inicio de sesión: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "Error de inicio de sesión %d desde %s para %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6799,17 +6629,17 @@ msgstr ""
 "Inicio de sesión incorrecto\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "Demasiados intentos de inicio de sesión (%d) desde %s para %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "Error de sesión de inicio de sesión desde %s para %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6818,7 +6648,7 @@ msgstr ""
 "\n"
 "Inicio de sesión incorrecto\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6827,136 +6657,121 @@ msgstr ""
 "\n"
 "Problema al iniciar la sesión, abortado.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "nombre de usuario NULO en %s:%d. Abortado."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Nombre de usuario inválido \"%s\" en %s:%d. Abortado."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: No queda memoria\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Nombre de usuario no permitido"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Inicio de sesión %s rechazado en este terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "Inicio de sesión %s rechazado desde %s en tty %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "Inicio de sesión %s rechazado en tty %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Inicio de sesión incorrecto\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Ya hay demasiados usuarios con una sesión iniciada.\n"
-"Inténtelo de nuevo más adelante.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Tiene demasiados procesos en ejecución.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "Conexión telefónica en %s por %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "Inicio de sesión con root en %s desde %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "Inicio de sesión con root en %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "Inicio de sesión en %s por %s desde %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "Inicio de sesión en %s por %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Tiene correo nuevo.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Tiene correo.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: error en fork: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "Fallo en TIOCSCTTY: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ha fallado"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hay ningún directorio %s\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Iniciando la sesión con directorio de inicio = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: no queda memoria para script de intérprete de órdenes.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 "login: no se ha podido ejecutar el script de intérprete de órdenes: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: no hay intérprete de órdenes: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6965,65 +6780,65 @@ msgstr ""
 "\n"
 "Inicio de sesión de %s: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Nombre de inicio de sesión demasiado largo.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "Nombre demasiado largo"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Los nombres de inicio de sesión no pueden empezar por '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "Demasiados avances de línea solos.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "Excesivos avances de línea"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "El inicio de sesión ha superado el tiempo de espera tras %d segundos\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Último inicio de sesión: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "desde %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Error de inicio de sesión desde %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Error de inicio de sesión en %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d errores de inicio de sesión desde %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d errores de inicio de sesión en %s, %s"
@@ -7043,173 +6858,30 @@ msgstr "es n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "uso: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: ¿quién es usted?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: este grupo no existe."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: permiso denegado"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "No hay ningún intérprete de órdenes"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
-"La contraseña debe tener como mínimo 6 caracteres; inténtelo de nuevo.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"La contraseña debe contener caracteres de al menos dos de las siguientes\n"
-"clases: letras mayúsculas y minúsculas, dígitos, y caracteres no "
-"alfanuméricos.\n"
-"Consulte passwd(1) para más información.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "No puede volver a utilizar la antigua contraseña.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"No utilice un valor como por ejemplo el nombre de usuario como contraseña.\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "No utilice un valor como por ejemplo su nombre real como contraseña.\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Uso: passwd [nombreusuario [contraseña]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-"Sólo el usuario root puede utilizar los formatos de uno y dos argumentos.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Uso: passwd [-foqsvV] [usuario [contraseña]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "No se puede ejecutar %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "No se puede encontrar el nombre de inicio de sesión"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Sólo el usuario root puede cambiar la contraseña de otros usuarios.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Hay demasiados argumentos.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"No se puede encontrar el nombre de usuario. ¿`%s' es realmente un usuario?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Este comando sólo puede cambiar las contraseñas locales. Utilice yppasswd en "
-"su lugar."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "El UID y el nombre de usuario no coinciden."
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Cambiando contraseña para %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Escriba la contraseña antigua: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Contraseña no permitida."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Escriba la nueva contraseña: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "No se ha cambiado la contraseña."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Vuelva a escribir la nueva contraseña: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Ha escrito de forma incorrecta la contraseña. No se ha cambiado."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "La contraseña ha cambiado; usuario %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "Contraseña de usuario root cambiada"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "Contraseña cambiada por usuario root; usuario %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "Llamando a setpwnam para establecer contraseña.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "*NO* se ha cambiado la contraseña. Inténtelo de nuevo más adelante.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Se ha cambiado la contraseña.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7256,7 +6928,6 @@ msgstr "reiniciado por %s: %s"
 msgid "halted by %s: %s"
 msgstr "detenido por %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7293,7 +6964,6 @@ msgstr "Ejecutando el programa \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Error al ejecutar \t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7388,7 +7058,6 @@ msgstr "error al establecer close-on-exec sobre /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "error al ejecutar finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "error al efectuar `fork' con finalprog\n"
@@ -7417,7 +7086,7 @@ msgstr "La apertura del directorio ha fallado\n"
 msgid "fork failed\n"
 msgstr "La bifurcación (fork) ha fallado\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "La ejecución (exec) ha fallado\n"
 
@@ -7568,12 +7237,6 @@ msgstr "Valor de mes no permitido: utilice 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "Valor de año no permitido: utilice 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7584,13 +7247,12 @@ msgstr "%s de %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "uso: cal [-13smjyV] [[mes] año]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "uso: %s [+formato] [día mes año]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Día de San Tibb"
 
@@ -7723,7 +7385,7 @@ msgstr "%s: fallo al cambiar el nombre de %s a %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "llamada: %s de los ficheros...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7734,22 +7396,22 @@ msgstr ""
 "Utilice `%s [opciones] %s' si quiere utilizarlo de verdad.\n"
 "No se inicia la transcripción.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "uso: script [-a] [-f] [-q] [-t] [fichero]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado; el fichero es %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado (%s)"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7758,254 +7420,253 @@ msgstr ""
 "\n"
 "Script terminado (%s)"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script terminado; el fichero es %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ha fallado\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "No quedan pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: error de argumento, uso\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nombre_terminal ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NUM_CONSOLAS] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLAS] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file nombreficherovuelco ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq númerofrecuencia ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "No se puede (des)activar el modo de ahorro de alimentación\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "Error de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Error al leer %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Error al escribir vuelco de pantalla\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "No se ha podido leer %s y no se puede efectuar vuelco de ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no está definido.\n"
@@ -8081,10 +7742,6 @@ msgstr "atención: no se puede abrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: no se ha podido abrir %s; en su lugar se utiliza %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8392,84 +8049,75 @@ msgstr "mount: no se puede abrir %s para establecer la velocidad"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no se puede bifurcar (fork): %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: esta versión se ha compilado sin soporte para el tipo `nfs'"
-
 # FIXME: Falta un . en el original.
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: falló con la versión 4 de nfs mount, probando con la 3...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: no se ha podido determinar el tipo de sistema de ficheros y no se ha\n"
 "especificado ninguno"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: debe especificar el tipo de sistema de ficheros"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: montaje erróneo"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: el punto de montaje %s no es un directorio"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: permiso denegado"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: debe ser superusuario para utilizar mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s está ocupado"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ya está montado"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ya está montado o %s está ocupado"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: el punto de montaje %s no existe"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: el punto de montaje %s es un enlace simbólico sin destino"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: el dispositivo especial %s no existe"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8478,12 +8126,12 @@ msgstr ""
 "mount: el dispositivo especial %s no existe\n"
 "       (un prefijo de ruta no es un directorio)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s no está montado todavía o una opción es incorrecta"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8493,7 +8141,7 @@ msgstr ""
 "       superbloque incorrecto en %s, falta la página de códigos,\n"
 "       o algún otro error"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8501,7 +8149,7 @@ msgstr ""
 "       (¿puede que este sea el dispositivo IDE donde está\n"
 "       usando ide-scsi de forma que se necesite sr0 o sda?"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8509,7 +8157,7 @@ msgstr ""
 "       (¿no estará intentando montar una partición extendida,\n"
 "       en lugar de alguna partición lógica que haya dentro?"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8517,52 +8165,51 @@ msgstr ""
 "   En algunos casos se encuentra información en syslog, pruebe\n"
 "   dmesg | tail   o algo parecido\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "tabla de dispositivos montados completa"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: no se puede leer el superbloque"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositivo desconocido"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: tipo de sistema de ficheros '%s' desconocido"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablemente quería referirse a %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: ¿quiere decir 'iso9660?'"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: ¿quiere decir 'vfat'?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s con número de dispositivo incorrecto o tipo de sistema de ficheros "
 "%s no soportado"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s no es un dispositivo de bloques y ¿stat falla?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8571,77 +8218,72 @@ msgstr ""
 "mount: el núcleo no reconoce %s como dispositivo de bloques\n"
 "       (¿tal vez `insmod driver'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s no es un dispositivo de bloques (pruebe `-o loop')"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no es un dispositivo de bloques"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s no es un dispositivo de bloques válido"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "dispositivo de bloques "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "umount: no se puede montar %s%s de sólo lectura"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s está protegido contra escritura pero se ha dado la opción `-w'"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s está protegido contra escritura; se monta como sólo lectura"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: no se ha especificado ningún tipo; se presupone nfs por los dos "
 "puntos\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: no se ha especificado ningún tipo; se presupone smbfs por el "
 "prefijo //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ejecutando en segundo plano \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: se abandona \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ya está montado en %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8690,34 +8332,34 @@ msgstr ""
 "Otras opciones: [-nfFrsvw] [-o opciones] [-p passwdfd].\n"
 "Escriba man 8 mount para saber mucho más.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: sólo el usuario root puede efectuar esta acción"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no se ha encontrado %s; se está creando...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: no se ha encontrado esta partición"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "no se ha montado nada"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: no se puede encontrar %s en %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: no se puede encontrar %s en %s o %s"
@@ -8752,98 +8394,98 @@ msgstr "       Se probará con el tipo %s\n"
 msgid "Trying %s\n"
 msgstr "Probando con %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argumento host:dir demasiado largo\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: atención: varios nombres de host no soportados\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: el directorio que se debe montar no tiene el formato host:dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: no se puede obtener la dirección para %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: valor incorrecto para hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argumento de opción demasiado largo\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Atención: opción proto= no reconocida.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Atención: la opción namlen no está soportada.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "Parámetro de montaje nfs desconocido: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Atención: la opción nolock no está soportada.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "Opción de montaje nfs desconocida: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ¿valor incorrecto para hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sobre TCP no está soportado.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "el servidor nfs informa de que el servicio no está disponible"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "Se ha utilizado el asignador de puertos para encontrar el puerto NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "Utilizando puerto %d para daemon de nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "Valor de retorno de nfs status desconocido: %d"
@@ -8852,7 +8494,7 @@ msgstr "Valor de retorno de nfs status desconocido: %d"
 msgid "bug in xstrndup call"
 msgstr "Error en la llamada xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8865,7 +8507,7 @@ msgstr ""
 "       %s [-v] [-p prioridad] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8876,142 +8518,140 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] especial ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s en %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: no se puede encontrar \"_stext\" en %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: no se puede ejecutar stat para %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: atención: %s tiene permisos %04o que no son seguros, se sugiere %"
 "04o\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: omitiendo el fichero %s; parece que tiene huecos.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "No es el superusuario.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: no se puede abrir %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sin soporte para -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: no se puede bifurcar (fork): %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, directorio: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: no se puede obtener la dirección para %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: valor incorrecto para hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de bloques inválido"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: no montado"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: no se puede escribir el superbloque"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: dispositivo ocupado"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: no se ha encontrado"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: debe ser superusuario para utilizar umount"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: dispositivos de bloques no permitidos en sistema de ficheros"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existe; se está probando con umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "no se ha podido ejecutar umount en %s; en su lugar se prueba con %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupado; se ha vuelto a montar como de sólo lectura\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: no se ha podido volver a montar %s como de sólo lectura\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no se puede encontrar lista de sistemas de ficheros para desmontar"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -9022,47 +8662,46 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opciones]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "No se puede desmontar \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Se está intentando ejecutar umount en %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No se puede encontrar %s en mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no está montado (según mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s se ha montado varias veces"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no está en fstab (y usted no es el usuario root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montaje de %s no concuerda con fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: sólo %s puede desmontar %s desde %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: sólo el usuario root puede efectuar esta acción"
 
@@ -9219,7 +8858,7 @@ msgstr "%s: opción desconocida \"-%c\"\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9393,8 +9032,6 @@ msgstr "el núcleo no está configurado para memoria compartida\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- Límites memoria compartida ----\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -10185,17 +9822,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fichero_fmt] [-n longitud] [-s omitir] "
 "[fichero ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "uso: %s [-dflpcsu] [+númlíneas | +/patrón] nombre1 nombre2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: opción desconocida \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10206,8 +9843,7 @@ msgstr ""
 "*** %s: directorio ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10218,45 +9854,45 @@ msgstr ""
 "*** %s: No es un fichero de texto ***\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Utilizar q o Q para salir]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Más--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Siguiente fichero: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Pulse la barra espaciadora para continuar; 'q' para salir.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...retroceder %d páginas"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...retroceder 1 página"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...omitiendo una línea"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...omitiendo %d líneas"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10266,7 +9902,7 @@ msgstr ""
 "***Atrás***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10280,7 +9916,7 @@ msgstr ""
 "Un asterisco (*) indica que el argumento será el nuevo valor "
 "predeterminado.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10326,34 +9962,34 @@ msgstr ""
 ":f                      Muestra el fichero actual y el número de línea\n"
 ".                       Repite la orden anterior\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pulse 'h' para consultar las instrucciones.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" línea %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[No es un fichero] línea %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Desbordamiento\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...omitiendo\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Error en expresión regular"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10361,15 +9997,15 @@ msgstr ""
 "\n"
 "Patrón no encontrado\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Patrón no encontrado"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "no se puede bifurcar\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10377,19 +10013,19 @@ msgstr ""
 "\n"
 "...Saltando "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Saltando al fichero "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Retrocediendo al fichero "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Línea demasiado larga"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "No hay ningún comando anterior para sustituir"
 
@@ -10444,92 +10080,89 @@ msgstr "hexdump: formato incorrecto {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: carácter de conversión %%%s incorrecto.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 "%s: Uso: %s [-número] [-p cadena] [-cefrns] [+línea] [+/patrón/] [ficheros]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: la opción necesita un argumento -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: opción ilegal -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...saltando hacia adelante\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...saltando hacia atrás\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "No hay ningún fichero siguiente"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "No hay ningún fichero anterior"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Error de lectura en el fichero %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF inesperado en el fichero %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Error desconocido en el fichero %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: No se puede crear un fichero temporal.\n"
 
 # ¿Qué significa?
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE error:"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "No se recuerda ninguna cadena de búsqueda"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "No se puede abrir "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "guardado"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": no se permite !orden en el modo rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "falló la llamada al sistema fork(), inténtelo de nuevo más adelante\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Siguiente fichero: "
 
@@ -10583,6 +10216,166 @@ msgstr "Línea de entrada demasiado larga.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "No queda memoria al aumentar el tamaño del búfer.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Número inválido: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Error de sintaxis: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Este parámetro no está establecido: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] dispositivo nombre\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] disp. tamaño sect. cabez. pistas stretch gap rate spec1 "
+#~ "fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] dispositivo\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] dispositivo\n"
+
+#~ msgid "version"
+#~ msgstr "versión"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "No se ha podido abrir /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "No se han podido leer datos aleatorios de /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "No se puede abrir %s para lectura"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "No se puede realizar stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s no tiene los modos de fichero correctos"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "No se puede leer datos de %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Ya hay demasiados usuarios con una sesión iniciada.\n"
+#~ "Inténtelo de nuevo más adelante.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Tiene demasiados procesos en ejecución.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "La contraseña debe tener como mínimo 6 caracteres; inténtelo de nuevo.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "La contraseña debe contener caracteres de al menos dos de las siguientes\n"
+#~ "clases: letras mayúsculas y minúsculas, dígitos, y caracteres no "
+#~ "alfanuméricos.\n"
+#~ "Consulte passwd(1) para más información.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "No puede volver a utilizar la antigua contraseña.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "No utilice un valor como por ejemplo el nombre de usuario como "
+#~ "contraseña.\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "No utilice un valor como por ejemplo su nombre real como contraseña.\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Uso: passwd [nombreusuario [contraseña]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr ""
+#~ "Sólo el usuario root puede utilizar los formatos de uno y dos "
+#~ "argumentos.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Uso: passwd [-foqsvV] [usuario [contraseña]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "No se puede ejecutar %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "No se puede encontrar el nombre de inicio de sesión"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr ""
+#~ "Sólo el usuario root puede cambiar la contraseña de otros usuarios.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Hay demasiados argumentos.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "No se puede encontrar el nombre de usuario. ¿`%s' es realmente un usuario?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Este comando sólo puede cambiar las contraseñas locales. Utilice yppasswd "
+#~ "en su lugar."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "El UID y el nombre de usuario no coinciden."
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Cambiando contraseña para %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Escriba la contraseña antigua: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Contraseña no permitida."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Escriba la nueva contraseña: "
+
+#~ msgid "Password not changed."
+#~ msgstr "No se ha cambiado la contraseña."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Vuelva a escribir la nueva contraseña: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Ha escrito de forma incorrecta la contraseña. No se ha cambiado."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "La contraseña ha cambiado; usuario %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "Contraseña de usuario root cambiada"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "Contraseña cambiada por usuario root; usuario %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "Llamando a setpwnam para establecer contraseña.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr ""
+#~ "*NO* se ha cambiado la contraseña. Inténtelo de nuevo más adelante.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Se ha cambiado la contraseña.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: esta versión se ha compilado sin soporte para el tipo `nfs'"
+
 #~ msgid "%s: not compiled with minix v2 support\n"
 #~ msgstr "%s: no se ha compilado con soporte para minix v2\n"
 
diff --git a/po/et.gmo b/po/et.gmo
new file mode 100644
index 000000000..bd123beed
--- /dev/null
+++ b/po/et.gmo
diff --git a/po/et.po b/po/et.po
index afe78aaea..685657637 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11r\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n"
 "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Kasutamine:\n"
@@ -162,13 +162,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "Kasutamine: %s [ -n ] seade\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s paketist %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -193,7 +192,7 @@ msgstr "Kahe"
 msgid "Single"
 msgstr "Ühe"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -203,97 +202,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, fuzzy, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: seekimise viga failis %s\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, fuzzy, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "peaks olema (%d, %d, %d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, fuzzy, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s pole kompileeritud minix v2 toega\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, fuzzy, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s pole flopiseade\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: viga võtmete analüüsimisel\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -769,7 +768,7 @@ msgstr "liiga palju i-kirjeid - maksimum on 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "pole piisavalt vaba ruumi, vaja oleks vähemalt %lu plokki"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Seade: %s\n"
@@ -838,18 +837,18 @@ msgstr "viga .. kirje kirjutamisel"
 msgid "error closing %s"
 msgstr "viga %s sulgemisel"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Kasutamine: mkfs [-V] [-t fstüüp] [fs-võtmed] seade [suurus]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Mälu sai otsa\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versioon %s (%s)\n"
@@ -892,7 +891,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -945,10 +943,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, fuzzy, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1021,7 +1015,6 @@ msgstr "ei suuda kirjutada i-kirjeid"
 msgid "write failed in write_block"
 msgstr "ploki kirjutamine ei õnnestunud"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1057,7 +1050,7 @@ msgstr "seek ei õnnestunud plokkide testimisel"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Imelikud väärtused funktsioonis do_check - ilmselt bugid\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "seek ei õnnestunud plokkide kontrollimisel"
 
@@ -1100,105 +1093,105 @@ msgstr "ei suuda stat'ida seadet %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "ei ürita luua failisüsteemi seadmele `%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Vigane kasutaja poolt määratud lehekülje suurus %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr "Kasutan etteantud lehekülje suurust %d, mitte süsteemseid %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Eeldan lehekülje suuruseks %d (mitte %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Kasutamine: %s [-c] [-v0|-v1] [-pLKSUURUS] /dev/nimi [plokke]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "liiga palju vigaseid lehekülgi"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Mälu sai otsa"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "üks vigane lehekülg\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d vigast lehekülge\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: Viga - ei ole öeldud, kuhu saalimisala tekitada\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: Viga - suurus %ld on suurem kui seadme maht %d\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: Viga - tundmatu versioon %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: Viga - saalimisala peab olema vähemalt %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: Hoiatus - piiran saalimisala %ld kB-ga\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: Viga - ei ole öeldud, kuhu saalimisala tekitada\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "ei ürita luua saalimisala seadmele `%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fataalne viga: esimene lehkülg pole kättesaadav"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1212,119 +1205,83 @@ msgstr ""
 "Saalimisala ei tekitataud. Kui Te tõesti soovite sellele seadmele\n"
 "v0 saalimisala tekitada, kasutage -f võtit selle sundimiseks.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Ei suuda saalimisala tekitada: seade pole loetav"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Tekitan saalimisala versiooniga %d, suurus = %lu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "ei suuda tagasi kerida saalimisseadet"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "ei suuda kirjutada signatuuriga lehekülge"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync ei õnnestunud"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Vigane arv: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Süntaksiviga: `%s´\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Ei tunne parameetrite komplekti `%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "%s [ -p ] seade nimi\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr "%s [ -p ] seade maht sekt päid radu stretch gap rate spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "%s [ -c | -y | -n | -d ] seade\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "%s [ -c | -y | -n ] seade\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Kasutamatu"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Vaba ruum"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Ketast sai muudetud\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr "Tehke algkäivitus, et uuendused mõjuma hakkaksid\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1337,331 +1294,312 @@ msgstr ""
 "partitsioone, lugege palun cfdisk'i manuali\n"
 "lisainformatsiooni hankimiseks.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "FATAALNE VIGA"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Vajuta mõnda klahvi cfdiskist väljumiseks"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Ei suuda kettal seekida"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Ei suuda kettalt lugeda"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Ei suuda kettale kirjutada"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Liiga palju partitsioone"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Partitsioon algab enne sektorit 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Partitsioon lõppeb enne sektorit 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Partitsioon algab pärast ketta lõppu"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Partitsioon lõppeb pärast ketta lõppu"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "Loogilised partitsioonid on füüsilisest erinevas järjestuses"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "Loogilised partitsioonid kattuvad"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "Suurendatud loogilised partitsioonid kattuvad"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "Sisemine viga: loogilise partitsiooni loomisel puudub extended-partitsioon"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Siia ei saa loogilist partitsiooni luua - see tekitakse teise extended'i"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menüükirje on liiga pikk. Menüü võib naljakas välja näha."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menüü ilma suunata, eeldan horisontaalset"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Vale klahv"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Vajuta mõnda klahvi jätkamiseks"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaarne"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Loo uus primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Loogiline"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Loo uus loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Tühista"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Ära loo partitsiooni"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Sisemine viga !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Suurus (MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Beginning"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Lisada partitsioon vaba ruumi algusse"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "End"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Lisada partitsioon vaba ruumi lõppu"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Pole ruumi extended-partitsiooni tegemiseks"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Puuduv partitsioonitabel või vale signatuur partitsioonitabelis"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Trükkida lihtsalt tabel"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Kas soovite alustada tühja tabeliga [y/N] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Te andiste suurema silindrite arvu kui kettale mahub"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Ei suuda avada kettaseadet"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Avasin ketta ainult lugemiseks - kirjutamiseks pole õigust"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Ei suuda kindlaks teha ketta mahtu"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Vigane primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Vigane loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Hoiatus!!  See võib Teie kettal andmeid hävitada!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Olete kindel, et soovite salvestada partitsioonitabelit? (jah või ei):"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Ei kirjutanud partitsioonitabelit kettale"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "jah"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Palun sisestage `jah' või `ei'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Kirjutan partitsioonitabelit kettale..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Kirjutasin partitsioonitabeli kettale"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Kirjutasin partitsioonitabeli, aga tagasi lugemine ebaõnnestus. Reboot abiks."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ükski primaarne partitsioon pole märgitud buutivaks. DOSi MBR ei suuda siit "
 "buutida."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Rohkem kui üks primaarne partitsioon on märgitud buutivaks. DOSi MBR ei "
 "suuda siit buutida."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Siseta failinimi või vajuta RETURN ekraanil näitamiseks: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ei suuda avada faili `%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Kettaseade: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Vaba   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr " Primaarne"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr " Loogiline"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitsioonitabel kettal %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            Esimene  Viimane\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1669,7 +1607,7 @@ msgid ""
 msgstr ""
 " # Tüüp     Sektor   Sektor   Offset  Pikkus   Failisüst. tüüp (ID)   Lipud\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1678,473 +1616,470 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Algus-----      -----Lõpp-----  Esimene Sektorite\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Lipud Pea  Sekt Sil   ID  Pea  Sekt Sil    sektor    arv\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "tooRes"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Trükkida tabel toores formaadis (baithaaval)"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorid"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Trükkida tabel järjestatuna sektorite järgi"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Trükkida lihtsalt tabel"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Ei trüki midagi"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "cfdiski abiinfo ekraan"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "See on cfdisk, curses'il baseeruv ketta partitsioneerimise"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "programm, mis lubab luua, kustutada ja muuta partitsioone Teie"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "arvuti kõvakettal."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Käsk        Tähendus"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Muuta silindrite, peade ja rajal olevate sektorite arvu"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             HOIATUS: See käsk on ainult neile, kes teavad, mida "
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             nad teevad."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Näidata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimiseerida jooksva partitsiooni kettakasutus"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Märkus: see võib teha ketta mitteühilduvaks DOSi,"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             OS/2 ja muude operatsioonisüteemidega."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Väljastada partitsioonitabel ekraanile või faili"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Väljastamisel võite valida mitme formaadi vahel:"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr " "
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - tooRes - see baidijada, mis kettale kirjutataks"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Sektorite järgi järjestatud tabel"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel teksti kujul (umbes nagu peaekraanil)"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Väljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Muuta jooksva partitsiooni failisüsteemi tüüpi"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Muuta partitsioonide suuruse ja asukoha ühikuid"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Variandid on MB, sektorid ja silindrid"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Kirjutada partitsioonitabel kettale (jah, suurtäht)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Kuna see võib kettalt andmeid hävitada, küsitakse"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             enne kirjutamist kinnitust. Vastata tuleb eestikeelse"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             täissõnaga (`jah' või `ei')."
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nool üles    Viia kursor eelmisele reale"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nool alla    Viia kursor järgmisele reale"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Joonistada ekraan üle"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Näidata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Märkus: kõiki neid käske saab sisestada nii suur- kui väiketähtedena,"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "välja arvatud suur W."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "silindrid (C)"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Muuta silindrite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "pead (H)"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Muuta peade arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Muuta sektorite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Muutused geomeetrias on tehtud"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Sisestage silindrite arv: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Vigane silindrite arv"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Sisetage peade arv: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Vigane peade arv"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Sisestage sektorite arv rajal: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Vigane sektorite arv"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Sisestage failisüsteemi tüübi number: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Failisüsteemi tüüpi ei saa muuta tühjaks"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Failisüsteemi tüüpi ei saa muuta extended'iks"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Kettaseade: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Maht: %lld baiti, %ld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Maht: %lld baiti, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Päid: %d    Sektoreid rajal: %d    Silindreid: %d"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Lipud"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Tüüp"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "FS tüüp"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr "Sektoreid"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "silindrid (C)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Maht (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Maht (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "kustutaDa"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geomeetria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta ketta geomeetriat (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Help"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Näidata abiinfot"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maksimiseerida"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimiseerida jooksva partitsiooni kettakasutus (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "uus (N)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Prindi"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Väljastada partitsioonitabel ekraanile või faili"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Välja"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Väljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tüüp"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Muuta failisüsteemi tüüpi (DOS, Linux, OS/2 jne)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Uhikud"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Muuta partitsioonide suuruse näitamise ühikuid (MB, sektorid, silindrid)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "salvesta (W)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Kirjutada partitsioonitabel kettale (võib hävitada andmed)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Seda partitsiooni ei saa buutivaks teha"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Tühja partitsiooni ei saa kustutada"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Seda partitsiooni ei saa maksimiseerida"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "See partitsioon pole kasutatav"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "See partitsioon on juba olemas"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Tühja partitsiooni tüüpi ei saa muuta"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Rohkem partitsioone ei ole"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Vigane käsk"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2216,9 +2151,9 @@ msgstr ""
 "\n"
 "BSD partitsioonitabel seadmel %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Käsk    Tähendus"
 
@@ -2238,10 +2173,9 @@ msgstr "   i   installeerida bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   anda nimekiri tuntud failisüsteemide tüüpidest"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   näidata sedasama menüüd"
 
@@ -2253,14 +2187,14 @@ msgstr "   n   lisada uus BSD partitsioon"
 msgid "   p   print BSD partition table"
 msgstr "   p   näidata BSD partitsioonitabelit"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   väljuda salvetsamata"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   tagasi peamenüüsse"
 
@@ -2303,13 +2237,13 @@ msgstr "Seadmel %s ei ole BSD partitsiooni\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD partitsioonitabeli käsk (m annab abiinfot): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Esimene %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimane %s või +suurus või +suurusM või +suurusK"
@@ -2354,8 +2288,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2458,8 +2390,8 @@ msgstr "sektorit rajal"
 msgid "tracks/cylinder"
 msgstr "rada silindris"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "silindrit"
 
@@ -2516,7 +2448,7 @@ msgstr "Bootstrap sai installitud seadmele %s\n"
 msgid "Partition (a-%c): "
 msgstr "Partitsioon (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Maksimaalne arv partitsioone on juba loodud\n"
@@ -2540,7 +2472,7 @@ msgstr ""
 "\n"
 "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2562,7 +2494,7 @@ msgstr ""
 "-b 2048: kasutada 2048-baidiseid sektoreid (vajalik näiteks mõnel MO "
 "seadmel)\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2579,198 +2511,184 @@ msgstr ""
 "jaoks)\n"
 "            ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Ei suuda avada seadet %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Ei suuda lugeda seadet %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ei suuda seekida seadmel %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Ei suuda kirjutada seadmele %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl ei õnnestunud seadmel %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Mälu sai otsa\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fataalne viga\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   lülitada kirjutuskaitse lipp sisse/välja"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b redigeerida NSD partitsioonitabelit"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   lülitada monteeritavuse lipp sisse/välja"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   kustutada partitsioon"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   anda nimekiri tuntud partitsioonitüüpidest"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   lisada uus partitsioon"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   luua uus tühi DOSi partitsioonitabel"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   näidata partitsioonitabelit"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   luua uus tühi Sun'i partitsioonitabel"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   muuta partitsiooni tüüpi"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   muuta sisestamise ja tabeli näitamise ühikuid"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   kontrollida partitsioonitabelit"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   kirjutada tabel kettale ja väljuda"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   lisafunktsionaalsus (ainult ekspertidele)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   valida buutiv partitsioon"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   redigeerida buutfaili kirjet"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   valida SGI saalimispartitsioon"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   lülitada buuditavuse lipp sisse/välja"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   lülitada DOSiga ühilduvuse rezhiim sisse/välja"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   muuta alternatiivsete silindrite arvu"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   muuta silindrite arvu"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   näidata partitsioonitabelit baidikaupa"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   muuta lisasektorite arvu silindril"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   muuta peade arvu"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   muuta interleave-tegurit"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   muuta pöörlemise kiirust (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   muuta sektorite arvu rajal"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   muuta füüsiliste silindrite arvu"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   liigutada andmete algust partitsioonis"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   näidata extended-partitsioonide nimekirja"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   luua IRIXi (SGI) partitsioonitabel"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   parandada partitsioonide järjekord"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Te peate määrama, et eksisteerib nii-ja-nii-mitu"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "pead"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2779,11 +2697,11 @@ msgstr ""
 "%s%s.\n"
 "Te saate seda teha lisafunktsionaalsuse menüüst.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " ja "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2802,29 +2720,29 @@ msgstr ""
 "2) muude operatsioonisüsteemide buutimise ja partitsioneerimise\n"
 "tarkvaraga (näiteks DOSi FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Vigane offset primaarses extended-partitsioonis\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Hoiatus: üleliigne 'link pointer' partitsioonitabelis %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Hoiatus: ignoreerin üleliigseid andmeid partitsioonitabelis %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2836,41 +2754,41 @@ msgstr ""
 "kuni Te ise otsustate need kettale kirjutada. Pärast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Märkus: sektori suurus on %d (mitte %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Partitsioonitabelit ei saa salvestada\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr "Seade ei sisalda ei DOSi, Suni, SGI ega ODF partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Sisemine viga\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2879,7 +2797,7 @@ msgstr ""
 "Hoiatus: vigane lipp 0x%04x (partitsioonitabelis %d) parandatakse\n"
 "kirjutamisel (w) ära\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2888,83 +2806,83 @@ msgstr ""
 "\n"
 "Sain EOF-i kolm korda järjest - aitab\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Kuueteistkümnendsüsteemis kood (L näitab koodide nimekirja): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, vaikimisi %d): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Kasutan vaikimisi väärtust %d\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Väärtus on piiridest väljas\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitsiooni number"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Hoiatus: partitsioonil %d on tühi tüüp\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ühtegi partitsiooni pole defineeritud\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "silinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Sisestamisel ja näitamisel on nüüd ühikuteks %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "Hoiatus: partitsioon %d on extended-partitsioon\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOSiga ühilduvuse lipp on püsti\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOSiga ühilduvuse lipp pole püsti\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitsiooni %d pole veel olemas!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2977,7 +2895,7 @@ msgstr ""
 "tekitada tüüpi 0 partitsioone. Te saate partitsiooni\n"
 "kustutada käsuga 'd'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2986,7 +2904,7 @@ msgstr ""
 "Partitsiooni ei saa muuta extended'iks ega extendedist harilikuks.\n"
 "Selle asemel tuleb partitsioon kustutada ja uus luua.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2996,7 +2914,7 @@ msgstr ""
 "Soovitav on jätta partitsioon 3 terveks kettaks (5),\n"
 "sest SunOs/Solaris eeldab seda ja see meeldib isegi Linuxile.\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3006,61 +2924,61 @@ msgstr ""
 "Kaaluge partitsiooni 9 jätmist köite päiseks (0) ja\n"
 "partitsiooni 11 jätmist terveks kettaks (6) nagu IRIX seda eeldab\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Partitsiooni %d tüüp on nüüd %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Partitsiooni %d füüsiline ja loogiline algus ei lange kokku:\n"
 "(Pole Linuxi oma?)\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     füüs=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "loogiline=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partitsiooni %d füüsiline ja loogiline lõpp ei lange kokku:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitsioon %i ei alga silindri piirilt:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "peaks olema (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partitsioon %d ei lõppe silindri piiril\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "peaks olema (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3070,7 +2988,7 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -3078,19 +2996,19 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3099,7 +3017,7 @@ msgstr ""
 "Midagi pole vaja teha, järjestus on juba õige\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3107,16 +3025,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Algus       Lõpp   Plokke   Id  Süsteem\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Seade"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3125,7 +3043,7 @@ msgstr ""
 "\n"
 "Partitsioonitabeli kirjed on füüsilisest erinevas järjekorras\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3136,82 +3054,82 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Pä Sek  Sil  Pä Sek  Sil    Algus     Maht ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Hoiatus: partitsioon %d sisaldab sektorit 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partitsioon %d: pea %d on suurem kui peade arv %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partitsioon %d: sektor %d on suurem kui sektroite arv rajal %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitsioon %d: silinder %d on suurem kui silindrite arv %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partitsioon %d: eelnevate sektorite arv %d ei klapi summarsega (%d)\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Hoiatus: partitsioonis %d on andmete algus vigane\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Hoiatus: partitsioon %d kattub partitsiooniga %d\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Hoiatus: partitsioon %d on tühi\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Loogiline partitsioon %d pole üleni partitsioonis %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Kogu kasutataud sektorite arv %d on suurem kui sektorite koguarv %d\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%d vaba sektorit\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partitsioon %d on juba olemas. Kustutage see enne uuesti lisamist\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Vabad sektorid on otsas\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3225,24 +3143,24 @@ msgstr ""
 "\t(käsuga o).\n"
 "\tHOIATUS: see hävitab ketta praeguse sisu!\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Te peate kõigepealt mõne partitsiooni kustutama ja asemele\n"
 "extended partitsiooni tegema\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Loogilised partitsioonid on füüsilisest erinevas järjestuses"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Vigane primaarne partitsioon"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3253,20 +3171,20 @@ msgstr ""
 "   %s\n"
 "   p   primaarse partitsiooni (1-4) loomine\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   loogilise partitsiooni (5-...) loomine"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   extended partitsiooni loomine"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Vigane partitsiooni number tüübile `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3275,12 +3193,12 @@ msgstr ""
 "Partitsioonitabelit on muudetud!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kasutan ioctl() partitsioonitabeli uuesti lugemiseks\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3294,7 +3212,7 @@ msgstr ""
 "Tuum kasutab endiselt vana tabelit,\n"
 "uus tabel hakkab kehtima järgmisest buudist alates.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3307,74 +3225,74 @@ msgstr ""
 "partitsioone, lugege palun fdisk'i manuali\n"
 "lisainformatsiooni jaoks.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Viga %s sulgemisel\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitsioonil %d pole andmetele ruumi eraldatud\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Andmete uus algus"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Eksperdi käsk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Sisestage silindrite arv"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Sisetage peade arv"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Sisetage sektorite arv"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Hoiatus: sean sektorite offseti DOSiga ühilduvuse jaoks\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Seade %s ei sisalda äratuntavat partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Ei suuda avada faili %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tundmatu käsk\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Kasutatav tuum leiab sektori suuruse ise - ignoreerin -b võtit\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3383,19 +3301,18 @@ msgstr ""
 "Hoiatus: -b võtit (sektori suuruse seadmine) tuleks kasutada ainult ühe "
 "täpselt määratud seadmega\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Leidisn seadmelt %s OSF/1 partitsioonitabeli, lähen OSF/1 rezhiimi.\n"
 "DOSi partitsioonitabeli rezhiimi naasmiseks kasutage käsku `r'.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Käsk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3404,16 +3321,16 @@ msgstr ""
 "\n"
 "Aktiivne buutfail on %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Palun sisestage uue buutfaili nimi: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Buutfail jäi samaks\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3480,15 +3397,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linuxi swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linuxi andmed"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3567,7 +3484,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor %5u pikkus %8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3624,7 +3540,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Tabelis on rohekm kui üks terve ketta kirje\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Ühtegi partitsiooni pole defineeritud\n"
@@ -3708,7 +3624,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tTe olete valinud ebahariliku buutfaili nime\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3728,11 +3643,10 @@ msgstr ""
 "terve ketta kirje tohib seda reeglit rikkuda.\n"
 "Kui olete kindel, et soovite seda tüüpi muuta, kirjutage YES\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "YES\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3802,44 +3716,43 @@ msgstr "Üritan säilitada partitsiooni %d parameetrid\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Tühi"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Terve ketas"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linuxi iseavastuv raid"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3852,12 +3765,12 @@ msgstr ""
 "peade, sektorite ja silindrite arv ning partitsioonid\n"
 "või luua uus tabel (käsuga s põhimenüüst).\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Automaatne konfigureerimine leidis %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3869,7 +3782,7 @@ msgstr ""
 "kuni Te ise otsustate need kettale kirjutada. Pärast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3879,72 +3792,72 @@ msgstr ""
 "   ?   automaatne konfigureerimine\n"
 "   0   kohandatud (vaikeväärtustega riistavarlt)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Valige tüüp (? tähendab automaatset, 0 kohandatut): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Automaatne konfigureerimine ei õnnestunud\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektoreid rajal"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Alternatiivseid silindreid"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Füüsilisi silindreid"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Pöörlemiskiirus (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Vahelejätu tegur"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Lisasektoreid silindril"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Kõiki kettaseadme parameetreid saab muuta x menüüst"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" floppi"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linuxi oma"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partitsioon %d ei lõppe silindri piiril\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partitsioon %d kattub teistega sektorites %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Kasutamata vahemik - sektorid 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kasutamata vahemik - sektorid %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3953,7 +3866,7 @@ msgstr ""
 "Teised partitsioonid katavad juba kogu ketta.\n"
 "Kustutage või vähendage neist mõnda ja proovige uuesti\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3963,7 +3876,7 @@ msgstr ""
 "Kolmas partitsioon ei kata kogu ketast, aga sisesatud väärtus %d %s\n"
 "katab mingi muu partitsiooni. Sisestatud kirje uueks väärtuseks on %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3972,7 +3885,7 @@ msgstr ""
 "Kui soovite hoida ühilduvust SunOS'i/Solarisega, jätke see partitsioon\n"
 "kogu ketast katma (5), alguseks 0, pikkuseks %u sektorit\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3986,7 +3899,7 @@ msgstr ""
 "sisestage YES, kui olete tõdesti kindlad, et tahate partitsiooni tüübiks\n"
 "panna 82 (Linuxi saalimisala):"
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4005,7 +3918,7 @@ msgstr ""
 "Ühikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4018,16 +3931,16 @@ msgstr ""
 "Ühikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Lipp    Algus       Lõpp   Plokke   ID  Süsteem\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Alternatiivsete silindrite arv"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Füüsiliste silindrite arv"
 
@@ -4051,32 +3964,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Extended"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX buutiv"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 #, fuzzy
 msgid "W95 FAT32"
@@ -4087,7 +3994,6 @@ msgstr "Win95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 #, fuzzy
 msgid "W95 FAT16 (LBA)"
@@ -4185,12 +4091,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4211,8 +4115,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4222,7 +4124,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD või SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4243,12 +4144,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Vana Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / vana Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4279,12 +4178,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernatsioon"
@@ -4293,7 +4190,6 @@ msgstr "IBM Thinkpad hibernatsioon"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4359,30 +4255,22 @@ msgstr "Mitte-FS andmed"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4391,116 +4279,109 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/FAT-16)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekundaarne"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Postisioneerimise viga seadmel %s - ei saa minna positsioonile %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Positsioneerimise viga: tahtsin 0x%08x%08x, sain 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "Mälu sai otsa - annan alla\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Lugemisviga seadmel %s - ei saa lugeda sektorit %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "VIGA: sektor %lu ei sisalda msdos'i signatuuri\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Kirjutamisviga seadmel %s - ei saa kirjutada sektorit %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "Ei suuda avada partitsioonitabeli salvestusfaili (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "Kirjutamise viga seadmel %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "Ei saa lugeda partitsioonitabeli salvestusfaili staatust (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "Partitsioonitabeli salvestusfail on vale pikkusega - ei taasta\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "Mälu sai otsa\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "Ei saa avada partitsioonitabeli salvestusfaili (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "Viga %s lugemisel\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "ei suuda avada seadet %s kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Ketas %s: ei suuda geomeetriat kindlaks teha\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Ketas %s: ei suuda mahtu kindlaks teha\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4511,22 +4392,22 @@ msgstr ""
 "terve ketas. fdiski kasutamine on ilmselt mõttetu.\n"
 "Kasutage --force võtit, kui tõesti tahate seda teha.\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Hoiatus: HDIO_GETGEO ütles, et seadmel on %lu pead\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Hoiatus: HDIO_GETGEO ütles, et seadmel on %lu sektorit\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Hoiatus: BLKGETSIZE/HDIO_GETGEO ütles, et seadmel on %lu silindrit\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4536,7 +4417,7 @@ msgstr ""
 "See tekitab probleeme kõigi programmidega, mis üritavad kasutada\n"
 "C/H/S (silinder/pea/sektor) adresseerimist.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4545,14 +4426,14 @@ msgstr ""
 "\n"
 "Ketas %s: %lu silindrit, %lu pead, %lu sektorit rajal\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s partitsioonil %s sisaldab vigast pead numbrit: %lu (peaks olema 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4561,7 +4442,7 @@ msgstr ""
 "%s partitsioonil %s sisaldab vigast sektori väärtust: %lu (peaks olema 1-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4570,7 +4451,7 @@ msgstr ""
 "%s partitsioonil %s sisaldab vigast silindri väärtust: %lu (peaks olema 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4579,12 +4460,12 @@ msgstr ""
 "ID  Nimi\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Loen uuesti partitsioonitabelit...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4592,31 +4473,31 @@ msgstr ""
 "Partitsioonitabeli ülelugemine ei õnnestunud\n"
 "Tehke arvutile kohe alglaadimine, enne mkfs kasutamist\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Viga %s sulgemisel\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: sellist partitsiooni ei ole\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "Tundmatu formaat - kasutan sektoreid\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s partitsioonitabel\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "Seda formaati pole veel realiseeritud - kasutan %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4625,12 +4506,12 @@ msgstr ""
 "Ühikud = silindrid %lu baidiga, plokid 1024 baidiga, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Seade  Buut Algus     Lõpp   #sil     #plokke   ID  Süsteem\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4639,12 +4520,12 @@ msgstr ""
 "Ühikud = sektorid 512 baidiga, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Seade  Buut    Algus      Lõpp   #sektors  ID  Süsteem\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4653,12 +4534,12 @@ msgstr ""
 "Ühikud = 1024-baidised plokid, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Seade  Buut   Algus      Lõpp    #plokke   ID  Süsteem\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4667,31 +4548,31 @@ msgstr ""
 "Ühikud = megabaidid (1048576 baiti), plokid (1024 baiti), loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Seade  Buut Algus   Lõpp    MB    #plokke   ID  Süsteem\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\talgus: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tlõpp: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partitsioon lõpeb silindril %ld, tagapool ketta lõppu\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Ei leidnud ühtegi partitsiooni\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4702,51 +4583,51 @@ msgstr ""
 "C/H/S=*/%ld/%ld jaoks (mitte %ld/%ld/%ld).\n"
 "Eeldan seda geomeetriat nimekirja näitamisel.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Imelik, ainult  %d partitsiooni on defineeriud\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, aga pole märgitud tühjaks\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid on märgitud buutivaks\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid algus pole 0\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Hoiatus: partitsioon %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "ei sisaldu partitsioonis %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Hoiatus: partitsioonid %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "ja %s kattuvad\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4755,17 +4636,17 @@ msgstr ""
 "Hoiatus: partitsioon %s sisaldab osa partitsioonitabelist (sektor %lu)\n"
 "ja hävitab selle, kui ta andmetega täidetakse\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Hoiatus: partitsioon %s algab sektorilt 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Hoiatus: partitsioon %s sõidab üle ketta otsa\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4773,17 +4654,17 @@ msgstr ""
 "Ainult üks primaarsetest partitsioonidest tohib olla extended\n"
 "(kuigi see pole Linuxis probleemiks)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Hoiatus: partitsioon %s ei alga silindri piirilt\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Hoiatus: partitsioon %s ei lõppe silindri piiril\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4793,7 +4674,7 @@ msgstr ""
 "LILO jaoks pole see oluline, aga DOS-i MBR võib buutimisel raskustesse "
 "sattuda.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4801,7 +4682,7 @@ msgstr ""
 "Hoiatus: harilikult saab buutida ainult primaarsetelt partitsioonidelt,\n"
 "ainult LILO ignoreerib buuditavuse lippu.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4809,39 +4690,39 @@ msgstr ""
 "Hoiatus: ükski primaarne partitsioon pole märgitud buutivaks (aktiivseks).\n"
 "See pole LILO jaoks oluline, aga DOS-i MBR ei suuda siit kettalt buutida.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "End"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4849,346 +4730,341 @@ msgstr ""
 "Hoiatus: extended partitsioon ei alga silindri piirilt.\n"
 "DOS ja Linux interpreteerivad selle sisu erinevalt.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr ""
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Hoiatus: tühi partitsioon\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "Liiga palju partitsioone\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr ""
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kasutamine: %s [ võtmed ] seade ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "kasutamine:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "kokku: %d plokki\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ei suuda avada seadet %s lugemiseks ja kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ei suuda avada seadet %s lugemiseks\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5196,42 +5072,42 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fataalne viga: ei suuda leida %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Hoiatus: %s pole plokkseade\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5239,73 +5115,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Palun sisestage y, n või q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5399,133 +5275,133 @@ msgstr ""
 msgid "internal error, contact the author."
 msgstr ""
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "buuditud MILO'st\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffiani BCD kell\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "kella port parandatud aadressiks 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "Vinge masin!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomaarne '%s' ei õnnestunud 1000 katse jooksul!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Ei suuda avada seadet /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Ei saanud luba, sest ei küsinudki\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s ei saanud I/O portidele ligi: iopl(3) ei õnnestunud\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Ilmselt on vaja roodu õigusi\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Eeldan, et riistavalises kellas on kasutusel %s aeg\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "kohalik"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Hoiatus: arusaamatu kolmas rida adjtime failis\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Ootasin: `UTC' või `LOCAL' või mitte midagi)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Viimane ujumise vastane parandus tehti %ld sekundit pärast 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Viimane kalibreerimine tehti %ld sekundit pärast 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Riistvaralises kellas on kasutusel %s aeg\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "tundmatu"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Ootan kella tiksu...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...sain tiksu\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Vigased väärtused riistvaralises kellas: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Riistvaralise kella aeg: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekundit pärast "
 "1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Riistvaralisest kellast loetud aeg: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Sean riistavaralise kella näiduks %.2d:%.2d:%.2d = %ld sekundit pärast 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Ei muutnud kella - testime ainult\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5534,7 +5410,7 @@ msgstr ""
 "Seatavast kellaajast on möödas %.6f sekundit.\n"
 "Ootan edasi täissekundini.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5544,22 +5420,22 @@ msgstr ""
 "kuupäev) või on nad väljaspool meie poolt kasutatavat ajavahemikku (näiteks "
 "aasta 2005)\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekundit\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "--date parameeter on puudu\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date argument on liiga pikk\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5568,21 +5444,21 @@ msgstr ""
 "--date suvandiga antud kellaaeg on vigane.\n"
 "Täpsemalt öeldes sisaldab ta jutumärke.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Annan `date' käsu: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "Ei suuda käivatada 'date' programmi /bin/sh shelliga - popen() sai vea"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date-käsu tulemus = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5597,7 +5473,7 @@ msgstr ""
 "Vastus oli:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5614,12 +5490,12 @@ msgstr ""
 "Vastus oli:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "kuupäevastring %s võrdub %ld sekundiga pärast 1969\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5628,36 +5504,36 @@ msgstr ""
 "Riistavaline kell ei sisalda korrektset aega, seega me ei saa seada "
 "süsteemikella selle järgi\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "kutsun välja settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Ei sea süsteemikella, sest tegu on testimisega\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Kella seadmiseks peab olema root\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ei õnnestunud"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5665,7 +5541,7 @@ msgid ""
 msgstr ""
 "Ei paranda korrigeerimistegurit, kuna riistvaraline kell sisaldas sodi\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, fuzzy, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5674,7 +5550,7 @@ msgstr ""
 "Ei paranda korrigeerimistegurit, kuna viimane kalibreerimine toimus vähem "
 "kui ööpäev tagasi\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5683,7 +5559,7 @@ msgstr ""
 "Ei paranda korrigeerimistegurit, kuna viimane kalibreerimine toimus vähem "
 "kui ööpäev tagasi\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5694,23 +5570,23 @@ msgstr ""
 "korrigeerimistegurile %f sekundit päevas.\n"
 "Paranen korrigeerimisfaktoriks %f sekundit päevas.\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Viimasest kellaaja korrigeermisest on möödunud %d sekundit\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Vaja ob vahele lisada %d sekundit ning viidata ajale %.6f sekundit tagasi\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Ei uuenda adjtime faili, sest tegu on testimisega\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5719,12 +5595,12 @@ msgstr ""
 "Oleks kirjutanud faili %s järgmist:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Ujumise kompenseerimise parameetreid ei uuendatud\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5732,27 +5608,27 @@ msgstr ""
 "Riistvaraline kell ei sisalda korrektset aega, seega me ei saa sinna "
 "parandust lisada\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Vajalik parandus on alla sekundi, seega kella ei sea\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Kasutan %s\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Ei leidnud kasutatavat kellaliidest\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Süsteemikella seadmine ei õnnestunud\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5764,17 +5640,17 @@ msgstr ""
 "See koopia hwclock'ist on kompileeritud töötama muul masinal (ja seega\n"
 "ilmselt ei tööta hetkel Alpha peal). Ei võta midagi ette.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Ei saanud tuumalt epohhi väärtust kätte\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Tuum kasutab epohhi väärtust %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5783,17 +5659,22 @@ msgstr ""
 "Epohhi väärtuse seadmiseks peate kasutama `epoch' võtit uue väärtuse "
 "andmiseks\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Ei pannud epohhiks %d - testime ainult\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Epohhi väärtuse seadmine ei õnnestunud\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s paketist %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5852,7 +5733,7 @@ msgstr ""
 "  --noadjfile   mitte kasutada faili /etc/adjtime. Vajab kas --utc või\n"
 "                --localtime võtit\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5862,19 +5743,19 @@ msgstr ""
 "                ütleb hwclock'ile, mis tüüpi Alphaga on tegemist\n"
 "                Vt. hwclock(8) lähema info jaoks\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ei taha mitte-võtmelisi argumente. %d on üleliigne\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr "Korraga saab kasutada ainult ühte funktsiooni\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5883,47 +5764,47 @@ msgstr ""
 "%s: --utc ja --localtime võtmed on teineteist välistavad. Teie kasutasite "
 "mõlemat korraga\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr "%s: Võtmed --adjust ja --noadjfile on vastastikku välistavad\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Koos võtmega --noadjfile tuleb anda ka kas --utc või --localtime võti\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ei saanud kasutatavat aega, ei keera kella\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Kahjuks saab ainult root riistvaralist kella keerata\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Kahjuks saba ainult root süsteemikelal keerata\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr "Kahjuks saab ainult root riistvaralise kella epohhi seada\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Ei suuda ühegi tuntud meetodiga riistvaralist kella kätte saada\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5958,7 +5839,6 @@ msgstr "ioctl() abil kella lugemine %s kaudu ei õnnestunud"
 msgid "ioctl KDSHWCLK failed"
 msgstr "KDSHWCLK ioctl ei õnnestunud"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Ei suuda avada seadet /dev/tty1 või /dev/vc/1"
@@ -6052,9 +5932,6 @@ msgstr "%s ioctl(RTC_EPOCH_READ) ei õnnestunud"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "lugesime epohhi %ld %s kaudu RTC_EPOCH_READ ioctl abil\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6080,7 +5957,6 @@ msgstr "%s ioctl(RTC_EPOCH_SET) ei õnnestunud"
 msgid "calling open_tty\n"
 msgstr "kutsun välja funktsiooni open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "kutsun välja funktsiooni termio_init\n"
@@ -6089,7 +5965,6 @@ msgstr "kutsun välja funktsiooni termio_init\n"
 msgid "writing init string\n"
 msgstr "kirjutan init-stringi\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "enne autobaudimist\n"
@@ -6103,7 +5978,6 @@ msgstr "ootan reavahetust (CR+LF)\n"
 msgid "read %c\n"
 msgstr "lugesin %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "loen kasutajanime\n"
@@ -6157,7 +6031,6 @@ msgstr "chdir () kataloogi /dev ei õnnestunud: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s pole sümbolseade"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6172,12 +6045,10 @@ msgstr "ei saanud avada /dev/%s standardsisendina: %m"
 msgid "%s: not open for read/write"
 msgstr "%s pole avatud lugemiseks _ja_ kirjutamiseks"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "dubleerin sokleid\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6222,30 +6093,25 @@ msgstr ""
 "       [-hiLmw] [-l login_programm] [-t taimaut] [-I init-string] [-H "
 "login_host] seade baud_rate,... [terminalitüüp]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: mälu on vähe, sisse logimine ei tarvitse õnnestuda\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "ei jätku mälu ttyclass'ile"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "ei jätku mälu grplist'ile"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Sisselogimisest liinil %s masinast %s keeldutakse vaikereegli tõttu\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Sisselogimisest liinil %s masinast %s keeldutakse\n"
@@ -6290,8 +6156,8 @@ msgstr "Muudan kasutaja %s kohta käivat informatsiooni\n"
 msgid "Password error."
 msgstr "Miski ei klapi"
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Parool: "
@@ -6467,34 +6333,6 @@ msgstr "Kasutage %s -l lubatud shellide nimekirja vaatamiseks\n"
 msgid "No known shells.\n"
 msgstr "Ei leidu ühtegi lubatud shelli\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "ei suuda avada lugemiseks seadet /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "ei suuda lugeda juhust seadmelt /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "ei suuda avada faili %s lugemiseks"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "stat(%s) ei õnnestunud"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "failil %s on valed juurdepääsuõigused"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "ei suuda lugeda faili %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6504,11 +6342,11 @@ msgstr "Ei suuda lugeda faili %s, katkestan"
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "Kasutamine: [-#] [-f fail] [-t tty] [-h hostinimi] [kasutaja ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  veel masinas"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6517,15 +6355,15 @@ msgstr ""
 "\n"
 "wtmp algab %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: Mälu sai otsa\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6534,51 +6372,45 @@ msgstr ""
 "\n"
 "katkestatud %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Saatuslik viga: ei suuda taasavada terminali: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h on ainult superkasutajale\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Kasutamine: login [-fp] [kasutajanimi]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM viga, katkestan: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Ei suutnud initsialiseerida PAM'i: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6587,17 +6419,17 @@ msgstr ""
 "Login incorrect\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6606,142 +6438,127 @@ msgstr ""
 "\n"
 "Login incorrect\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Mälu sai otsa\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Vigane kasutajanimi"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Kasutaja %s ei tohi sellelt terminaliltsisse logida\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSED FROM %s ON TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSED ON TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorrect\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Liiga palju kasutajaid on juba sisse loginud.\n"
-"Proovige hiljem uuesti.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Teil on liiga palju protsesse töötamas\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Teile on uusi kirju\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Teile on kirju\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Viga fork'imisel: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ei õnnestunud: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ei õnnestunud"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Kataloogi %s pole!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login sisse kodukataloogiga \"/\"\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: Ei jätku mälu shell-skriptile\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: Ei suutnud käivitada shell skripti: %s\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: shelli pole: %s\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6750,65 +6567,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Kasutajanimi on liiga pikk\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "Nimi on liiga pikk"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Kasutajanimed ei tohi alata miinusega\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "Liiga palju tühje ridu\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "TOHUTULT reavahetusi"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login timed out after %d seconds\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Viimati loginud: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "masinast %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "terminalil %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -6828,167 +6645,30 @@ msgstr "on välja lülitatud (n)\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Kasutamine: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Kes Te niisugune olete?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Sellist gruppi pole"
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Pole õigusi"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Pole shelli"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Parool peab olema vähemalt 6 sümbolit. Proovige uuesti\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Parool peab sisaldama märke vähemalt kahest järgnevast klassist:\n"
-"suur- ja väiketähed, numbrid ja muud sümbolid. Vaadake passwd(1) lisainfoks\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Vana parooli ei saa uuesti kasutada\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Ärge palun pange parooliks midagi, mis sarnaneb Teie kasutajanimega!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Ärge palun pange parooliks midagi, mis sarnaneb Teie pärisnimega!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Kasutamine: passwd [kasutajanimi [parool]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Ainult superkasutaja tohib ka argumente kasutada\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Kasutamine: passwd [-foqsvV] [kasutajanimi [parool]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Ei suuda käivitada programmi %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Ei suuda kindlaks teha Teie kasutajanime"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Ainult superkasutaja tohib teiste paroole muuta\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Liiga palju argumente\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Ei suuda leida sellist kasutajat. Kas `%s' on ikka kasutaja?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Selle programmiga saab muuta ainult lokaalseid paroole.\n"
-"Ehk aitab programmi yppasswd kasutamine."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID ja kasutajanimi ei lange kokku - petis niisugune!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Muudame kasutaja %s parooli\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Vana parool: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Vale parool"
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Uus parool: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Ei muutnud parooli."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Uus parool uuesti: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Paroolid ei klapi - tippisite ilmselt valesti. Parool jäi muutmata."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "muudeti kasutaja %s parool"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROODU PAROOL MUUDETI"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "kasutaja %s muutis roodu parooli"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "kutsun välja funktsiooni setpwnam parooli seadmiseks\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Parool on nüüd muudetud\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7035,7 +6715,6 @@ msgstr "buutis %s: %s"
 msgid "halted by %s: %s"
 msgstr "seiskas %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7072,7 +6751,6 @@ msgstr "Täidan programmi \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Viga %s täitmisel\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7162,7 +6840,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr "viga finalprog'i käivitamisel\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "viga finalprog'i käivitamisel\n"
@@ -7191,7 +6868,7 @@ msgstr "kataloogi avamine ei õnnestunud\n"
 msgid "fork failed\n"
 msgstr "fork ei õnnestunud\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "exec ei õnnestunud\n"
 
@@ -7342,12 +7019,6 @@ msgstr "Vigane kuu number, lubatud on 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "Vigane aasta number, lubatud on 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7358,13 +7029,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "Kasutamine: cal [-13smjyV] [[kuu] aasta]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Kasutamine: %s[+formaat] [kuupäev kuu aasta]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Püha Tib'i päev"
 
@@ -7496,7 +7166,7 @@ msgstr "%s: %s ümber nimetamine %s -ks ei õnnestnud: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Kasutamine: %s kust kuhu failid...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7504,276 +7174,275 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Kasutamine: script [-a] [-f] [-q] [-t] [fail]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr ""
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -7850,10 +7519,6 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8137,232 +7802,217 @@ msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   anda nimekiri tuntud failisüsteemide tüüpidest"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8388,34 +8038,34 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr ""
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8450,98 +8100,98 @@ msgstr ""
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr ""
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr ""
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr ""
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr ""
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr ""
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr ""
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr ""
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr ""
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr ""
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr ""
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr ""
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr ""
@@ -8550,7 +8200,7 @@ msgstr ""
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8559,7 +8209,7 @@ msgid ""
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8567,138 +8217,136 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: ei suuda käivitada programmi %s: %m"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: Ei suuda avada faili %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "fork ei õnnestunud"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr ""
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr ""
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr ""
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr ""
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8706,48 +8354,47 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8892,7 +8539,7 @@ msgstr "%s: tundmatu signaal %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9046,8 +8693,6 @@ msgstr ""
 msgid "------ Shared Memory Limits --------\n"
 msgstr ""
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9801,17 +9446,17 @@ msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: tundmatu signaal %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9819,8 +9464,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9828,52 +9472,52 @@ msgid ""
 "\n"
 msgstr ""
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr ""
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr ""
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr ""
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr ""
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr ""
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr ""
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr ""
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr ""
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9881,7 +9525,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9904,66 +9548,66 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr ""
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr ""
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr ""
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr ""
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr ""
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr ""
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr ""
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr ""
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr ""
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr ""
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -10016,94 +9660,91 @@ msgstr ""
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "võti `%s' vajab argumenti\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: vigane võti (%s)\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 #, fuzzy
 msgid "No previous file"
 msgstr "Ühtegi partitsiooni pole defineeritud\n"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: lugemise viga failis %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: seekimise viga failis %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ei suuda lugeda ajutist faili\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 #, fuzzy
 msgid "RE error: "
 msgstr "positsioneerimise viga"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 #, fuzzy
 msgid "Cannot open "
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr ""
 
@@ -10157,6 +9798,150 @@ msgstr ""
 msgid "Out of memory when growing buffer.\n"
 msgstr ""
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Vigane arv: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Süntaksiviga: `%s´\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Ei tunne parameetrite komplekti `%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "%s [ -p ] seade nimi\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "%s [ -p ] seade maht sekt päid radu stretch gap rate spec1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "%s [ -c | -y | -n | -d ] seade\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "%s [ -c | -y | -n ] seade\n"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "ei suuda avada lugemiseks seadet /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "ei suuda lugeda juhust seadmelt /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "ei suuda avada faili %s lugemiseks"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "stat(%s) ei õnnestunud"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "failil %s on valed juurdepääsuõigused"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "ei suuda lugeda faili %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Liiga palju kasutajaid on juba sisse loginud.\n"
+#~ "Proovige hiljem uuesti.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Teil on liiga palju protsesse töötamas\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Parool peab olema vähemalt 6 sümbolit. Proovige uuesti\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Parool peab sisaldama märke vähemalt kahest järgnevast klassist:\n"
+#~ "suur- ja väiketähed, numbrid ja muud sümbolid. Vaadake passwd(1) "
+#~ "lisainfoks\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Vana parooli ei saa uuesti kasutada\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "Ärge palun pange parooliks midagi, mis sarnaneb Teie kasutajanimega!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Ärge palun pange parooliks midagi, mis sarnaneb Teie pärisnimega!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Kasutamine: passwd [kasutajanimi [parool]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Ainult superkasutaja tohib ka argumente kasutada\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Kasutamine: passwd [-foqsvV] [kasutajanimi [parool]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Ei suuda käivitada programmi %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Ei suuda kindlaks teha Teie kasutajanime"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Ainult superkasutaja tohib teiste paroole muuta\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Liiga palju argumente\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Ei suuda leida sellist kasutajat. Kas `%s' on ikka kasutaja?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Selle programmiga saab muuta ainult lokaalseid paroole.\n"
+#~ "Ehk aitab programmi yppasswd kasutamine."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID ja kasutajanimi ei lange kokku - petis niisugune!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Muudame kasutaja %s parooli\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Vana parool: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Vale parool"
+
+#~ msgid "Enter new password: "
+#~ msgstr "Uus parool: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Ei muutnud parooli."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Uus parool uuesti: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Paroolid ei klapi - tippisite ilmselt valesti. Parool jäi muutmata."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "muudeti kasutaja %s parool"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROODU PAROOL MUUDETI"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "kasutaja %s muutis roodu parooli"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "kutsun välja funktsiooni setpwnam parooli seadmiseks\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Parool on nüüd muudetud\n"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Hoiatus: kustutan partitsioonid pärast %d\n"
diff --git a/po/fi.gmo b/po/fi.gmo
new file mode 100644
index 000000000..4e28b16ee
--- /dev/null
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index ae4014996..5aff7d6d8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,26 +1,26 @@
 # Finnish messages for util-linux
-# Copyright © 2002, 2003 Lauri Nurmi <lanurmi@iki.fi>
-# Lauri Nurmi <lanurmi@iki.fi>, 2002, 2003.
+# Copyright © 2002, 2003, 2005 Lauri Nurmi <lanurmi@iki.fi>
+# Lauri Nurmi <lanurmi@iki.fi>, 2002, 2003, 2005.
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided, that this
 # header is not removed and modified versions are marked
 # as such.
 #
-# Tätä tiedostoa ja muutettuja versioita saa kopioida
-# ja levittää vapaasti edellyttäen, että tätä otsikkoa
-# ei poisteta, ja muutetut versiot merkitään muutetuiksi.
+# Tätä tiedostoa ja muutettuja versioita saa kopioida
+# ja levittää vapaasti edellyttäen, että tätä otsikkoa
+# ei poisteta, ja muutetut versiot merkitään muutetuiksi.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2003-08-20 11:40+0300\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-03-05 17:10+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: disk-utils/blockdev.c:62
@@ -49,12 +49,11 @@ msgstr "aseta lohkokoko"
 
 #: disk-utils/blockdev.c:78
 msgid "get 32-bit sector count"
-msgstr ""
+msgstr "hae 32-bittinen sektorimäärä"
 
 #: disk-utils/blockdev.c:81
-#, fuzzy
 msgid "get size in bytes"
-msgstr "hae koko"
+msgstr "hae koko tavuina"
 
 #: disk-utils/blockdev.c:84
 msgid "set readahead"
@@ -66,7 +65,7 @@ msgstr "hae lukuennakko"
 
 #: disk-utils/blockdev.c:90
 msgid "flush buffers"
-msgstr "tyhjennä puskurit"
+msgstr "tyhjennä puskurit"
 
 #: disk-utils/blockdev.c:94
 msgid "reread partition table"
@@ -75,7 +74,7 @@ msgstr "lue osiotaulu uudelleen"
 #: disk-utils/blockdev.c:103
 #, c-format
 msgid "Usage:\n"
-msgstr "Käyttö:\n"
+msgstr "Käyttö:\n"
 
 #: disk-utils/blockdev.c:105
 #, c-format
@@ -90,7 +89,7 @@ msgstr "  %s [-v|-q] komennot laitteet\n"
 #: disk-utils/blockdev.c:107
 #, c-format
 msgid "Available commands:\n"
-msgstr "Käytettävissä olevat komennot:\n"
+msgstr "Käytettävissä olevat komennot:\n"
 
 #: disk-utils/blockdev.c:254
 #, c-format
@@ -122,10 +121,10 @@ msgstr "%s: ioctl-virhe laitteessa %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   AlkuSekt     Koko    Laite\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
-msgstr "käyttö:\n"
+msgstr "käyttö:\n"
 
 #: disk-utils/fdformat.c:31
 #, c-format
@@ -149,7 +148,7 @@ msgstr "Luku: "
 #: disk-utils/fdformat.c:73
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
-msgstr "Ongelma luettaessa sylinteriä %d, odotettiin %d, luettiin %d\n"
+msgstr "Ongelma luettaessa sylinteriä %d, odotettiin %d, luettiin %d\n"
 
 #: disk-utils/fdformat.c:79
 #, c-format
@@ -157,22 +156,21 @@ msgid ""
 "bad data in cyl %d\n"
 "Continuing ... "
 msgstr ""
-"viallista dataa sylinterissä %d\n"
+"viallista dataa sylinterissä %d\n"
 "Jatketaan... "
 
 #: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "käyttö: %s [ -n ] laite\n"
+msgstr "käyttö: %s [ -n ] laite\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s paketista %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -182,7 +180,7 @@ msgstr "%s: ei ole lohkolaite\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
-msgstr "Nykyistä alustustyyppiä ei voi määrittää"
+msgstr "Nykyistä alustustyyppiä ei voi määrittää"
 
 #: disk-utils/fdformat.c:141
 #, c-format
@@ -197,7 +195,7 @@ msgstr "Kaksi"
 msgid "Single"
 msgstr "Yksi"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -206,113 +204,113 @@ msgid ""
 " -v         be more verbose\n"
 " file       file to test\n"
 msgstr ""
-"käyttö: %s [-hv] [-x hak] tiedosto\n"
-" -h         näytä tämä ohje\n"
+"käyttö: %s [-hv] [-x hak] tiedosto\n"
+" -h         näytä tämä ohje\n"
 " -x hak     pura hakemistoon hak\n"
 " -v         monisanaisuus\n"
 " tiedosto   tarkistettava tiedosto\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: virhe %d purettaessa! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "%s: kokovirhe symlinkissä \"%s\"\n"
+msgstr "%s: kokovirhe symlinkissä \"%s\"\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  puretaan paikkaan %2$ld lohkoa %1$ld (%3$ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%1$s: virheellinen tila (%3$o) polussa \"%2$s\"\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
-msgstr "  reikä kohdassa %ld (%d)\n"
+msgstr "  reikä kohdassa %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Ei-lohko (%ld) tavua\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Ei-koko (%ld vs %ld) tavua\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
-msgstr "%s: virheellinen cramfs--väärä polun pituus\n"
+msgstr "%s: virheellinen cramfs--väärä polun pituus\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
-msgstr "%s: käännetty ilman -x -tukea\n"
+msgstr "%s: käännetty ilman -x -tukea\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
-msgstr "%s: varoitus--tiedostojärjestelmän kokoa ei voi määrittää \n"
+msgstr "%s: varoitus--tiedostojärjestelmän kokoa ei voi määrittää \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
-msgstr "%s ei ole lohkolaite eikä tiedosto\n"
+msgstr "%s ei ole lohkolaite eikä tiedosto\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: virheellinen cramfs--tiedosto on liian lyhyt\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
-msgstr "%s: virheellinen cramfs--väärä taika\n"
+msgstr "%s: virheellinen cramfs--väärä taika\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
-msgstr "%s: varoitus--tiedosto on liian pitkä, tasattu kuva?\n"
+msgstr "%s: varoitus--tiedosto on liian pitkä, tasattu kuva?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: virheellinen cramfs--crc-virhe\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
-msgstr "%s: varoitus--vanha cramfs-kuva, ei CRC:tä\n"
+msgstr "%s: varoitus--vanha cramfs-kuva, ei CRC:tä\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: virheellinen cramfs--viallinen superlohko\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: virheellinen cramfs--hakemistodatan loppu (%ld) != tiedostodatan alku (%"
 "ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
-msgstr "%s: virheellinen cramfs--virheellinen tiedostodatan siirtymä\n"
+msgstr "%s: virheellinen cramfs--virheellinen tiedostodatan siirtymä\n"
 
 #: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Käyttö: %s [-larvsmf] /dev/nimi\n"
+msgstr "Käyttö: %s [-larvsmf] /dev/nimi\n"
 
 #: disk-utils/fsck.minix.c:293
 #, c-format
@@ -331,12 +329,12 @@ msgstr "tarkistus keskeytetty.\n"
 #: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr "Vyöhykenumero < FIRSTZONE tiedostossa \"%s\"."
+msgstr "Vyöhykenumero < FIRSTZONE tiedostossa \"%s\"."
 
 #: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr "Vyöhykenumero >= ZONES tiedostossa \"%s\"."
+msgstr "Vyöhykenumero >= ZONES tiedostossa \"%s\"."
 
 #: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
@@ -358,12 +356,12 @@ msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
-"Sisäinen virhe: yritetään kirjoittaa viallista lohkoa\n"
-"Kirjoituspyyntöä ei huomioida\n"
+"Sisäinen virhe: yritetään kirjoittaa viallista lohkoa\n"
+"Kirjoituspyyntöä ei huomioida\n"
 
 #: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
-msgstr "siirtyminen epäonnistui funktiossa write_block"
+msgstr "siirtyminen epäonnistui funktiossa write_block"
 
 #: disk-utils/fsck.minix.c:398
 #, c-format
@@ -372,7 +370,7 @@ msgstr "Kirjoitusvirhe: viallinen lohko tiedostossa \"%s\"\n"
 
 #: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
-msgstr "siirtyminen epäonnistui funktiossa write_super_block"
+msgstr "siirtyminen epäonnistui funktiossa write_super_block"
 
 #: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
@@ -384,7 +382,7 @@ msgstr "I-solmukarttaa ei voi kirjoittaa"
 
 #: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
-msgstr "Vyöhykekartan kirjoitus ei onnistu"
+msgstr "Vyöhykekartan kirjoitus ei onnistu"
 
 #: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
@@ -392,7 +390,7 @@ msgstr "I-solmuja ei voi kirjoittaa"
 
 #: disk-utils/fsck.minix.c:557
 msgid "seek failed"
-msgstr "siirtyminen epäonnistui"
+msgstr "siirtyminen epäonnistui"
 
 #: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
@@ -404,15 +402,15 @@ msgstr "virheellinen taikaluku superlohkossa"
 
 #: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
-msgstr "Vain 1k-lohkot/vyöhykkeet ovat tuettuja"
+msgstr "Vain 1k-lohkot/vyöhykkeet ovat tuettuja"
 
 #: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
-msgstr "virheellinen s_imap_blocks-kenttä superlohkossa"
+msgstr "virheellinen s_imap_blocks-kenttä superlohkossa"
 
 #: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
-msgstr "virheellinen s_zmap_blocks-kenttä superlohkossa"
+msgstr "virheellinen s_zmap_blocks-kenttä superlohkossa"
 
 #: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
@@ -428,7 +426,7 @@ msgstr "I-solmujen laskemiseen ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
-msgstr "Vyöhykkeen laskemiseen ei voi varata puskuria"
+msgstr "Vyöhykkeen laskemiseen ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
@@ -436,7 +434,7 @@ msgstr "I-solmukarttaa ei voi lukea"
 
 #: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
-msgstr "Vyöhykekarttaa ei voi lukea"
+msgstr "Vyöhykekarttaa ei voi lukea"
 
 #: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
@@ -445,7 +443,7 @@ msgstr "I-solmuja ei voi lukea"
 #: disk-utils/fsck.minix.c:612
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
-msgstr "Varoitus: Ensimmäinenvyöhyke != Norm_ensimmäinenvyöhyke\n"
+msgstr "Varoitus: Ensimmäinenvyöhyke != Norm_ensimmäinenvyöhyke\n"
 
 #: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
@@ -460,12 +458,12 @@ msgstr "%ld lohkoa\n"
 #: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
-msgstr "Ensimmäinendatavyöhyke=%ld (%ld)\n"
+msgstr "Ensimmäinendatavyöhyke=%ld (%ld)\n"
 
 #: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
-msgstr "Vyöhykekoko=%d\n"
+msgstr "Vyöhykekoko=%d\n"
 
 #: disk-utils/fsck.minix.c:621
 #, c-format
@@ -475,7 +473,7 @@ msgstr "Maxkoko=%ld\n"
 #: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
-msgstr "Tied.järj. tila=%d\n"
+msgstr "Tied.järj. tila=%d\n"
 
 #: disk-utils/fsck.minix.c:623
 #, c-format
@@ -489,11 +487,11 @@ msgstr ""
 #: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
-msgstr "Käyttämättömäksi merkittyä i-solmua %d käytetään tiedostoon \"%s\"\n"
+msgstr "Käyttämättömäksi merkittyä i-solmua %d käytetään tiedostoon \"%s\"\n"
 
 #: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
-msgstr "Merkitse käyttöön"
+msgstr "Merkitse käyttöön"
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
@@ -503,7 +501,7 @@ msgstr "Tiedostolla \"%s\" on tila %05o\n"
 #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 #, c-format
 msgid "Warning: inode count too big.\n"
-msgstr "Varoitus i-solmujen määrä on liian suuri.\n"
+msgstr "Varoitus i-solmujen määrä on liian suuri.\n"
 
 #: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
@@ -512,18 +510,18 @@ msgstr "juuren i-solmu ei ole hakemisto"
 #: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr "Lohkoa on käytetty aikaisemmin. Nyt tiedostossa \"%s\"."
+msgstr "Lohkoa on käytetty aikaisemmin. Nyt tiedostossa \"%s\"."
 
 #: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
 #: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
 #: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
-msgstr "Tyhjennä"
+msgstr "Tyhjennä"
 
 #: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
-msgstr "Lohko %d tiedostossa \"%s\" on merkitty käyttämättömäksi."
+msgstr "Lohko %d tiedostossa \"%s\" on merkitty käyttämättömäksi."
 
 #: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
@@ -533,7 +531,7 @@ msgstr "Korjaa"
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
-"Hakemisto \"%s\" sisältää virheellisen i-solmunumeron tiedostolle \"%.*s\"."
+"Hakemisto \"%s\" sisältää virheellisen i-solmunumeron tiedostolle \"%.*s\"."
 
 #: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
@@ -542,7 +540,7 @@ msgstr " Poista"
 #: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr "\"%s\": viallinen hakemisto: \".\" ei ole ensimmäisenä\n"
+msgstr "\"%s\": viallinen hakemisto: \".\" ei ole ensimmäisenä\n"
 
 #: disk-utils/fsck.minix.c:964
 #, c-format
@@ -552,7 +550,7 @@ msgstr "\"%s\": viallinen hakemisto: \"..\" ei ole toisena\n"
 #: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr "%s: viallinen hakemisto: \".\" ei ole ensimmäisenä\n"
+msgstr "%s: viallinen hakemisto: \".\" ei ole ensimmäisenä\n"
 
 #: disk-utils/fsck.minix.c:1032
 #, c-format
@@ -561,7 +559,7 @@ msgstr "%s: viallinen hakemisto: \"..\" ei ole toisena\n"
 
 #: disk-utils/fsck.minix.c:1066
 msgid "internal error"
-msgstr "sisäinen virhe"
+msgstr "sisäinen virhe"
 
 #: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
@@ -570,7 +568,7 @@ msgstr "%s: viallinen hakemisto: koko < 32"
 
 #: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
-msgstr "siirtyminen epäonnistui funktiossa bad_zone"
+msgstr "siirtyminen epäonnistui funktiossa bad_zone"
 
 #: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
@@ -580,40 +578,40 @@ msgstr "I-solmun %d tila ei ole tyhjennetty."
 #: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
-msgstr "I-solmua %d ei käytetä, merkitty käytetyksi bittikartassa."
+msgstr "I-solmua %d ei käytetä, merkitty käytetyksi bittikartassa."
 
 #: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
-msgstr "I-solmu %d käytössä, merkitty käyttämättömäksi bittikartassa."
+msgstr "I-solmu %d käytössä, merkitty käyttämättömäksi bittikartassa."
 
 #: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
-msgstr "I-solmu %d (tila = %07o), i_linkkimäärä=%d, laskettu=%d."
+msgstr "I-solmu %d (tila = %07o), i_linkkimäärä=%d, laskettu=%d."
 
 #: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
-msgstr "Aseta i_linkkimäärä lasketun mukaiseksi"
+msgstr "Aseta i_linkkimäärä lasketun mukaiseksi"
 
 #: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
-msgstr "Vyöhyke %d: merkitty käyttöön, mutta mikään tiedosto ei käytä sitä."
+msgstr "Vyöhyke %d: merkitty käyttöön, mutta mikään tiedosto ei käytä sitä."
 
 #: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
-msgstr "Poista merkintä"
+msgstr "Poista merkintä"
 
 #: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Vyöhyke %d: käytössä, laskettu=%d\n"
+msgstr "Vyöhyke %d: käytössä, laskettu=%d\n"
 
 #: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr "Vyöhyke %d: ei käytössä, laskettu=%d\n"
+msgstr "Vyöhyke %d: ei käytössä, laskettu=%d\n"
 
 #: disk-utils/fsck.minix.c:1181
 msgid "Set"
@@ -630,7 +628,7 @@ msgstr "virheellinen v2 i-solmun koko"
 
 #: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
-msgstr "vuorovaikutteisiin korjauksiin tarvitaan pääte"
+msgstr "vuorovaikutteisiin korjauksiin tarvitaan pääte"
 
 #: disk-utils/fsck.minix.c:1286
 #, c-format
@@ -645,12 +643,12 @@ msgstr "%s on puhdas, ei tarkistusta.\n"
 #: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
-msgstr "Pakotetaan tiedostojärjestelmän tarkistus laitteella %s.\n"
+msgstr "Pakotetaan tiedostojärjestelmän tarkistus laitteella %s.\n"
 
 #: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr "Tiedostojärjestelmä laitteella %s on likainen, vaatii tarkistuksen.\n"
+msgstr "Tiedostojärjestelmä laitteella %s on likainen, vaatii tarkistuksen.\n"
 
 #: disk-utils/fsck.minix.c:1333
 #, c-format
@@ -659,12 +657,12 @@ msgid ""
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 "\n"
-"%6ld i-solmua käytetty (%ld%%)\n"
+"%6ld i-solmua käytetty (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
-msgstr "%6ld vyöhykettä käytety (%ld%%)\n"
+msgstr "%6ld vyöhykettä käytety (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1340
 #, c-format
@@ -684,8 +682,8 @@ msgstr ""
 "%6d hakemistoa\n"
 "%6d merkkilaitetiedostoa\n"
 "%6d lohkolaitetiedostoa\n"
-"%6d linkkiä\n"
-"%6d symbolista linkkiä\n"
+"%6d linkkiä\n"
+"%6d symbolista linkkiä\n"
 "------\n"
 "%6d tiedostoa\n"
 
@@ -697,18 +695,18 @@ msgid ""
 "----------------------------\n"
 msgstr ""
 "--------------------------------\n"
-"TIEDOSTOJÄRJESTELMÄÄ ON MUUTETTU\n"
+"TIEDOSTOJÄRJESTELMÄÄ ON MUUTETTU\n"
 "--------------------------------\n"
 
 #: disk-utils/isosize.c:129
 #, c-format
 msgid "%s: failed to open: %s\n"
-msgstr "%s: avaaminen epäonnistui: %s\n"
+msgstr "%s: avaaminen epäonnistui: %s\n"
 
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr "%s: virhe siirrytäessä tiedostossa %s\n"
+msgstr "%s: virhe siirrytäessä tiedostossa %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
@@ -718,17 +716,17 @@ msgstr "%s: virhe luettaessa tiedostoa %s\n"
 #: disk-utils/isosize.c:150
 #, c-format
 msgid "sector count: %d, sector size: %d\n"
-msgstr "sektorimäärä: %d, sektorikoko: %d\n"
+msgstr "sektorimäärä: %d, sektorikoko: %d\n"
 
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr "%s: virhe valitsimien jäsennyksessä\n"
+msgstr "%s: virhe valitsimien jäsennyksessä\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr "Käyttö: %s [-x] [-d <nro>] iso9660-kuva\n"
+msgstr "Käyttö: %s [-x] [-d <nro>] iso9660-kuva\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -736,16 +734,16 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
-"Käyttö: %s [-v] [-N i-solmumäärä] [-V osionimi]\n"
-"       [-F tied.järj.nimi] laite [lohkomäärä]\n"
+"Käyttö: %s [-v] [-N i-solmumäärä] [-V osionimi]\n"
+"       [-F tied.järj.nimi] laite [lohkomäärä]\n"
 
 #: disk-utils/mkfs.bfs.c:135
 msgid "volume name too long"
-msgstr "osionimi on liian pitkä"
+msgstr "osionimi on liian pitkä"
 
 #: disk-utils/mkfs.bfs.c:142
 msgid "fsname name too long"
-msgstr "tiedostojärjestelmän nimi on liian pitkä"
+msgstr "tiedostojärjestelmän nimi on liian pitkä"
 
 #: disk-utils/mkfs.bfs.c:167
 #, c-format
@@ -779,9 +777,9 @@ msgstr "liian monta i-solmua - maksimi on 512"
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
-msgstr "tila ei riitä, vaaditaan vähintään %lu lohkoa"
+msgstr "tila ei riitä, vaaditaan vähintään %lu lohkoa"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Laite: %s\n"
@@ -794,7 +792,7 @@ msgstr "Osio: <%-6s>\n"
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
 msgid "FSname: <%-6s>\n"
-msgstr "Tiedjärj.nimi: <%-6s>\n"
+msgstr "Tiedjärj.nimi: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:231
 #, c-format
@@ -839,37 +837,37 @@ msgstr "siirtymisvirhe"
 
 #: disk-utils/mkfs.bfs.c:278
 msgid "error writing . entry"
-msgstr "virhe kirjoitettessa \".\"-merkintää"
+msgstr "virhe kirjoitettessa \".\"-merkintää"
 
 #: disk-utils/mkfs.bfs.c:282
 msgid "error writing .. entry"
-msgstr "virhe kirjoitettessa \"..\"-merkintää"
+msgstr "virhe kirjoitettessa \"..\"-merkintää"
 
 #: disk-utils/mkfs.bfs.c:286
 #, c-format
 msgid "error closing %s"
 msgstr "virhe suljettaessa laitetta %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
-"Käyttö: mkfs [-V] [-t tied.järj. tyyppi] [tied.järj.valitsimet] laite "
+"Käyttö: mkfs [-V] [-t tied.järj. tyyppi] [tied.järj.valitsimet] laite "
 "[koko]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Muisti lopussa!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs-versio %s (%s)\n"
 
 #: disk-utils/mkfs.cramfs.c:124
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
 "outfile\n"
@@ -886,19 +884,19 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"käyttö: %s [-v] [-b lkoko] [-e laitos] [-i tied] [-n nimi] haknimi "
+"käyttö: %s [-v] [-b lkoko] [-e laitos] [-i tied] [-n nimi] haknimi "
 "tulostied\n"
-" -h          näytä tämä ohje\n"
+" -h          näytä tämä ohje\n"
 " -v          monisanaisuus\n"
-" -E          käsittele varoitukset virheinä (nollasta poikkeava paluuarvo)\n"
-" -b lkoko    käytä tätä lohkokokoa, on oltava sama kuin sivukoko\n"
-" -e laitos   aseta laitosnumero (osa tied.järj-id:tä)\n"
-" -i tied     sisällytä tiedostokuva tiedostojärjestelmään (vaatii >= 2.4.0)\n"
-" -n nimi     aseta cramfs-tiedostojärjestelmän nimi\n"
-" -p          tasaa %d tavulla käynnistyskoodia varten\n"
-" -s          lajittele hakemistomerkinnät (vanha valitsin, ei huomioida)\n"
-" -z          tee reikiä (vaatii >= 2.3.39)\n"
-" haknimi     pakattavan tiedostojärjestelmän juuri\n"
+" -E          käsittele varoitukset virheinä (nollasta poikkeava paluuarvo)\n"
+" -b lkoko    käytä tätä lohkokokoa, on oltava sama kuin sivukoko\n"
+" -e laitos   aseta laitosnumero (osa tied.järj-id:tä)\n"
+" -i tied     sisällytä tiedostokuva tiedostojärjestelmään (vaatii >= 2.4.0)\n"
+" -n nimi     aseta cramfs-tiedostojärjestelmän nimi\n"
+" -p          tasaa %d tavulla käynnistyskoodia varten\n"
+" -s          lajittele hakemistomerkinnät (vanha valitsin, ei huomioida)\n"
+" -z          tee reikiä (vaatii >= 2.3.39)\n"
+" haknimi     tiivistettävän tiedostojärjestelmän juuri\n"
 " tulostied   tulostiedosto\n"
 
 #: disk-utils/mkfs.cramfs.c:335
@@ -907,14 +905,14 @@ msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
-"Löytyi hyvin pitkä tiedostonimi \"%2$s\" (%1$u tavua).\n"
-" Kasvata vakiota MAX_INPUT_NAMELEN tiedostossa mkcramfs.c ja käännä "
+"Löytyi hyvin pitkä tiedostonimi \"%2$s\" (%1$u tavua).\n"
+" Kasvata vakiota MAX_INPUT_NAMELEN tiedostossa mkcramfs.c ja käännä "
 "uudelleen. Poistutaan.\n"
 
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
 msgid "filesystem too big.  Exiting.\n"
-msgstr "tiedostojärjestelmä on liian suuri. Poistutaan.\n"
+msgstr "tiedostojärjestelmä on liian suuri. Poistutaan.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
@@ -922,10 +920,9 @@ msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
-"MAXENTRIES ylitetty. Kasvata tätä arvoa tiedostossa mkcramfs.c ja käännä "
+"MAXENTRIES ylitetty. Kasvata tätä arvoa tiedostossa mkcramfs.c ja käännä "
 "uudelleen. Poistutaan.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -942,13 +939,13 @@ msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
 "image size is %uMB.  We might die prematurely.\n"
 msgstr ""
-"varoitus: arviokoko (yläraja) on %Ld Mt, mutta suurin kuvakoko on %u Mt. "
-"Prosessi saattaa päättyä ennenaikaisesti.\n"
+"varoitus: arviokoko (yläraja) on %Ld Mt, mutta suurin kuvakoko on %u Mt. "
+"Prosessi saattaa päättyä ennenaikaisesti.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
-msgstr "Sisällytetään: %s\n"
+msgstr "Sisällytetään: %s\n"
 
 #: disk-utils/mkfs.cramfs.c:866
 #, c-format
@@ -974,21 +971,17 @@ msgstr "CRC: %x\n"
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
-"ROM-kuvalle ei ole varattu riittävästi tilaa (%Ld varattu, %d käytetty)\n"
+"ROM-kuvalle ei ole varattu riittävästi tilaa (%Ld varattu, %d käytetty)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
-msgstr "ROM-kuvan kirjoitus epäonnistui (%d %d)\n"
+msgstr "ROM-kuvan kirjoitus epäonnistui (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "varoitus: tiedostonimet typistetään 255 tavuun.\n"
+msgstr "varoitus: tiedostonimet typistetään 255 tavuun.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 #, c-format
@@ -1005,13 +998,13 @@ msgstr ""
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "varoitus: uid:t typistetty %u bittiin. (Tämä voi olla turvaongelma.)\n"
+msgstr "varoitus: uid:t typistetty %u bittiin. (Tämä voi olla turvaongelma.)\n"
 
 #: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "varoitus: gid:t typistetty %u bittiin. (Tämä voi olla turvaongelma.)\n"
+msgstr "varoitus: gid:t typistetty %u bittiin. (Tämä voi olla turvaongelma.)\n"
 
 #: disk-utils/mkfs.cramfs.c:933
 #, c-format
@@ -1019,30 +1012,30 @@ msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
 "that some device files will be wrong.\n"
 msgstr ""
-"VAROITUS: laitenumerot typistetty %u bittiin. Tämä tarkoittaa lähes\n"
-"varmasti, että jotkut laitetiedostot ovat väärin.\n"
+"VAROITUS: laitenumerot typistetty %u bittiin. Tämä tarkoittaa lähes\n"
+"varmasti, että jotkut laitetiedostot ovat väärin.\n"
 
 #: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr "Käyttö: %s [-c | -l tiedostonimi] [-nXX] [-iXX] /dev/nimi [lohkot]\n"
+msgstr "Käyttö: %s [-c | -l tiedostonimi] [-nXX] [-iXX] /dev/nimi [lohkot]\n"
 
 #: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
-msgstr "%s on liitetty; ei tehdä tiedostojärjestelmää tähän!"
+msgstr "%s on liitetty; ei tehdä tiedostojärjestelmää tähän!"
 
 #: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
-msgstr "siirtyminen käynnistyslohkoon epäonnistui funktiossa write_tables"
+msgstr "siirtyminen käynnistyslohkoon epäonnistui funktiossa write_tables"
 
 #: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
-msgstr "käynnistyssektorin tyhjentäminen ei onnistu"
+msgstr "käynnistyssektorin tyhjentäminen ei onnistu"
 
 #: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
-msgstr "siirtyminen epäonnistui funktiossa write_tables"
+msgstr "siirtyminen epäonnistui funktiossa write_tables"
 
 #: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
@@ -1050,7 +1043,7 @@ msgstr "i-solmukarttaa ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
-msgstr "vyöhykekarttaa ei voi kirjoittaa"
+msgstr "vyöhykekarttaa ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
@@ -1058,9 +1051,8 @@ msgstr "i-solmuja ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
-msgstr "kirjoitus epäonnistui funktiossa write_block"
+msgstr "kirjoitus epäonnistui funktiossa write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1068,7 +1060,7 @@ msgstr "liian monta viallista lohkoa"
 
 #: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
-msgstr "ei riittävästi ehjiä lohkoja"
+msgstr "ei riittävästi ehjiä lohkoja"
 
 #: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
@@ -1089,22 +1081,22 @@ msgstr ""
 
 #: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
-msgstr "siirtyminen epäonnistui lohkojen testauksen aikana"
+msgstr "siirtyminen epäonnistui lohkojen testauksen aikana"
 
 #: disk-utils/mkfs.minix.c:534
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
-"Outoja arvoja funktiossa do_check: todennäköisesti ohjelmistovirheitä\n"
+"Outoja arvoja funktiossa do_check: todennäköisesti ohjelmistovirheitä\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
-msgstr "siirtyminen epäonnistui funktiossa check_blocks"
+msgstr "siirtyminen epäonnistui funktiossa check_blocks"
 
 #: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
-"virheellisiä lohkoja ennen data-aluetta: tiedostojärjestelmää ei voi luoda"
+"virheellisiä lohkoja ennen data-aluetta: tiedostojärjestelmää ei voi luoda"
 
 #: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
@@ -1118,12 +1110,12 @@ msgstr "yksi viallinen lohko\n"
 
 #: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
-msgstr "vialliset lohkot sisältävää tiedostoa ei voi avata"
+msgstr "vialliset lohkot sisältävää tiedostoa ei voi avata"
 
 #: disk-utils/mkfs.minix.c:674
 #, c-format
 msgid "strtol error: number of blocks not specified"
-msgstr "strtol-virhe: lohkojen määrää ei ole annettu"
+msgstr "strtol-virhe: lohkojen määrää ei ole annettu"
 
 #: disk-utils/mkfs.minix.c:704
 #, c-format
@@ -1138,108 +1130,108 @@ msgstr "tiedoston %s tilaa ei voi lukea"
 #: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "ei yritetä luoda tiedostojärjestelmää kohteeseen \"%s\""
+msgstr "ei yritetä luoda tiedostojärjestelmää kohteeseen \"%s\""
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr "Käyttäjän antama sivukoko %d on virheellinen\n"
+msgstr "Käyttäjän antama sivukoko %d on virheellinen\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
-"Käytetään käyttäjän antamaa sivukokoa %d järjestelmän arvojen %d/%d sijaan\n"
+"Käytetään käyttäjän antamaa sivukokoa %d järjestelmän arvojen %d/%d sijaan\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Oletetaan sivujen kooksi %d (ei %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
-msgstr ""
+msgstr "Virheellinen sivutusotsakkeen koko, nimiötä ei kirjoitettu.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "Nimiötä lyhennettiin.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "nimiö"
+msgstr "ei nimiötä, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "ei uuid:tä\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr "Käyttö: %s [-c] [-v0|-v1] [-pSIVUKOKO] /dev/nimi [lohkot]\n"
+msgstr "Käyttö: %s [-c] [-v0|-v1] [-pSIVUKOKO] [-L nimiö] /dev/nimi [lohkot]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "liian monta viallista sivua"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Muisti lopussa"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "yksi viallinen sivu\n"
 
-#: disk-utils/mkswap.c:438
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:437
+#, c-format
 msgid "%lu bad pages\n"
-msgstr "%d viallista sivua\n"
+msgstr "%lu viallista sivua\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: virhe: Sivutustilan kohde?\n"
 
-#: disk-utils/mkswap.c:592
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:591
+#, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
-msgstr "%s: virhe: koko %ld on suurempi kuin laitteen koko %d\n"
+msgstr "%s: virhe: koko %lu on suurempi kuin laitteen koko %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: virhe: tuntematon versio %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr "%s: virhe: sivutusalueen on oltava vähintään %ld kt:n kokoinen\n"
+msgstr "%s: virhe: sivutusalueen on oltava vähintään %ld kt:n kokoinen\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr "%s: varoitus: typistetään sivutusalue kokoon %ld kt\n"
+msgstr "%s: varoitus: typistetään sivutusalue kokoon %ld kt\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: virhe: Sivutustilan kohde?\n"
+msgstr "%s: virhe: vasta sivutustilan versio 1 tukee nimiöitä\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "Ei yritetä luoda sivutuslaitetta kohteeseen \"%s\""
+msgstr "Ei yritetä luoda sivutuslaitetta kohteeseen \"%s\""
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
-msgstr "vakavaa: ensimmäinen sivu on lukukelvoton"
+msgstr "vakavaa: ensimmäinen sivu on lukukelvoton"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1247,127 +1239,89 @@ msgid ""
 "No swap created. If you really want to create swap v0 on that device, use\n"
 "the -f option to force it.\n"
 msgstr ""
-"%s: Laitteella \"%s\" on kelvollinen Sun-levynimiö.\n"
-"Tämä tarkoittaa todennäköisesti sitä, että v0-sivutuksen luominen tuhoaisi\n"
+"%s: Laitteella \"%s\" on kelvollinen Sun-levynimiö.\n"
+"Tämä tarkoittaa todennäköisesti sitä, että v0-sivutuksen luominen tuhoaisi\n"
 "osiotaulun. Sivutusta ei luotu. Jos todella haluat luoda v0-sivutuksen\n"
-"kyseiselle laitteelle, käytä valitsinta -f sen pakottamiseen.\n"
+"kyseiselle laitteelle, käytä valitsinta -f sen pakottamiseen.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Sivutustilaa ei voi luoda: ei luettavissa"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Asetetaan sivutustila, versio %d, koko = %llu kt\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
-msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
+msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "allekirjoitussivua ei voi kirjoittaa"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
-msgstr "fsync epäonnistui"
-
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Virheellinen luku: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaksivirhe: \"%s\"\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Parametria ei ole asetettu: \"%s\"\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] laite nimi\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] laite koko sekt päät raidat venytys väli aste erik1 fmt_väli\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] laite\n"
+msgstr "fsync epäonnistui"
 
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] laite\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
-msgstr "Ei käytettävissä"
+msgstr "Ei käytettävissä"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Vapaa tila"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
-#, fuzzy
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
-msgstr "Linux XFS"
+msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Levy on vaihdettu.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
-"Järjestelmä on syytä käynnistää uudelleen osiotaulun päivittymisen "
+"Järjestelmä on syytä käynnistää uudelleen osiotaulun päivittymisen "
 "varmistamiseksi.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1377,341 +1331,318 @@ msgid ""
 msgstr ""
 "\n"
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
-"katso lisätietoja cfdiskin manuaalista.\n"
+"katso lisätietoja cfdiskin manuaalista.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "VAKAVA VIRHE"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
-msgstr "Paina mitä tahansa näppäintä poistuaksesi cfdiskistä"
+msgstr "Paina mitä tahansa näppäintä poistuaksesi cfdiskistä"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
-msgstr "Levyasemalla ei voi siirtyä"
+msgstr "Levyasemalla ei voi siirtyä"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Levyasemaa ei voi lukea"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Levyasemalle ei voi kirjoittaa"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Liian monta osiota"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Osion alku on ennen sektoria 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Osion loppu on ennen sektoria 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
-msgstr "Osion alku on levyn lopun jälkeen"
+msgstr "Osion alku on levyn lopun jälkeen"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
-msgstr "Osion loppu on levyn lopun jälkeen"
+msgstr "Osion loppu on levyn lopun jälkeen"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
-msgstr "Osion loppu on viimeisellä osittaisella sylinterillä"
+msgstr "Osion loppu on viimeisellä osittaisella sylinterillä"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
-msgstr "loogiset osiot eivät ole levyjärjestyksessä"
+msgstr "loogiset osiot eivät ole levyjärjestyksessä"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
-msgstr "loogiset osiot ovat päällekkäiset"
+msgstr "loogiset osiot ovat päällekkäiset"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
-msgstr "suurennetut loogiset osiot ovat päällekkäiset"
+msgstr "suurennetut loogiset osiot ovat päällekkäiset"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!!! Sisäinen virhe luotaessa loogista asemaa ilman laajennettua osiota !!!!"
+"!!!! Sisäinen virhe luotaessa loogista asemaa ilman laajennettua osiota !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
-"Tähän ei voi luoda loogista asemaa -- luotaisiin kaksi laajennettua osiota"
+"Tähän ei voi luoda loogista asemaa -- luotaisiin kaksi laajennettua osiota"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
-msgstr "Liian pitkä valikon kohta. Valikko voi näyttää oudolta."
+msgstr "Liian pitkä valikon kohta. Valikko voi näyttää oudolta."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "Valikko ilman suuntaa. Käytetään oletuksena vaakasuuntaa."
+msgstr "Valikko ilman suuntaa. Käytetään oletuksena vaakasuuntaa."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
-msgstr "Väärä näppäin"
+msgstr "Väärä näppäin"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
-msgstr "Paina näppäintä jatkaaksesi"
+msgstr "Paina näppäintä jatkaaksesi"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
-msgstr "Ensiö"
+msgstr "Ensiö"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
-msgstr "Luo uusi ensiöosio"
+msgstr "Luo uusi ensiöosio"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Looginen"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Luo uusi looginen osio"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
-msgstr "Älä luo osiota"
+msgstr "Älä luo osiota"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
-msgstr "!!! Sisäinen virhe !!!"
+msgstr "!!! Sisäinen virhe !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Koko (Mt): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Alku"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
-msgstr "Lisää osio tyhjän tilan alkuun"
+msgstr "Lisää osio tyhjän tilan alkuun"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Loppu"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
-msgstr "Lisää osio tyhjän tilan loppuun"
+msgstr "Lisää osio tyhjän tilan loppuun"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Laajennetun osion luomiseen ei ole tilaa"
 
-#: fdisk/cfdisk.c:1565
-#, fuzzy
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
-msgstr "osiotaulua ei ole.\n"
+msgstr "Ei osiotaulua.\n"
 
-#: fdisk/cfdisk.c:1569
-#, fuzzy
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
-msgstr "Ei osiotaulua tai tuntematon allekirjoitus osiotaulussa"
+msgstr "Ei osiotaulua. Aloitetaan tyhjällä taululla."
 
-#: fdisk/cfdisk.c:1579
-#, fuzzy
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
-msgstr "Näytä osiotaulu"
+msgstr "Osiotaulun allekirjoitus on virheellinen"
 
-#: fdisk/cfdisk.c:1583
-#, fuzzy
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
-msgstr "osiotaulua ei ole.\n"
+msgstr "Tuntematon osiotaulun tyyppi"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr "Haluatko aloittaa tyhjällä osiotaululla [y/N]?"
+msgstr "Haluatko aloittaa tyhjällä osiotaululla [y/N]?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
-msgstr "Annoit suuremman sylinterimäärän kuin levylle mahtuu"
+msgstr "Annettu sylinterimäärä ei mahdu levylle"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Levyasemaa ei voi avata"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Levy avattiin vain luku -tilassa - sinulla ei ole kirjoitusoikeutta"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Levyn kokoa ei voi hakea"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
-msgstr "Viallinen ensiöosio"
+msgstr "Viallinen ensiöosio"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Viallinen looginen osio"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Varoitus!! Tämä voi tuhota dataa levyltä!"
+msgstr "Varoitus!! Tämä voi tuhota dataa levyltä!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
-"Oletko varma, että haluat kirjoittaa osiotaulun levylle? (kyllä tai ei):"
+"Oletko varma, että haluat kirjoittaa osiotaulun levylle? (kyllä tai ei):"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Osiotaulua ei kirjoitettu levylle"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
-msgstr "kyllä"
+msgstr "kyllä"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
-msgstr "Kirjoita \"kyllä\" tai \"ei\""
+msgstr "Kirjoita \"kyllä\" tai \"ei\""
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Kirjoitetaan osiotaulua levylle..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Osiotaulu kirjoitettiin levylle"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
-"Osiotaulu kirjoitettiin, mutta uudelleenluku epäonnistui. Tietokone on "
-"käynnistettävä uudelleen, jotta taulu päivittyy."
+"Osiotaulu kirjoitettiin, mutta uudelleenluku epäonnistui. Tietokone on "
+"käynnistettävä uudelleen, jotta taulu päivittyy."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Yhtään ensiöosiota ei ole merkitty käynnistettäväksi. DOS MBR ei käynnistä "
-"tätä."
+"Yhtään ensiöosiota ei ole merkitty käynnistettäväksi. DOS MBR ei käynnistä "
+"tätä."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Useampi kuin yksi ensiöosio on merkitty käynnistettäväksi. DOS MBR ei "
-"käynnistä tätä."
+"Useampi kuin yksi ensiöosio on merkitty käynnistettäväksi. DOS MBR ei "
+"käynnistä tätä."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
-msgstr "Syötä tiedostonimi tai paina RETURN saadaksesi näytölle: "
+msgstr "Syötä tiedostonimi tai paina RETURN saadaksesi näytölle: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Tiedostoa \"%s\" ei voi avata"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Levyasema: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektori 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektori %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
-msgstr "   Ei mitään"
+msgstr "   Ei mitään"
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Ens/Loog"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
-msgstr "   Ensiö"
+msgstr "   Ensiö"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Looginen"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
-msgstr "Käynnistettävä"
+msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
-msgstr "Ei mitään"
+msgstr "Ei mitään"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Laitteen %s osiotaulu\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Alku-      Loppu-\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
-" # Tyyppi    sektori     sektori   Siirt.    Pituus   Tied.järj. tyyppi (ID) "
+" # Tyyppi    sektori     sektori   Siirt.    Pituus   Tied.järj. tyyppi (ID) "
 "Liput\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1719,467 +1650,464 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Alku----         ----Loppu----    Alku-     Sektorien\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
-msgstr " # Liput Päät Sekt Syl   ID  Päät Sekt Syl    sektori    määrä\n"
+msgstr " # Liput Päät Sekt Syl   ID  Päät Sekt Syl    sektori    määrä\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- ------------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Raaka"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
-msgstr "Näytä taulu raa'assa datamuodossa"
+msgstr "Näytä taulu raa'assa datamuodossa"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorit"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
-msgstr "Näytä taulu järjestettynä sektoreiden mukaan"
+msgstr "Näytä taulu järjestettynä sektoreiden mukaan"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Taulu"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
-msgstr "Näytä osiotaulu"
+msgstr "Näytä osiotaulu"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
-msgstr "Älä näytä taulua"
+msgstr "Älä näytä taulua"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Cfdiskin ohjeruutu"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr "Tämä on cfdisk, curses-pohjainen levynosiointiohjelma, "
+msgstr "Tämä on cfdisk, curses-pohjainen levynosiointiohjelma, "
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "jolla voi luoda, poistaa ja muuttaa kiintolevyllä "
+msgstr "jolla voi luoda, poistaa ja muuttaa kiintolevyllä "
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "olevia osioita."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
-msgstr "Copyright © 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright © 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Komento      Merkitys"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr "  b          Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
+msgstr "  b          Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
-msgstr "  g          Muuta sylinteri-, pää- ja sektoriparametreja"
+msgstr "  g          Muuta sylinteri-, pää- ja sektoriparametreja"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
-msgstr "             VAROITUS: Tätä valitsinta tulee käyttää vain niiden,"
+msgstr "             VAROITUS: Tätä valitsinta tulee käyttää vain niiden,"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
-msgstr "             jotka tietävät mitä ovat tekemässä."
+msgstr "             jotka tietävät mitä ovat tekemässä."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
-msgstr "  h          Näytä tämä ohjeruutu"
+msgstr "  h          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
-msgstr "  m          Maksimoi nykyisen osion levynkäyttö"
+msgstr "  m          Maksimoi nykyisen osion levynkäyttö"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
-msgstr "             Huom: Tämä saattaa tehdä osiosta epäyhteensopivan"
+msgstr "             Huom: Tämä saattaa tehdä osiosta epäyhteensopivan"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             mm. DOSin ja OS/2:n kanssa."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
-msgstr "  n          Luo uusi osio tyhjästä tilasta"
+msgstr "  n          Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Osioille on useita erilaisia muotoja,"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             joista voit valita:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
-"                r - Raaka data (tasan se, mitä levylle kirjoitettaisiin)"
+"                r - Raaka data (tasan se, mitä levylle kirjoitettaisiin)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
-msgstr "                s - Sektoreittain järjestetty taulu"
+msgstr "                s - Sektoreittain järjestetty taulu"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Taulu raa'assa muodossa"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
-msgstr "  t          Muuta tiedostojärjestelmän tyyppiä"
+msgstr "  t          Muuta tiedostojärjestelmän tyyppiä"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
-msgstr "  u          Muuta osiokokonäkymän yksiköitä"
+msgstr "  u          Muuta osiokokonäkymän yksiköitä"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
-msgstr "             Vaihtaa megatavujen, sektoreiden ja sylinterien välillä"
+msgstr "             Vaihtaa megatavujen, sektoreiden ja sylinterien välillä"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Kirjoita osiotaulu levylle (on annettava iso kirjain W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
-msgstr "             Koska tämä saattaa tuhota levyllä olevaa dataa, kirjoitus"
+msgstr "             Koska tämä saattaa tuhota levyllä olevaa dataa, kirjoitus"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
-"             on joko varmistettava tai peruttava kirjoittamalla \"kyllä\" tai"
+"             on joko varmistettava tai peruttava kirjoittamalla \"kyllä\" tai"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             \"ei\""
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
-msgstr "Nuoli ylös   Siirrä osoitin edelliseen osioon"
+msgstr "Nuoli ylös   Siirrä osoitin edelliseen osioon"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Nuoli alas   Siirrä osoitin seuraavaan osioon"
+msgstr "Nuoli alas   Siirrä osoitin seuraavaan osioon"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
-msgstr "CTRL-L       Piirtää ruudun uudelleen"
+msgstr "CTRL-L       Piirtää ruudun uudelleen"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
-msgstr "  ?          Näytä tämä ohjeruutu"
+msgstr "  ?          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Huom: Kaikki komennot voi antaa joko isoilla tai pienillä"
+msgstr "Huom: Kaikki komennot voi antaa joko isoilla tai pienillä"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "kirjaimilla (paitsi taulun kirjoitus (W) )."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Sylinterit"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Muuta sylinterigeometriaa"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
-msgstr "Päät"
+msgstr "Päät"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
-msgstr "Vaihda päägeometriaa"
+msgstr "Vaihda päägeometriaa"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Vaihda sektorigeometriaa"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Valmis"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Geometrian muutos valmis"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
-msgstr "Anna sylinterien määrä: "
+msgstr "Anna sylinterien määrä: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Virheellinen sylinteriarvo"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
-msgstr "Anna päiden määrä: "
+msgstr "Anna päiden määrä: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
-msgstr "Virheellinen pääarvo"
+msgstr "Virheellinen pääarvo"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
-msgstr "Anna sektorien määrä uraa kohden: "
+msgstr "Anna sektorien määrä uraa kohden: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
-msgstr "Virheellinen sektorimäärä"
+msgstr "Virheellinen sektorimäärä"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
-msgstr "Anna tiedostojärjestelmän tyyppi: "
+msgstr "Anna tiedostojärjestelmän tyyppi: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
-msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa tyhjäksi"
+msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa tyhjäksi"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
-msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa laajennetuksi"
+msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa laajennetuksi"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tunt(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Ens/Loog"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tuntematon (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Levyasema: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Koko: %lld tavua, %lld Mt"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Koko: %lld tavua, %lld.%lld Gt"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
-msgstr "Päät: %d   Sektorit/ura: %d   Sylinterit: %lld"
+msgstr "Päät: %d   Sektorit/ura: %d   Sylinterit: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Liput"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Osiotyyppi"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
-msgstr "Tied.järj.tyyppi"
+msgstr "Tied.järj.tyyppi"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
-msgstr "[Nimiö]"
+msgstr "[Nimiö]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Sektorit"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr " Sylinterit"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr " Koko (Mt)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr " Koko (Gt)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
-msgstr "Käynnistettävä"
+msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
-msgstr "Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
+msgstr "Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Poista"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta levyn geometriaa (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Ohje"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
-msgstr "Näytä ohjeruutu"
+msgstr "Näytä ohjeruutu"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "Maksimoi nykyisen osion tilankäyttö (vain asiantuntijoille)"
+msgstr "Maksimoi nykyisen osion tilankäyttö (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Uusi"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
-msgstr "Luo uusi osio tyhjästä tilasta"
+msgstr "Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
-msgstr "Näytä"
+msgstr "Näytä"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Lopeta"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tyyppi"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Vaihda tiedostojärjestelmän tyyppi (DOS, Linux, OS/2, jne)"
+msgstr "Vaihda tiedostojärjestelmän tyyppi (DOS, Linux, OS/2, jne)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
-msgstr "Yksiköt"
+msgstr "Yksiköt"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "Vaihda osiokokonäytön yksiköt (Mt, sekt, syl)"
+msgstr "Vaihda osiokokonäytön yksiköt (Mt, sekt, syl)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Kirjoita"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
-msgstr "Kirjoita osiotaulu levylle (tämä saattaa tuhota dataa)"
+msgstr "Kirjoita osiotaulu levylle (tämä saattaa tuhota dataa)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
-msgstr "Tästä osiosta ei voi tehdä käynnistettävää"
+msgstr "Tästä osiosta ei voi tehdä käynnistettävää"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
-msgstr "Tyhjää osiota ei voi poistaa"
+msgstr "Tyhjää osiota ei voi poistaa"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
-msgstr "Tätä osiota ei voi maksimoida"
+msgstr "Tätä osiota ei voi maksimoida"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
-msgstr "Tämä osio on ei ole käytettävissä"
+msgstr "Tämä osio on ei ole käytettävissä"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
-msgstr "Tämä osio on jo käytössä"
+msgstr "Tämä osio on jo käytössä"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
-msgstr "Tyhjän osion tyyppiä ei voi vaihtaa"
+msgstr "Tyhjän osion tyyppiä ei voi vaihtaa"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
-msgstr "Ei enempää osioita"
+msgstr "Ei enempää osioita"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Virheellinen komento"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright © 1994-2002 Kevin E. Martin & aeb\n"
+msgstr "Copyright © 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2199,19 +2127,19 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Käyttö:\n"
-"Näytä versio:\n"
+"Käyttö:\n"
+"Näytä versio:\n"
 "        %s -v\n"
-"Näytä osiotaulu:\n"
+"Näytä osiotaulu:\n"
 "        %s -P {r|s|t} [valitsimet] laite\n"
-"Vuorovaikutteinen käyttö:\n"
+"Vuorovaikutteinen käyttö:\n"
 "        %s [valitsimet] laite\n"
 "\n"
 "Valitsimet:\n"
-"-a: Käytä nuolta korostuksen asemesta;\n"
-"-z: Aloita tyhjällä osiotaululla, osiotaulua ei lueta levyltä;\n"
-"-c C -h H -s S: Ohita ytimen mielipide sylinterien ja päiden määrästä,\n"
-"                sekä sektoreita/ura-määrästä.\n"
+"-a: Käytä nuolta korostuksen asemesta;\n"
+"-z: Aloita tyhjällä osiotaululla, osiotaulua ei lueta levyltä;\n"
+"-c C -h H -s S: Ohita ytimen mielipide sylinterien ja päiden määrästä,\n"
+"                sekä sektoreita/ura-määrästä.\n"
 "\n"
 
 #: fdisk/fdiskaixlabel.c:27
@@ -2230,16 +2158,16 @@ msgid ""
 "\t   machine.  (Otherwise you become an AIXpert)."
 msgstr ""
 "\n"
-"\tTällä levyllä on kelvollinen AIX-nimiö.\n"
+"\tTällä levyllä on kelvollinen AIX-nimiö.\n"
 "\tValitettavasti Linux ei toistaiseksi osaa \n"
-"\tkäsitellä tällaisia levyjä. Siitä huolimatta\n"
+"\tkäsitellä tällaisia levyjä. Siitä huolimatta\n"
 "\tjoitakin neuvoja:\n"
 "\t1. fdisk tuhoaa levyn tiedot kirjoitettaessa.\n"
-"\t2. Varmista, että tämä levy EI ole enää elintärkeä\n"
-"\t   osa osioryhmää. (Jos on, muutkin levyt saattavat\n"
-"\t   tyhjentyä, ellei niitä ole peilattu.)\n"
-"\t3. Varmista ennen tämän fyysisen osion tuhoamista,\n"
-"\t   että levy on loogisesti poistettu AIX-koneesta.\n"
+"\t2. Varmista, että tämä levy EI ole enää elintärkeä\n"
+"\t   osa osioryhmää. (Jos on, muutkin levyt saattavat\n"
+"\t   tyhjentyä, ellei niitä ole peilattu.)\n"
+"\t3. Varmista ennen tämän fyysisen osion tuhoamista,\n"
+"\t   että levy on loogisesti poistettu AIX-koneesta.\n"
 "\t   (Muussa tapauksessa sinusta tulee AIXpertti)."
 
 #: fdisk/fdiskbsdlabel.c:122
@@ -2249,11 +2177,11 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 "\n"
-"BSD-nimiö laitteelle: %s\n"
+"BSD-nimiö laitteelle: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Komento  merkitys"
 
@@ -2271,53 +2199,52 @@ msgstr "   i    asenna esilatausohjelma"
 
 #: fdisk/fdiskbsdlabel.c:133
 msgid "   l   list known filesystem types"
-msgstr "   l    listaa tunnetut tiedostojärjestelmätyypit"
+msgstr "   l    listaa tunnetut tiedostojärjestelmätyypit"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
-msgstr "   m    näytä tämä valikko"
+msgstr "   m    näytä tämä valikko"
 
 #: fdisk/fdiskbsdlabel.c:135
 msgid "   n   add a new BSD partition"
-msgstr "   n    lisää uusi BSD-osio"
+msgstr "   n    lisää uusi BSD-osio"
 
 #: fdisk/fdiskbsdlabel.c:136
 msgid "   p   print BSD partition table"
-msgstr "   p    näytä BSD-osiotaulu"
+msgstr "   p    näytä BSD-osiotaulu"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q    lopeta tallentamatta muutoksia"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
-msgstr "   r    palaa päävalikkoon"
+msgstr "   r    palaa päävalikkoon"
 
 #: fdisk/fdiskbsdlabel.c:139
 msgid "   s   show complete disklabel"
-msgstr "   s    näytä täydellinen levynimiö"
+msgstr "   s    näytä täydellinen levynimiö"
 
 #: fdisk/fdiskbsdlabel.c:140
 msgid "   t   change a partition's filesystem id"
-msgstr "   t    vaihda osion tiedostojärjestelmä-id:tä"
+msgstr "   t    vaihda osion tiedostojärjestelmä-id:tä"
 
 #: fdisk/fdiskbsdlabel.c:141
 msgid "   u   change units (cylinders/sectors)"
-msgstr "   u    vaihda yksiköt (sylinterit/sektorit)"
+msgstr "   u    vaihda yksiköt (sylinterit/sektorit)"
 
 #: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
-msgstr "   w    kirjoita levynimiö levylle"
+msgstr "   w    kirjoita levynimiö levylle"
 
 #: fdisk/fdiskbsdlabel.c:144
 msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x    linkitä BSD-osio ei-BSD-osioon"
+msgstr "   x    linkitä BSD-osio ei-BSD-osioon"
 
 #: fdisk/fdiskbsdlabel.c:176
 #, c-format
@@ -2327,7 +2254,7 @@ msgstr "Osiolla %s on virheellinen alkusektori 0.\n"
 #: fdisk/fdiskbsdlabel.c:180
 #, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Luetaan laitteen %s levynimiötä sektorilta %d.\n"
+msgstr "Luetaan laitteen %s levynimiötä sektorilta %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
@@ -2336,15 +2263,15 @@ msgstr "Laitteella %s ei ole *BSD-osiota.\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
-msgstr "BSD-levynimiökomento (m antaa ohjeen): "
+msgstr "BSD-levynimiökomento (m antaa ohjeen): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
-msgstr "Ensimmäinen %s"
+msgstr "Ensimmäinen %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimeinen %s tai +koko tai +kokoM tai +kokoK"
@@ -2367,7 +2294,7 @@ msgstr "levy: %.*s\n"
 #: fdisk/fdiskbsdlabel.c:322
 #, c-format
 msgid "label: %.*s\n"
-msgstr "nimiö: %.*s\n"
+msgstr "nimiö: %.*s\n"
 
 #: fdisk/fdiskbsdlabel.c:323
 #, c-format
@@ -2377,7 +2304,7 @@ msgstr "liput:"
 #: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid " removable"
-msgstr " siirrettävä"
+msgstr " siirrettävä"
 
 #: fdisk/fdiskbsdlabel.c:327
 #, c-format
@@ -2389,8 +2316,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2414,7 +2339,7 @@ msgstr "sektoreita/sylinteri: %ld\n"
 #: fdisk/fdiskbsdlabel.c:337
 #, c-format
 msgid "cylinders: %ld\n"
-msgstr "sylintereitä: %ld\n"
+msgstr "sylintereitä: %ld\n"
 
 #: fdisk/fdiskbsdlabel.c:338
 #, c-format
@@ -2429,17 +2354,17 @@ msgstr "lomitus: %d\n"
 #: fdisk/fdiskbsdlabel.c:340
 #, c-format
 msgid "trackskew: %d\n"
-msgstr "uravääristymä: %d\n"
+msgstr "uravääristymä: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:341
 #, c-format
 msgid "cylinderskew: %d\n"
-msgstr "sylinterivääristymä: %d\n"
+msgstr "sylinterivääristymä: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:342
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "päänvaihto: %ld\t\t# millisekuntia\n"
+msgstr "päänvaihto: %ld\t\t# millisekuntia\n"
 
 #: fdisk/fdiskbsdlabel.c:344
 #, c-format
@@ -2468,16 +2393,16 @@ msgstr "#       alku        loppu    koko     tyyppi   [fkoko bkoko   cpg]\n"
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr "Kirjoitetaan levynimiötä laitteelle %s.\n"
+msgstr "Kirjoitetaan levynimiötä laitteelle %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
 #, c-format
 msgid "%s contains no disklabel.\n"
-msgstr "Laitteella %s ei ole levynimiötä.\n"
+msgstr "Laitteella %s ei ole levynimiötä.\n"
 
 #: fdisk/fdiskbsdlabel.c:427
 msgid "Do you want to create a disklabel? (y/n) "
-msgstr "Haluatko luoda levynimiön? (y/n) "
+msgstr "Haluatko luoda levynimiön? (y/n) "
 
 #: fdisk/fdiskbsdlabel.c:467
 msgid "bytes/sector"
@@ -2491,8 +2416,8 @@ msgstr "sektoria/ura"
 msgid "tracks/cylinder"
 msgstr "uraa/sylinteri"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "sylinterit"
 
@@ -2515,15 +2440,15 @@ msgstr "lomitus"
 
 #: fdisk/fdiskbsdlabel.c:485
 msgid "trackskew"
-msgstr "uravääristymä"
+msgstr "uravääristymä"
 
 #: fdisk/fdiskbsdlabel.c:486
 msgid "cylinderskew"
-msgstr "sylinterivääristymä"
+msgstr "sylinterivääristymä"
 
 #: fdisk/fdiskbsdlabel.c:487
 msgid "headswitch"
-msgstr "päänvaihto"
+msgstr "päänvaihto"
 
 #: fdisk/fdiskbsdlabel.c:488
 msgid "track-to-track seek"
@@ -2537,7 +2462,7 @@ msgstr "Esilatausohjelma: %sboot -> boot%s (%s): "
 #: fdisk/fdiskbsdlabel.c:554
 #, c-format
 msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Esilatausohjelma on päällekkäinen levynimiön kanssa!\n"
+msgstr "Esilatausohjelma on päällekkäinen levynimiön kanssa!\n"
 
 #: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
 #, c-format
@@ -2549,15 +2474,15 @@ msgstr "Esilatausohjelma asennettu laitteelle %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Osio (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
-msgstr "Maksimimäärä osioita on luotu\n"
+msgstr "Maksimimäärä osioita on luotu\n"
 
 #: fdisk/fdiskbsdlabel.c:630
 #, c-format
 msgid "This partition already exists.\n"
-msgstr "Tämä osio on jo olemassa.\n"
+msgstr "Tämä osio on jo olemassa.\n"
 
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
@@ -2573,7 +2498,7 @@ msgstr ""
 "\n"
 "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2584,16 +2509,16 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
-"Käyttö: fdisk [-b SSZ] [-u] LEVY     Muuta osiotaulua\n"
-"        fdisk -l [-b SSZ] [-u] LEVY  Näytä osiotaulu(t)\n"
-"        fdisk -s OSIO                Näytä osio(ide)n koko/koot lohkoina\n"
-"        fdisk -v                     Näytä fdiskin versio\n"
-"Tässä LEVY on esimerkiksi /dev/hdb tai /dev/sda\n"
+"Käyttö: fdisk [-b SSZ] [-u] LEVY     Muuta osiotaulua\n"
+"        fdisk -l [-b SSZ] [-u] LEVY  Näytä osiotaulu(t)\n"
+"        fdisk -s OSIO                Näytä osio(ide)n koko/koot lohkoina\n"
+"        fdisk -v                     Näytä fdiskin versio\n"
+"Tässä LEVY on esimerkiksi /dev/hdb tai /dev/sda\n"
 "ja OSIO on esimerkiksi /dev/hda7\n"
 "-u: anna Alku ja Loppu sektoreina (sylinterien sijaan)\n"
-"-b 2048: (tietyille MO-levyille) käytä 2048 tavun sektoreita\n"
+"-b 2048: (tietyille MO-levyille) käytä 2048 tavun sektoreita\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2602,218 +2527,204 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"Käyttö: fdisk [-l] [-b SSZ] [-u] laite\n"
-"Esim: fdisk /dev/hda  (ensimmäinen IDE-levy)\n"
+"Käyttö: fdisk [-l] [-b SSZ] [-u] laite\n"
+"Esim: fdisk /dev/hda  (ensimmäinen IDE-levy)\n"
 " tai: fdisk /dev/sdc  (kolmas SCSI-levy)\n"
-" tai: fdisk /dev/eda  (ensimmäinen PS/2 ESDI -asema)\n"
+" tai: fdisk /dev/eda  (ensimmäinen PS/2 ESDI -asema)\n"
 " tai: fdisk /dev/rd/c0d0  tai: fdisk /dev/ida/c0d0  (RAID-laitteet)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Laitetta %s ei voi lukea\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
-msgstr "Laitteella %s ei voi siirtyä\n"
+msgstr "Laitteella %s ei voi siirtyä\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Laitteelle %s ei voi kirjoittaa\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
-msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
+msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
-msgstr "Muistia ei voi varata enempää\n"
+msgstr "Muistia ei voi varata enempää\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Vakava virhe\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
-msgstr "   a    aseta vain luku -lippu päälle/pois"
+msgstr "   a    aseta vain luku -lippu päälle/pois"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
-msgstr "   b    muokkaa bsd-levynimiötä"
+msgstr "   b    muokkaa bsd-levynimiötä"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
-msgstr "   c    aseta liitettävyyslippu päälle/pois"
+msgstr "   c    aseta liitettävyyslippu päälle/pois"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d    poista osio"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l    listaa tunnetut osiotyypit"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
-msgstr "   n    lisää uusi osio"
+msgstr "   n    lisää uusi osio"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
-msgstr "   o    luo uusi tyhjä DOS-osiotaulu"
+msgstr "   o    luo uusi tyhjä DOS-osiotaulu"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
-msgstr "   p    näytä osiotaulu"
+msgstr "   p    näytä osiotaulu"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
-msgstr "   s    luo uusi tyhjä Sun-levynimiö"
+msgstr "   s    luo uusi tyhjä Sun-levynimiö"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
-msgstr "   t    vaihda osion järjestelmä-id:tä"
+msgstr "   t    vaihda osion järjestelmä-id:tä"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
-msgstr "   u    vaihda näkymä/syöteyksiköt"
+msgstr "   u    vaihda näkymä/syöteyksiköt"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v    varmista osiotaulu"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w    kirjoita taulu levylle ja poistu"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
-msgstr "   x    lisätoiminnot (vain asiantuntijoille)"
+msgstr "   x    lisätoiminnot (vain asiantuntijoille)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
-msgstr "   a    valitse käynnistettävä osio"
+msgstr "   a    valitse käynnistettävä osio"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
-msgstr "   b    muokkaa käynnistystiedostomerkintää"
+msgstr "   b    muokkaa käynnistystiedostomerkintää"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c    valitse sgi-sivutusosio"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
-msgstr "   a    aseta käynnistettävyyslippu päälle/pois"
+msgstr "   a    aseta käynnistettävyyslippu päälle/pois"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
-msgstr "   c    aseta dos-yhteensopivuuslippu päälle/pois"
+msgstr "   c    aseta dos-yhteensopivuuslippu päälle/pois"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
-msgstr "   a    muuta vaihtoehtoisten sylinterien määrää"
+msgstr "   a    muuta vaihtoehtoisten sylinterien määrää"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
-msgstr "   c    muuta sylinterien määrää"
+msgstr "   c    muuta sylinterien määrää"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
-msgstr "   d    näytä osiotaulun raaka data"
+msgstr "   d    näytä osiotaulun raaka data"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
-msgstr "   e    muuta sylinterikohtaisten lisäsektorien määrää"
+msgstr "   e    muuta sylinterikohtaisten lisäsektorien määrää"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
-msgstr "   h    muuta päiden määrää"
+msgstr "   h    muuta päiden määrää"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i    muuta lomituskerrointa"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
-msgstr "   o    muuta pyörimisnopeutta (rpm)"
+msgstr "   o    muuta pyörimisnopeutta (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
-msgstr "   s    muuta sektorien määrää uraa kohden"
+msgstr "   s    muuta sektorien määrää uraa kohden"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
-msgstr "   y    muuta fyysisten sylintereiden määrää"
+msgstr "   y    muuta fyysisten sylintereiden määrää"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
-msgstr "   b    siirrä datan alkua osiossa"
+msgstr "   b    siirrä datan alkua osiossa"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e    listaa laajennetut osiot"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g    luo IRIX (SGI) -osiotaulu"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
-msgstr "   f    korjaa osiojärjestys"
+msgstr "   f    korjaa osiojärjestys"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "On asetettava"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
-msgstr "päät"
+msgstr "päät"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 "%s%s.\n"
-"Tämän voi tehdä lisätoimintovalikosta.\n"
+"Tämän voi tehdä lisätoimintovalikosta.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " ja "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2825,36 +2736,38 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 "\n"
-"Tämän levyn sylintereiden määräksi on asetettu %d.\n"
-"Siinä ei ole mitään vikaa, mutta se on suurempi kuin 1024, ja voi\n"
-"tietyissä kokoonpanoissa aiheuttaa ongelmia seuraavissa tapauksissa:\n"
-"1) käynnistyksessä ajettavat ohjelmat (esim. LILOn vanhat versiot)\n"
-"2) muiden käyttöjärjestelmien käynnistys- ja osiointiohjelmat\n"
+"Tämän levyn sylintereiden määräksi on asetettu %d.\n"
+"Siinä ei ole mitään vikaa, mutta se on suurempi kuin 1024, ja voi\n"
+"tietyissä kokoonpanoissa aiheuttaa ongelmia seuraavissa tapauksissa:\n"
+"1) käynnistyksessä ajettavat ohjelmat (esim. LILOn vanhat versiot)\n"
+"2) muiden käyttöjärjestelmien käynnistys- ja osiointiohjelmat\n"
 "   (esim. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
-msgstr "Virheellinen siirtymä laajennetussa ensiöosiossa\n"
+msgstr "Virheellinen siirtymä laajennetussa ensiöosiossa\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
+"Varoitus: ei huomioida #%d:n jälkeisiä osioita.\n"
+"Ne tuhotaan jos tämä osiotaulu tallennetaan.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "Varoitus: ylimääräinen linkkiosoitin osiotaulussa %d\n"
+msgstr "Varoitus: ylimääräinen linkkiosoitin osiotaulussa %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
-msgstr "Varoitus: jätetään huomiotta ylimääräinen data osiotaulussa %d\n"
+msgstr "Varoitus: jätetään huomiotta ylimääräinen data osiotaulussa %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2862,47 +2775,47 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Muodostetaan uusi DOS-levynimiö. Muutokset tehdään vain käyttömuistiin,\n"
-"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
-"tietenkään voida enää palauttaa.\n"
+"Muodostetaan uusi DOS-levynimiö. Muutokset tehdään vain käyttömuistiin,\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
+"tietenkään voida enää palauttaa.\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Huom: sektorikoko on %d (ei %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Et pysty kirjoittamaan osiotaulua.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
-"Tällä levyllä on sekä DOS-, että BSD-taikatavut.\n"
+"Tällä levyllä on sekä DOS-, että BSD-taikatavut.\n"
 "Siirry BSD-tilaan \"b\"-komennolla.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
-msgstr "Laitteella ei ole kelvollista DOS-, Sun-, SGI- eikä OSF-levynimiötä\n"
+msgstr "Laitteella ei ole kelvollista DOS-, Sun-, SGI- eikä OSF-levynimiötä\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
-msgstr "Sisäinen virhe\n"
+msgstr "Sisäinen virhe\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr "Ylimääräistä laajennettua osiota %d ei huomioida\n"
+msgstr "Ylimääräistä laajennettua osiota %d ei huomioida\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2911,7 +2824,7 @@ msgstr ""
 "Varoitus: osiotaulun %2$d virheellinen lippu 0x%1$04x korjataan "
 "kirjoitettaessa (w)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2920,84 +2833,84 @@ msgstr ""
 "\n"
 "saatiin EOF kolmesti - poistutaan..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Heksakoodi (L listaa koodit): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, oletus %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
-msgstr "Käytetään oletusarvoa %u\n"
+msgstr "Käytetään oletusarvoa %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
-msgstr "Arvo sallitun välin ulkopuolella.\n"
+msgstr "Arvo sallitun välin ulkopuolella.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Osionumero"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
-msgstr "Varoitus: osiolla %d on tyhjä tyyppi\n"
+msgstr "Varoitus: osiolla %d on tyhjä tyyppi\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valittiin osio %d\n"
 
 #
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
-msgstr "Osioita ei ole vielä määritelty!\n"
+msgstr "Osioita ei ole vielä määritelty!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
-msgstr "Kaikki ensiöosiot on jo määritelty!\n"
+msgstr "Kaikki ensiöosiot on jo määritelty!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "sylinteri"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektori"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr "Vaihdetaan näkymä/syöteyksiköiksi %s\n"
+msgstr "Vaihdetaan näkymä/syöteyksiköiksi %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VAROITUS: Osio %d on laajennettu osio\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-yhteensopivuuslippu on asetettu\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-yhteensopivuuslippua ei ole asetettu\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr "Osiota %d ei ole vielä olemassa!\n"
+msgstr "Osiota %d ei ole vielä olemassa!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3005,86 +2918,86 @@ msgid ""
 "type 0 is probably unwise. You can delete\n"
 "a partition using the `d' command.\n"
 msgstr ""
-"Tyyppi 0 merkitsee tyhjää tilaa useissa järjestelmissä\n"
-"(mutta ei Linuxissa). Tyyppiä 0 olevien osioiden\n"
-"pitäminen ei todennäköisesti ole viisasta. Osion voi\n"
-"poistaa käyttämällä \"d\"-komentoa.\n"
+"Tyyppi 0 merkitsee tyhjää tilaa useissa järjestelmissä\n"
+"(mutta ei Linuxissa). Tyyppiä 0 olevien osioiden\n"
+"pitäminen ei todennäköisesti ole viisasta. Osion voi\n"
+"poistaa käyttämällä \"d\"-komentoa.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
-"Osiota ei voi muuttaa laajennetuksi osioksi, eikä päinvastoin.\n"
+"Osiota ei voi muuttaa laajennetuksi osioksi, eikä päinvastoin.\n"
 "Se on poistettava ensin.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
-"Osion 3 tyypiksi on syytä jättää Koko levy (5),\n"
-"koska SunOS/Solaris odottaa sitä, ja jopa Linux pitää siitä.\n"
+"Osion 3 tyypiksi on syytä jättää Koko levy (5),\n"
+"koska SunOS/Solaris odottaa sitä, ja jopa Linux pitää siitä.\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
-"Osion 9 tyypiksi on syytä jättää osio-otsikko (0),\n"
-"ja osion 11 tyypiksi Koko osio (6), koska IRIX odottaa sitä.\n"
+"Osion 9 tyypiksi on syytä jättää osio-otsikko (0),\n"
+"ja osion 11 tyypiksi Koko osio (6), koska IRIX odottaa sitä.\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
-msgstr "Osion %d järjestelmätyypiksi vaihdettiin %x (%s)\n"
+msgstr "Osion %d järjestelmätyypiksi vaihdettiin %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Osiolla %d on eri fyysiset/loogiset alkukohdat (ei-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyysinen=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "looginen=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Osiolla %d on eri fyysiset/loogiset loppukohdat:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Osion %i alku ei ole sylinterin rajalla:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
-msgstr "pitää olla (%d, %d, 1)\n"
+msgstr "pitää olla (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Osion %i loppu ei ole sylinterin rajalla.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
-msgstr "pitää olla (%d, %d, %d)\n"
+msgstr "pitää olla (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3093,7 +3006,7 @@ msgstr ""
 "\n"
 "Levy %s: %ld Mt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3102,59 +3015,62 @@ msgstr ""
 "\n"
 "Levy %s: %ld.%ld Gt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
-msgstr "%d päätä, %d sektoria/ura, %d sylinteriä"
+msgstr "%d päätä, %d sektoria/ura, %d sylinteriä"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
-msgstr ", yhteensä %llu sektoria"
+msgstr ", yhteensä %llu sektoria"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
-msgstr "Yksiköt = %2$d * %3$d = %4$d -tavuiset %1$s\n"
+msgstr "Yksiköt = %2$d * %3$d = %4$d -tavuiset %1$s\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
-"Ei mitään tehtävää. Järjestys on jo oikea.\n"
+"Ei mitään tehtävää. Järjestys on jo oikea.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
 "Probably you selected the wrong device.\n"
 "\n"
 msgstr ""
+"Tämä ei näytä osiotaululta\n"
+"Valittuna on todennäköisesti väärä laite.\n"
+"\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
-msgstr "%*s Käynn     Alku          Loppu    Lohkot   Id  Järjestelmä\n"
+msgstr "%*s Käynn     Alku          Loppu    Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Laite"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 "\n"
-"Osiotaulumerkinnät eivät ole levyjärjestyksessä\n"
+"Osiotaulumerkinnät eivät ole levyjärjestyksessä\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3162,86 +3078,87 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %s: %d päätä, %d sektoria, %d sylinteriä\n"
+"Levy %s: %d päätä, %d sektoria, %d sylinteriä\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
-msgstr "No AF Pää Sekt Syl Pää Sekt Syl     Alku       Koko ID\n"
+msgstr "No AF Pää Sekt Syl Pää Sekt Syl     Alku       Koko ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
-msgstr "Varoitus: osio %d sisältää sektorin 0\n"
+msgstr "Varoitus: osio %d sisältää sektorin 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Osio %d: pää %d on suurempi kuin maksimi %d\n"
+msgstr "Osio %d: pää %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Osio %d: sektori %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Osio %d: sylinteri %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
-"Osio %d: edellinen sektorimäärä %d on ristiriidassa yhteismäärän %d kanssa\n"
+"Osio %d: edellinen sektorimäärä %d on ristiriidassa yhteismäärän %d kanssa\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varoitus: virheellinen datan alkukohta osiossa %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "Varoitus: osio %d ja osio %d ovat (osittain) päällekkäiset.\n"
+msgstr "Varoitus: osio %d ja osio %d ovat (osittain) päällekkäiset.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Varoitus: osio %d on tyhjä\n"
+msgstr "Varoitus: osio %d on tyhjä\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Looginen osio %d ei ole kokonaan osiossa %d\n"
 
-#: fdisk/fdisk.c:1900
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1902
+#, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
-msgstr "Varattujen sektoreiden kokonaismäärä %d on suurempi kuin maksimi %d\n"
+msgstr ""
+"Varattujen sektoreiden kokonaismäärä %d on suurempi kuin maksimi %lld\n"
 
-#: fdisk/fdisk.c:1903
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1905
+#, c-format
 msgid "%lld unallocated sectors\n"
-msgstr "%d varaamatonta sektoria\n"
+msgstr "%lld varaamatonta sektoria\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr "Osio %d on jo määritelty. Poista se ennen uudelleen lisäämistä.\n"
+msgstr "Osio %d on jo määritelty. Poista se ennen uudelleen lisäämistä.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
-msgstr "Ei vapaita sektoreita käytettävissä\n"
+msgstr "Ei vapaita sektoreita käytettävissä\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3249,27 +3166,27 @@ msgid ""
 "\ta new empty DOS partition table first. (Use o.)\n"
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
-"\tValitan - tämä fdisk ei osaa käsitellä AIX-levynimiöitä.\n"
-"\tJos haluat lisätä DOS-tyyppisiä osioita, luo ensin\n"
+"\tValitan - tämä fdisk ei osaa käsitellä AIX-levynimiöitä.\n"
+"\tJos haluat lisätä DOS-tyyppisiä osioita, luo ensin\n"
 "\tuusi DOS-osiotaulu. (Komento o.)\n"
-"\tVAROITUS: Uuden osiotaulun luominen tuhoaa levyn nykyisen sisällön.\n"
+"\tVAROITUS: Uuden osiotaulun luominen tuhoaa levyn nykyisen sisällön.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr "Jokin osio on poistettava ja lisättävä laajennettu osio ensin\n"
+msgstr "Jokin osio on poistettava ja lisättävä laajennettu osio ensin\n"
 
-#: fdisk/fdisk.c:2093
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2095
+#, c-format
 msgid "All logical partitions are in use\n"
-msgstr "loogiset osiot eivät ole levyjärjestyksessä"
+msgstr "Kaikki loogiset osiot ovat käytössä\n"
 
-#: fdisk/fdisk.c:2094
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2096
+#, c-format
 msgid "Adding a primary partition\n"
-msgstr "Viallinen ensiöosio"
+msgstr "Lisätään ensiöosio\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3278,22 +3195,22 @@ msgid ""
 msgstr ""
 "Komento  merkitys\n"
 "   %s\n"
-"   p    ensiöosio (1-4)\n"
+"   p    ensiöosio (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l    looginen (5 tai yli)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e    laajennettu"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Virheellinen osionumero tyypille \"%c\"\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3302,12 +3219,12 @@ msgstr ""
 "Osiotaulua on muutettu!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kutsutaan osiotaulun uudelleen lukeva ioctl().\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3316,11 +3233,11 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 "\n"
-"VAROITUS: Osiotaulun uudelleenluku epäonnistui, virhe %d: %s.\n"
-"Ydin käyttää edelleen vanhaa taulua.\n"
-"Uutta taulua käytetään seuraavasta käynnistyksestä alkaen.\n"
+"VAROITUS: Osiotaulun uudelleenluku epäonnistui, virhe %d: %s.\n"
+"Ydin käyttää edelleen vanhaa taulua.\n"
+"Uutta taulua käytetään seuraavasta käynnistyksestä alkaen.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3330,114 +3247,115 @@ msgid ""
 msgstr ""
 "\n"
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
-"katso lisätietoja fdiskin manuaalisivulta.\n"
+"katso lisätietoja fdiskin manuaalisivulta.\n"
 
-#: fdisk/fdisk.c:2197
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2199
+#, c-format
 msgid ""
 "\n"
 "Error closing file\n"
-msgstr "Virhe suljettaessa %s\n"
+msgstr ""
+"\n"
+"Virhe suljettaessa tiedostoa\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Osiolla %d ei ole data-aluetta\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Uusi datan alku"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Asiantuntijakomento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
-msgstr "Sylinterien määrä"
+msgstr "Sylinterien määrä"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
-msgstr "Päiden määrä"
+msgstr "Päiden määrä"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
-msgstr "Sektorien määrä"
+msgstr "Sektorien määrä"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr "Varoitus: asetetaan sektorisiirtymä DOS-yhteensopivuutta varten\n"
+msgstr "Varoitus: asetetaan sektorisiirtymä DOS-yhteensopivuutta varten\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
-msgstr "Levy %s ei sisällä kelvollista osiotaulua\n"
+msgstr "Levy %s ei sisällä kelvollista osiotaulua\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tuntematon komento\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
-msgstr "Tämä ydin löytää sektorin koon itse -- -b-valitsinta ei huomioida\n"
+msgstr "Tämä ydin löytää sektorin koon itse -- -b-valitsinta ei huomioida\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
-"Varoitus: valitsinta -b (sektorikoon asetus) tulee käyttää yhden annetun "
+"Varoitus: valitsinta -b (sektorikoon asetus) tulee käyttää yhden annetun "
 "laitteen kanssa\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
-"Havaittiin OSF/1-levynimiö laitteella %s, siirrytään levynimiötilaan.\n"
+"Havaittiin OSF/1-levynimiö laitteella %s, siirrytään levynimiötilaan.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Komento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 "\n"
-"Nykyinen käynnistystiedosto on: %s\n"
+"Nykyinen käynnistystiedosto on: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
-msgstr "Anna uuden käynnistystiedoston nimi: "
+msgstr "Anna uuden käynnistystiedoston nimi: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
-msgstr "Käynnistystiedosto muuttumaton\n"
+msgstr "Käynnistystiedosto muuttumaton\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3504,15 +3422,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux-sivutus"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linuxmainen"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3526,16 +3444,16 @@ msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
-"MIPS Computer Systems, Inc:in mukaan nimiössä saa olla korkeintaan 512 "
+"MIPS Computer Systems, Inc:in mukaan nimiössä saa olla korkeintaan 512 "
 "tavua\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
 msgid "Detected sgi disklabel with wrong checksum.\n"
-msgstr "Havaittiin sgi-levynimiö, jolla on väärä tarkistussumma.\n"
+msgstr "Havaittiin sgi-levynimiö, jolla on väärä tarkistussumma.\n"
 
 #: fdisk/fdisksgilabel.c:200
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors\n"
@@ -3546,15 +3464,15 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (SGI-levynimiö): %2$d päätä, %3$d sektoria\n"
-"%4$d sylinteriä, %5$d fyysistä sylinteriä\n"
-"%6$d ylimääräistä sekt/syl, lomitus %7$d:1\n"
+"Levy %1$s (SGI-levynimiö): %2$d päätä, %3$d sektoria\n"
+"%4$d sylinteriä, %5$d fyysistä sylinteriä\n"
+"%6$d ylimääräistä sekt/syl, lomitus %7$d:1\n"
 "%8$s\n"
-"Yksiköt = %10$d * 512 -tavuiset %9$s\n"
+"Yksiköt = %10$d * %11$d -tavuiset %9$s\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
@@ -3562,8 +3480,8 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (SGI-levynimiö): %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
-"Yksiköt = %6$d * 512 -tavuiset %5$s\n"
+"Levy %1$s (SGI-levynimiö): %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
+"Yksiköt = %6$d * %7$d -tavuiset %5$s\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:220
@@ -3573,7 +3491,7 @@ msgid ""
 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
 "----- osiot -----\n"
-"Os# %*s  Info     Alku        Loppu Sektorit Id  Järjestelmä\n"
+"Os# %*s  Info     Alku        Loppu Sektorit Id  Järjestelmä\n"
 
 #: fdisk/fdisksgilabel.c:242
 #, c-format
@@ -3582,16 +3500,15 @@ msgid ""
 "Bootfile: %s\n"
 "----- Directory Entries -----\n"
 msgstr ""
-"----- Käynnistysinfo -----\n"
-"Käynnistystiedosto: %s\n"
-"----- Hakemistomerkinnät -----\n"
+"----- Käynnistysinfo -----\n"
+"Käynnistystiedosto: %s\n"
+"----- Hakemistomerkinnät -----\n"
 
 #: fdisk/fdisksgilabel.c:250
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektori%5u koko%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3601,8 +3518,8 @@ msgid ""
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
 "\n"
-"Virheellinen käynnistystiedosto!\n"
-"\tKäynnistystiedoston on oltava absoluuttinen, ei-tyhjä polku,\n"
+"Virheellinen käynnistystiedosto!\n"
+"\tKäynnistystiedoston on oltava absoluuttinen, ei-tyhjä polku,\n"
 "\tesim. \"/unix\" tai \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:310
@@ -3612,7 +3529,7 @@ msgid ""
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
 "\n"
-"\tKäynnistystiedoston nimi on liian pitkä: maksimi 16 tavua.\n"
+"\tKäynnistystiedoston nimi on liian pitkä: maksimi 16 tavua.\n"
 
 #: fdisk/fdisksgilabel.c:315
 #, c-format
@@ -3621,7 +3538,7 @@ msgid ""
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
 "\n"
-"\tKäynnistystiedoston polun on oltava täydellinen.\n"
+"\tKäynnistystiedoston polun on oltava täydellinen.\n"
 
 #: fdisk/fdisksgilabel.c:322
 #, c-format
@@ -3631,7 +3548,7 @@ msgid ""
 "\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n"
 msgstr ""
 "\n"
-"\tHuomaa, että käynnistystiedoston olemassaoloa ei tarkisteta.\n"
+"\tHuomaa, että käynnistystiedoston olemassaoloa ei tarkisteta.\n"
 "\tSGI:n oletus on \"/unix\", ja varmuuskopiolle \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:348
@@ -3641,22 +3558,22 @@ msgid ""
 "\tBootfile is changed to \"%s\".\n"
 msgstr ""
 "\n"
-"\tKäynnistystiedostoksi muutettiin \"%s\".\n"
+"\tKäynnistystiedostoksi muutettiin \"%s\".\n"
 
 #: fdisk/fdisksgilabel.c:438
 #, c-format
 msgid "More than one entire disk entry present.\n"
-msgstr "Levyllä on useampi kuin yksi kokolevymerkintä.\n"
+msgstr "Levyllä on useampi kuin yksi kokolevymerkintä.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
-msgstr "Ei määriteltyjä osioita\n"
+msgstr "Ei määriteltyjä osioita\n"
 
 #: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
-msgstr "IRIX pitää siitä, että Osio 11 täyttää koko levyn.\n"
+msgstr "IRIX pitää siitä, että Osio 11 täyttää koko levyn.\n"
 
 #: fdisk/fdisksgilabel.c:453
 #, c-format
@@ -3679,7 +3596,7 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:465
 #, c-format
 msgid "One Partition (#11) should cover the entire disk.\n"
-msgstr "Yhden osion (#11) tulee täyttää koko levy.\n"
+msgstr "Yhden osion (#11) tulee täyttää koko levy.\n"
 
 #: fdisk/fdisksgilabel.c:475
 #, c-format
@@ -3694,12 +3611,12 @@ msgstr "Osion %d loppu ei ole sylinterin rajalla.\n"
 #: fdisk/fdisksgilabel.c:488
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
-msgstr "Osiot %d ja %d ovat päällekkäiset %d sektorin verran.\n"
+msgstr "Osiot %d ja %d ovat päällekkäiset %d sektorin verran.\n"
 
 #: fdisk/fdisksgilabel.c:496 fdisk/fdisksgilabel.c:514
 #, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Käyttämätön %8u sektorin alue - sektorit %8u-%u\n"
+msgstr "Käyttämätön %8u sektorin alue - sektorit %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:525
 #, c-format
@@ -3708,7 +3625,7 @@ msgid ""
 "The boot partition does not exist.\n"
 msgstr ""
 "\n"
-"Käynnistysosiota ei ole olemassa.\n"
+"Käynnistysosiota ei ole olemassa.\n"
 
 #: fdisk/fdisksgilabel.c:528
 #, c-format
@@ -3726,14 +3643,13 @@ msgid ""
 "The swap partition has no swap type.\n"
 msgstr ""
 "\n"
-"Sivutusosiolla ei ole sivutustyyppiä.\n"
+"Sivutusosiolla ei ole sivutustyyppiä.\n"
 
 #: fdisk/fdisksgilabel.c:535
 #, c-format
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr "\tValittu käynnistystiedoston nimi on epätavallinen.\n"
+msgstr "\tValittu käynnistystiedoston nimi on epätavallinen.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3747,36 +3663,35 @@ msgid ""
 "Only the \"SGI volume\" entire disk section may violate this.\n"
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
-"On erittäin suositeltavaa, että osiolla siirtymän 0 kohdalla\n"
-"on tyyppi \"SGI volhdr\". IRIX-järjestelmä olettaa, että\n"
-"erillistyökalut, kuten sash ja fx, voidaan hakea sen hakemistosta.\n"
-"Vain \"SGI volume\" -kokolevyosuus voi rikkoa tätä sääntöä.\n"
-"Kirjoita KYLLÄ, jos olet varma tämän osion merkitsemisestä toisin.\n"
+"On erittäin suositeltavaa, että osiolla siirtymän 0 kohdalla\n"
+"on tyyppi \"SGI volhdr\". IRIX-järjestelmä olettaa, että\n"
+"erillistyökalut, kuten sash ja fx, voidaan hakea sen hakemistosta.\n"
+"Vain \"SGI volume\" -kokolevyosuus voi rikkoa tätä sääntöä.\n"
+"Kirjoita KYLLÄ, jos olet varma tämän osion merkitsemisestä toisin.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
-msgstr "KYLLÄ\n"
+msgstr "KYLLÄ\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
-msgstr "Tiedätkö, että levyllä on päällekkäisiä osioita?\n"
+msgstr "Tiedätkö, että levyllä on päällekkäisiä osioita?\n"
 
 #: fdisk/fdisksgilabel.c:637
 #, c-format
 msgid "Attempting to generate entire disk entry automatically.\n"
-msgstr "Yritetään luoda kokolevymerkintä automaattisesti.\n"
+msgstr "Yritetään luoda kokolevymerkintä automaattisesti.\n"
 
 #: fdisk/fdisksgilabel.c:642
 #, c-format
 msgid "The entire disk is already covered with partitions.\n"
-msgstr "Koko levy on jo osioiden käytössä.\n"
+msgstr "Koko levy on jo osioiden käytössä.\n"
 
 #: fdisk/fdisksgilabel.c:646
 #, c-format
 msgid "You got a partition overlap on the disk. Fix it first!\n"
-msgstr "Levyllä on päällekkäisiä osioita. Tämä on korjattava ensin!\n"
+msgstr "Levyllä on päällekkäisiä osioita. Tämä on korjattava ensin!\n"
 
 #: fdisk/fdisksgilabel.c:655 fdisk/fdisksgilabel.c:684
 #, c-format
@@ -3784,14 +3699,14 @@ msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
-"On erittäin suositeltavaa, että yhdestoista osio\n"
-"kattaa koko levyn ja on tyyppiä \"SGI volume\"\n"
+"On erittäin suositeltavaa, että yhdestoista osio\n"
+"kattaa koko levyn ja on tyyppiä \"SGI volume\"\n"
 
 #: fdisk/fdisksgilabel.c:671
 #, c-format
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
-"Levyllä tulee olemaan päällekkäisiä osioita. Tämä on korjattava ensin!\n"
+"Levyllä tulee olemaan päällekkäisiä osioita. Tämä on korjattava ensin!\n"
 
 #: fdisk/fdisksgilabel.c:676
 #, c-format
@@ -3806,9 +3721,9 @@ msgid ""
 "content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Muodostetaan uusi SGI-levynimiö. Muutokset tehdään vain käyttömuistiin,\n"
-"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
-"tietenkään voida palauttaa.\n"
+"Muodostetaan uusi SGI-levynimiö. Muutokset tehdään vain käyttömuistiin,\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
+"tietenkään voida palauttaa.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:728
@@ -3818,58 +3733,57 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
-"Varoitus: BLKGETSIZE-ioctl epäonnistui laitteelle %s. Käytetään geometrian\n"
-"sylinteriarvoa %d. Tämä arvo voi typistyä laitteilla, jotka ovat suurempia\n"
+"Varoitus: BLKGETSIZE-ioctl epäonnistui laitteelle %s. Käytetään geometrian\n"
+"sylinteriarvoa %d. Tämä arvo voi typistyä laitteilla, jotka ovat suurempia\n"
 "kuin 33,8 Gt.\n"
 
 #: fdisk/fdisksgilabel.c:741
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
-msgstr "Yritetään säilyttää osion %d parametrit.\n"
+msgstr "Yritetään säilyttää osion %d parametrit.\n"
 
 #: fdisk/fdisksgilabel.c:743
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tALKU=%d\tPITUUS=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
-msgstr "Tyhjä"
+msgstr "Tyhjä"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Koko levy"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS-var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3877,18 +3791,18 @@ msgid ""
 "e.g. heads, sectors, cylinders and partitions\n"
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
-"Havaittiin Sun-levynimiö, jolla on väärä\n"
-"tarkistussumma. Joudut todennäköisesti asettamaan\n"
-"kaikki arvot, esim. päät, sektorit, sylinterit ja\n"
-"osiot tai pakottamaan tuoreen nimiön \n"
-"(s-komento päävalikossa)\n"
+"Havaittiin Sun-levynimiö, jolla on väärä\n"
+"tarkistussumma. Joudut todennäköisesti asettamaan\n"
+"kaikki arvot, esim. päät, sektorit, sylinterit ja\n"
+"osiot tai pakottamaan tuoreen nimiön \n"
+"(s-komento päävalikossa)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
-msgstr "Automaattikonfigurointi löysi: %s%s%s\n"
+msgstr "Automaattikonfigurointi löysi: %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3896,12 +3810,12 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Luodaan uutta Sun-levynimiötä. Muutokset tehdään vain käyttömuistiin,\n"
-"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellinen sisältö ei\n"
-"tietenkään ole palautettavissa.\n"
+"Luodaan uutta Sun-levynimiötä. Muutokset tehdään vain käyttömuistiin,\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellinen sisältö ei\n"
+"tietenkään ole palautettavissa.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3911,100 +3825,100 @@ msgstr ""
 "   ?   automaattinen konfigurointi\n"
 "   0   mukautettu (laitteiston mukaisilla oletuksilla)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Valitse tyyppi (?: automaattinen, 0: mukautettu): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
-msgstr "Automaattinen konfigurointi epäonnistui.\n"
+msgstr "Automaattinen konfigurointi epäonnistui.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektoreita/ura"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Vaihtoehtoiset sylinterit"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fyysiset sylinterit"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
-msgstr "Pyörimisnopeus (rpm)"
+msgstr "Pyörimisnopeus (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Lomituskerroin"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
-msgstr "Ylimääräisiä sektoreita sylinterillä"
+msgstr "Ylimääräisiä sektoreita sylinterillä"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
-msgstr "Voit säätää kaikkia levyn parametreja x-valikosta"
+msgstr "Voit säätää kaikkia levyn parametreja x-valikosta"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" levyke"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "mukautettu Linux"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Osion %d loppu ei ole sylinterin rajalla\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
-msgstr "Osio %d on päällekkäinen muiden kanssa sektoreilla %d-%d\n"
+msgstr "Osio %d on päällekkäinen muiden kanssa sektoreilla %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
-msgstr "Käyttämätöntä tilaa - sektorit 0-%d\n"
+msgstr "Käyttämätöntä tilaa - sektorit 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
-msgstr "Käyttämätöntä tilaa - sektorit %d-%d\n"
+msgstr "Käyttämätöntä tilaa - sektorit %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
-"Muut osiot käyttävät jo koko levyn.\n"
-"Poista/kutista joitakin ennen uutta yritystä.\n"
+"Muut osiot käyttävät jo koko levyn.\n"
+"Poista/kutista joitakin ennen uutta yritystä.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
 "%d %s covers some other partition. Your entry has been changed\n"
 "to %d %s\n"
 msgstr ""
-"Kolmas osio ei kata koko levyä, mutta arvo %d %s kattaa jonkin toisen\n"
-"osion. Merkintä on muutettu arvoon %d %s\n"
+"Kolmas osio ei kata koko levyä, mutta arvo %d %s kattaa jonkin toisen\n"
+"osion. Merkintä on muutettu arvoon %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
-"Jos halutaan säilyttää SunOS/Solaris-yhteensopivuus, tämän osion tyyppinä\n"
-"on syytä säilyttää Koko levy (5), alkaen kohdasta 0, %u sektoria\n"
+"Jos halutaan säilyttää SunOS/Solaris-yhteensopivuus, tämän osion tyyppinä\n"
+"on syytä säilyttää Koko levy (5), alkaen kohdasta 0, %u sektoria\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4012,13 +3926,13 @@ msgid ""
 "Type YES if you're very sure you would like that partition\n"
 "tagged with 82 (Linux swap): "
 msgstr ""
-"On erittäin suositeltavaa, että osio siirtymän 0 kohdalla\n"
-"on tyypiltään UFS, EXT2FS tai SunOS-sivutus. Linuxin sivutusosion\n"
-"sijoittaminen sinne saattaa tuhota osiotaulun ja käynnistyslohkon.\n"
-"Kirjoita KYLLÄ, jos olet erittäin varma, että haluat osion tyypiksi\n"
-"merkittävän 82 (Linux-sivutus): "
+"On erittäin suositeltavaa, että osio siirtymän 0 kohdalla\n"
+"on tyypiltään UFS, EXT2FS tai SunOS-sivutus. Linuxin sivutusosion\n"
+"sijoittaminen sinne saattaa tuhota osiotaulun ja käynnistyslohkon.\n"
+"Kirjoita KYLLÄ, jos olet erittäin varma, että haluat osion tyypiksi\n"
+"merkittävän 82 (Linux-sivutus): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4030,15 +3944,15 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (Sun-levynimiö): %2$d päätä, %3$d sektoria,\n"
-"%4$d kierrosta minuutissa, %5$d sylinteriä, %6$d vaihtoehtoista\n"
-"sylinteriä, %7$d fyysistä sylinteriä, %8$d ylimääräistä sekt/syl,\n"
+"Levy %1$s (Sun-levynimiö): %2$d päätä, %3$d sektoria,\n"
+"%4$d kierrosta minuutissa, %5$d sylinteriä, %6$d vaihtoehtoista\n"
+"sylinteriä, %7$d fyysistä sylinteriä, %8$d ylimääräistä sekt/syl,\n"
 "lomitus %9$d:1\n"
 "%10$s\n"
-"Yksiköt = %12$d * 512 -tavuiset %11$s\n"
+"Yksiköt = %12$d * 512 -tavuiset %11$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4047,22 +3961,22 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (Sun-levynimiö): %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
-"Yksiköt = %6$d * 512 -tavuiset %5$s\n"
+"Levy %1$s (Sun-levynimiö): %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
+"Yksiköt = %6$d * 512 -tavuiset %5$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr "%*s Lippu   Alku        Loppu  Lohkot   Id  Järjestelmä\n"
+msgstr "%*s Lippu   Alku        Loppu  Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
-msgstr "Vaihtoehtoisten sylinterien määrä"
+msgstr "Vaihtoehtoisten sylinterien määrä"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
-msgstr "Fyysisten sylinterien määrä"
+msgstr "Fyysisten sylinterien määrä"
 
 #: fdisk/i386_sys_types.c:7
 msgid "FAT12"
@@ -4084,32 +3998,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Laajennettu"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
-msgstr "AIX käynnistettävä"
+msgstr "AIX käynnistettävä"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Alkulatauksen hallinta"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4118,7 +4026,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4133,7 +4040,7 @@ msgstr "OPUS"
 
 #: fdisk/i386_sys_types.c:22
 msgid "Hidden FAT12"
-msgstr "Kätketty FAT12"
+msgstr "Kätketty FAT12"
 
 #: fdisk/i386_sys_types.c:23
 msgid "Compaq diagnostics"
@@ -4141,15 +4048,15 @@ msgstr "Compaq-diagnostiikka"
 
 #: fdisk/i386_sys_types.c:24
 msgid "Hidden FAT16 <32M"
-msgstr "Kätketty FAT16 <32M"
+msgstr "Kätketty FAT16 <32M"
 
 #: fdisk/i386_sys_types.c:25
 msgid "Hidden FAT16"
-msgstr "Kätketty FAT16"
+msgstr "Kätketty FAT16"
 
 #: fdisk/i386_sys_types.c:26
 msgid "Hidden HPFS/NTFS"
-msgstr "Kätketty HPFS/NTFS"
+msgstr "Kätketty HPFS/NTFS"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
@@ -4157,15 +4064,15 @@ msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
 msgid "Hidden W95 FAT32"
-msgstr "Kätketty W95 FAT32"
+msgstr "Kätketty W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
 msgid "Hidden W95 FAT32 (LBA)"
-msgstr "Kätketty W95 FAT32 (LBA)"
+msgstr "Kätketty W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
 msgid "Hidden W95 FAT16 (LBA)"
-msgstr "Kätketty W95 FAT16 (LBA)"
+msgstr "Kätketty W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4211,12 +4118,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4237,8 +4142,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4248,7 +4151,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD tai SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4269,20 +4171,17 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Vanha Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix/vanha Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
-#, fuzzy
 msgid "Linux swap / Solaris"
-msgstr "Linux-sivutus"
+msgstr "Linux-sivutus / Solaris"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
-msgstr "OS/2 kätketty C:-asema"
+msgstr "OS/2 kätketty C:-asema"
 
 #: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
@@ -4290,12 +4189,11 @@ msgstr "Linux laajennettu"
 
 #: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
-msgstr "NTFS-osioryhmä"
+msgstr "NTFS-osioryhmä"
 
 #: fdisk/i386_sys_types.c:62
-#, fuzzy
 msgid "Linux plaintext"
-msgstr "Linux ext3"
+msgstr "Linux teksti"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4305,12 +4203,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad -valmiustila"
@@ -4319,7 +4215,6 @@ msgstr "IBM Thinkpad -valmiustila"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4350,16 +4245,15 @@ msgstr "BSDI sivutus"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Boot Wizard hidden"
-msgstr "Kätketty Boot Wizard"
+msgstr "Kätketty Boot Wizard"
 
 #: fdisk/i386_sys_types.c:77
 msgid "Solaris boot"
 msgstr "Solaris boot"
 
 #: fdisk/i386_sys_types.c:78
-#, fuzzy
 msgid "Solaris"
-msgstr "Solaris boot"
+msgstr "Solaris"
 
 #: fdisk/i386_sys_types.c:79
 msgid "DRDOS/sec (FAT-12)"
@@ -4379,207 +4273,192 @@ msgstr "Syrinx"
 
 #: fdisk/i386_sys_types.c:83
 msgid "Non-FS data"
-msgstr "ei-tied.järj. data"
+msgstr "ei-tied.järj. data"
 
 #: fdisk/i386_sys_types.c:84
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS vain luku"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
-msgstr "BeOS-tied.järj."
+msgstr "BeOS-tied.järj."
 
 #: fdisk/i386_sys_types.c:94
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS-toisio"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
-msgstr "siirtymisvirhe laitteella %s - kohtaan %lu ei voi siirtyä\n"
+msgstr "siirtymisvirhe laitteella %s - kohtaan %lu ei voi siirtyä\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "siirtymisvirhe: haluttiin 0x%08x%08x, saatiin 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "muisti lopussa - luovutetaan\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "virhe luettaessa laitetta %s - sektoria %lu ei voi lukea\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "VIRHE: sektorilla %lu ei ole msdos-allekirjoitusta\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "virhe kirjoitettaessa laitteelle %s - sektoria %lu ei voi kirjoittaa\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "osion sektoreiden tallennustiedostoa (%s) ei voi avata\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "virhe kirjoitettaessa %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "osionpalautustiedoston %s tilaa ei voi lukea\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
-msgstr "osion palautustiedoston koko on väärä - ei palauteta\n"
+msgstr "osion palautustiedoston koko on väärä - ei palauteta\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "muisti lopussa?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "osionpalautustiedostoa (%s) ei voi avata\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "virhe luettaessa tiedostoa %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "laitetta %s ei voi avata kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "virhe kirjoitettaessa sektoria %lu laitteelle %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Levy %s: geometriaa ei voi hakea\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Levy %s: kokoa ei voi hakea\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Varoitus: alku=%lu - tämä näyttää enemmän osiolta kuin kokonaiselta\n"
-"levyltä. Sen muokkaaminen fdiskillä on todennäköisesti turhaa.\n"
-"[Käytä --force -valitsinta jos todella haluat tehdä niin]\n"
+"Varoitus: alku=%lu - tämä näyttää enemmän osiolta kuin kokonaiselta\n"
+"levyltä. Sen muokkaaminen fdiskillä on todennäköisesti turhaa.\n"
+"[Käytä --force -valitsinta jos todella haluat tehdä niin]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr "Varoitus: HDIO_GETGEO kertoo, että päitä on %lu\n"
+msgstr "Varoitus: HDIO_GETGEO kertoo, että päitä on %lu\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr "Varoitus: HDIO_GETGEO kertoo, että sektoreita on %lu\n"
+msgstr "Varoitus: HDIO_GETGEO kertoo, että sektoreita on %lu\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr "Varoitus: BLKGETSIZE/HDIO_GETGEO kertoo, että sylintereitä on %lu\n"
+msgstr "Varoitus: BLKGETSIZE/HDIO_GETGEO kertoo, että sylintereitä on %lu\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Varoitus: epätodennäköinen sektorimäärä (%lu) - yleensä korkeintaan 63\n"
-"Tästä aiheutuu ongelmia kaikkien C/H/S-osoitusta käyttävien ohjelmien "
+"Varoitus: epätodennäköinen sektorimäärä (%lu) - yleensä korkeintaan 63\n"
+"Tästä aiheutuu ongelmia kaikkien C/H/S-osoitusta käyttävien ohjelmien "
 "kanssa.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 "\n"
-"Levy %s: %lu sylinteriä, %lu päätä, %lu sektoria/ura\n"
+"Levy %s: %lu sylinteriä, %lu päätä, %lu sektoria/ura\n"
 
-# ensimmäinen %s on "start" tai "end", joita ei voi suomentaa
-# bugiraportti täytyy lähettää joskus
-#: fdisk/sfdisk.c:608
+# ensimmäinen %s on "start" tai "end", joita ei voi suomentaa
+# bugiraportti täytyy lähettää joskus
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr "Osion %2$s %1$s pääarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
+msgstr "Osion %2$s %1$s pääarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4587,7 +4466,7 @@ msgid ""
 msgstr ""
 "Osion %2$s \"%1$s\":n sektoriarvo on mahdoton: %3$lu (tulee olla 1-%4$lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4595,7 +4474,7 @@ msgid ""
 msgstr ""
 "Osion %2$s \"%1$s\":n sylinteriarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4604,631 +4483,625 @@ msgstr ""
 "Id  Nimi\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Luetaan osiotaulu uudelleen...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
-"Osiotaulun uudelleenlukukomento epäonnistui\n"
-"Käynnistä järjestelmä uudelleen nyt, ennen mkfs:n käyttöä\n"
+"Osiotaulun uudelleenlukukomento epäonnistui\n"
+"Käynnistä järjestelmä uudelleen nyt, ennen mkfs:n käyttöä\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Virhe suljettaessa %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: osiota ei ole\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
-msgstr "tunnistamaton muoto - käytetään sektoreita\n"
+msgstr "tunnistamaton muoto - käytetään sektoreita\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s:n osiotaulu\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr "toteuttamaton muoto - käytetään %s\n"
+msgstr "toteuttamaton muoto - käytetään %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Yksiköt = sylinterit %lu-tavuisia, lohkot 1024-tavuisia, lasketaan %d "
+"Yksiköt = sylinterit %lu-tavuisia, lohkot 1024-tavuisia, lasketaan %d "
 "alkaen\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
-msgstr "   Laite Käynn Alku      Loppu #syl     #lohkot   Id  Järjestelmä\n"
+msgstr "   Laite Käynn Alku      Loppu #syl     #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Yksiköt = 512-tavuiset sektorit, alkaen kohdasta %d\n"
+"Yksiköt = 512-tavuiset sektorit, alkaen kohdasta %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
-msgstr "   Laite  Käynn   Alku        Loppu #sektorit Id  Järjestelmä\n"
+msgstr "   Laite  Käynn   Alku        Loppu #sektorit Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Yksiköt = 1024-tavuiset lohkot, alkaen kohdasta %d\n"
+"Yksiköt = 1024-tavuiset lohkot, alkaen kohdasta %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
-msgstr "   Laite  Käynn  Alku        Loppu  #lohkot   Id  Järjestelmä\n"
+msgstr "   Laite  Käynn  Alku        Loppu  #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Yksiköt = 1048576-tavuiset megatavut, 1024-tavuiset lohkot, alkaen kohdasta %"
+"Yksiköt = 1048576-tavuiset megatavut, 1024-tavuiset lohkot, alkaen kohdasta %"
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
-msgstr "   Laite Käynn Alku    Loppu  Mt     #lohkot   Id  Järjestelmä\n"
+msgstr "   Laite Käynn Alku    Loppu  Mt     #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "\t\talku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
+msgstr "\t\talku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "\t\tloppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
+msgstr "\t\tloppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr "osio loppuu sylinterillä %ld, joka on levyn lopun jälkeen\n"
+msgstr "osio loppuu sylinterillä %ld, joka on levyn lopun jälkeen\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
-msgstr "Osioita ei löytynyt\n"
+msgstr "Osioita ei löytynyt\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
 "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 "For this listing I'll assume that geometry.\n"
 msgstr ""
-"Varoitus: Osiotaulu näyttää siltä, että se on tehty\n"
+"Varoitus: Osiotaulu näyttää siltä, että se on tehty\n"
 "  arvoille C/H/S=*/%ld/%ld (ei %ld/%ld/%ld).\n"
-"Tässä listauksessa käytetään tuota geometriaa.\n"
+"Tässä listauksessa käytetään tuota geometriaa.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "osiotaulua ei ole.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
-msgstr "outoa, vain %d osiota määritelty.\n"
+msgstr "outoa, vain %d osiota määritelty.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr "Varoitus: osion %s koko on 0, mutta sitä ei ole merkitty tyhjäksi\n"
+msgstr "Varoitus: osion %s koko on 0, mutta sitä ei ole merkitty tyhjäksi\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "Varoitus: osion %s koko on 0 ja se on merkitty käynnistettäväksi\n"
+msgstr "Varoitus: osion %s koko on 0 ja se on merkitty käynnistettäväksi\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varoitus: osion %s koko on 0 ja alkukohta ei ole nolla\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varoitus: osio %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
-msgstr "ei sisälly osioon %s\n"
+msgstr "ei sisälly osioon %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varoitus: osiot %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
-msgstr "ja %s ovat päällekkäiset\n"
+msgstr "ja %s ovat päällekkäiset\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
-"Varoitus: osio %s sisältää osan osiotaulusta (sektori %lu), ja se tulee\n"
-"tuhoutumaan kun osiota käytetään\n"
+"Varoitus: osio %s sisältää osan osiotaulusta (sektori %lu), ja se tulee\n"
+"tuhoutumaan kun osiota käytetään\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varoitus: osio %s alkaa sektorilta 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varoitus: osio %s jatkuu levyn lopun yli\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
-"Vain yksi ensiöosio voi olla laajennettu\n"
-" (tämä ei tosin ole ongelma Linuxissa)\n"
+"Vain yksi ensiöosio voi olla laajennettu\n"
+" (tämä ei tosin ole ongelma Linuxissa)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varoitus: osio %s ei ala sylinterin rajalta\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varoitus: osio %s ei lopu sylinterin rajalle\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Varoitus: useampi kuin yksi ensiöosio on merkitty käynnistettäväksi "
+"Varoitus: useampi kuin yksi ensiöosio on merkitty käynnistettäväksi "
 "(aktiiviseksi)\n"
-"Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä levyltä.\n"
+"Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä levyltä.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"Varoitus: yleensä vain ensiöosiolta voi käynnistää\n"
-"LILO ei välitä \"käynnistettävä\"-lipusta.\n"
+"Varoitus: yleensä vain ensiöosiolta voi käynnistää\n"
+"LILO ei välitä \"käynnistettävä\"-lipusta.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Varoitus: yhtään ensiöosiota ei ole merkitty käynnistettäväksi\n"
-"(aktiiviseksi). Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä "
-"levyltä.\n"
+"Varoitus: yhtään ensiöosiota ei ole merkitty käynnistettäväksi\n"
+"(aktiiviseksi). Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä "
+"levyltä.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "alun"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "osio %s: alku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
+msgstr "osio %s: alku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "lopun"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"osio %s: loppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
+"osio %s: loppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
-msgstr "osio %s loppuu sylinterillä %ld, levyn lopun jälkeen\n"
+msgstr "osio %s loppuu sylinterillä %ld, levyn lopun jälkeen\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 "Varoitus: laajennetun osion alkua siirretty kohdasta %ld kohtaan %ld\n"
-"(Vain listaustarkoituksiin. Älä muuta sen sisältöä.)\n"
+"(Vain listaustarkoituksiin. Älä muuta sen sisältöä.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 "Varoitus: laajennetun osion alku ei ole sylinterin rajalla.\n"
-"DOS ja Linux tulkitsevat sisällön eri tavoin.\n"
+"DOS ja Linux tulkitsevat sisällön eri tavoin.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
-msgstr "liian monta osiota - ei huomioida numeron (%d) jälkeisiä\n"
+msgstr "liian monta osiota - ei huomioida numeron (%d) jälkeisiä\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "osiopuu?\n"
 
 # huono suomennos
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
-msgstr "havaittiin Disk Manager - sitä ei voi käsitellä\n"
+msgstr "havaittiin Disk Manager - sitä ei voi käsitellä\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
-msgstr "DM6-allekirjoitus löytyi - luovutetaan\n"
+msgstr "DM6-allekirjoitus löytyi - luovutetaan\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "outoa..., laajennettu osio, jonka koko on 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "outoa..., BSD-osio, jonka koko on 0?\n"
 
-#: fdisk/sfdisk.c:1624
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1622
+#, c-format
 msgid " %s: unrecognized partition table type\n"
-msgstr " %s: tunnistamaton osio\n"
+msgstr " %s: tunnistamaton osiotaulun tyyppi\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
-msgstr "valitsin -n oli annettu: Mitään ei muutettu\n"
+msgstr "valitsin -n oli annettu: Mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
-msgstr "Vanhojen sektoreiden tallennus epäonnistui - keskeytetään\n"
+msgstr "Vanhojen sektoreiden tallennus epäonnistui - keskeytetään\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
-msgstr "Osion kirjoitus epäonnistui laitteelle %s\n"
+msgstr "Osion kirjoitus epäonnistui laitteelle %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
-msgstr "liian pitkä tai epätäydellinen syöterivi - lopetetaan\n"
+msgstr "liian pitkä tai epätäydellinen syöterivi - lopetetaan\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
-msgstr "syötevirhe: kentän %s jälkeen odotetaan löytyvän \"=\"\n"
+msgstr "syötevirhe: kentän %s jälkeen odotetaan löytyvän \"=\"\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
-msgstr "syötevirhe: odottamaton merkki %c kentän %s jälkeen\n"
+msgstr "syötevirhe: odottamaton merkki %c kentän %s jälkeen\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
-msgstr "tunnistamaton syöte: %s\n"
+msgstr "tunnistamaton syöte: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "liian suuri luku\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
-msgstr "roskaa numeron perässä\n"
+msgstr "roskaa numeron perässä\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "ei tilaa osiokahvalle\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
-msgstr "ympäröivää laajennettua osiota ei voi rakentaa\n"
+msgstr "ympäröivää laajennettua osiota ei voi rakentaa\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
-msgstr "liian monta syötekenttää\n"
+msgstr "liian monta syötekenttää\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
-msgstr "Ei enempää tilaa\n"
+msgstr "Ei enempää tilaa\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Virheellinen tyyppi\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "Varoitus: annettu koko (%lu) ylittää suurimman sallitun koon (%lu)\n"
+msgstr "Varoitus: annettu koko (%lu) ylittää suurimman sallitun koon (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
-msgstr "Varoitus: tyhjä osio\n"
+msgstr "Varoitus: tyhjä osio\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varoitus: virheellinen osion alku (aikaisintaan %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
-msgstr "tunnistamaton \"käynnistettävä\"-lippu - valitse - tai *\n"
+msgstr "tunnistamaton \"käynnistettävä\"-lippu - valitse - tai *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
-msgstr "osittainen c,h,s-määritys?\n"
+msgstr "osittainen c,h,s-määritys?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Laajennettu osio ei ole odotetussa paikassa\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
-msgstr "virheellinen syöte\n"
+msgstr "virheellinen syöte\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "liian monta osiota\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
-"Syöte seuraavassa muodossa: puuttuvat kentät saavat oletusarvon.\n"
-"<alku> <koko> <tyyppi [E,S,L,X,hex]> <käynnistettävä [-,*]> <c,h,s> <c,h,s>\n"
-"Yleensä riittää <alku> ja <koko> (ja ehkä <tyyppi>).\n"
+"Syöte seuraavassa muodossa: puuttuvat kentät saavat oletusarvon.\n"
+"<alku> <koko> <tyyppi [E,S,L,X,hex]> <käynnistettävä [-,*]> <c,h,s> <c,h,s>\n"
+"Yleensä riittää <alku> ja <koko> (ja ehkä <tyyppi>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versio"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "Käyttö: %s [valitsimet] laite ...\n"
+msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "laite: esimerkiksi /dev/hda tai /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
-msgstr "hyödylliset valitsimet:"
+msgstr "hyödylliset valitsimet:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
-msgstr "    -s [tai --show-size]: näytä osion koko"
+msgstr "    -s [tai --show-size]: näytä osion koko"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
-msgstr "    -c [tai --id:        näytä tai muuta osio-id"
+msgstr "    -c [tai --id:        näytä tai muuta osio-id"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [tai --list]:     listaa kaikkien laitteiden osiot"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr "    -d [tai --dump]:     sama kuin edellä, muoto sopiva syötteeksi"
+msgstr "    -d [tai --dump]:     sama kuin edellä, muoto sopiva syötteeksi"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
-"    -i [tai --increment]:numeroi sylinterit, ym. alkaen 1:stä, ei 0:sta"
+"    -i [tai --increment]:numeroi sylinterit, ym. alkaen 1:stä, ei 0:sta"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
-"    -uS, -uB, -uC, -uM:  käytä yksikköinä sektoreita/lohkoja/sylintereitä/Mt"
+"    -uS, -uB, -uC, -uM:  käytä yksikköinä sektoreita/lohkoja/sylintereitä/Mt"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [tai --list-types]:listaa tunnetut osiotyypit"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
-"    -D [tai --DOS]:      DOS-yhteensopivuutta varten; tuhlaa vähän tilaa"
+"    -D [tai --DOS]:      DOS-yhteensopivuutta varten; tuhlaa vähän tilaa"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr "    -R [tai --re-read]:  käske ytimen lukea osiotaulu uudelleen"
+msgstr "    -R [tai --re-read]:  käske ytimen lukea osiotaulu uudelleen"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                muuta vain osiota numero #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
-msgstr "    -n :                 älä kirjoita levylle oikeasti"
+msgstr "    -n :                 älä kirjoita levylle oikeasti"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O tiedosto :        tallenna ylikirjoitettavat sektori tiedostoon"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
-msgstr "    -I tiedosto :        palauta nämä sektorit"
+msgstr "    -I tiedosto :        palauta nämä sektorit"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
-msgstr "    -v [tai --version]:  näytä versio"
+msgstr "    -v [tai --version]:  näytä versio"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
-msgstr "    -? [tai --help]:     näytä tämä viesti"
+msgstr "    -? [tai --help]:     näytä tämä viesti"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "vaaralliset valitsimet:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
-msgstr "    -g [tai --show-geometry]: näytä ytimen käsitys geometriasta"
+msgstr "    -g [tai --show-geometry]: näytä ytimen käsitys geometriasta"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
-msgstr "    -g [tai --show-geometry]: näytä ytimen käsitys geometriasta"
+msgstr "    -G [tai --show-pt-geometry]: näytä osiotausta päätelty geometria"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [tai --show-extended]: listaa myös laajennetut osiot tulosteessa\n"
-"                             tai odota syötteestä niiden kahvoja"
+"    -x [tai --show-extended]: listaa myös laajennetut osiot tulosteessa\n"
+"                             tai odota syötteestä niiden kahvoja"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
-"    -L  [tai --Linux]:     älä huomauta Linuxissa merkityksettömistä asioista"
+"    -L  [tai --Linux]:     älä huomauta Linuxissa merkityksettömistä asioista"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [tai --quiet]:     vaienna varoitusviestit"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
-msgstr "    Voit ohittaa tunnistetun geometrian käyttämällä:"
+msgstr "    Voit ohittaa tunnistetun geometrian käyttämällä:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
-msgstr "    -C# [tai --cylinders #]:aseta käytettävä sylinterien määrä"
+msgstr "    -C# [tai --cylinders #]:aseta käytettävä sylinterien määrä"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
-msgstr "    -h# [tai --heads #]:    aseta käytettävä päiden määrä"
+msgstr "    -h# [tai --heads #]:    aseta käytettävä päiden määrä"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
-msgstr "    -S# [tai --sectors #]:  aseta käytettävä sektorien määrä"
+msgstr "    -S# [tai --sectors #]:  aseta käytettävä sektorien määrä"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Kaikki tarkistukset voi ohittaa valitsimella:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
-msgstr "    -f  [tai --force]:     tee mitä käsken, vaikka se olisi tyhmää"
+msgstr "    -f  [tai --force]:     tee mitä käsken, vaikka se olisi tyhmää"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
-msgstr "Käyttö:"
+msgstr "Käyttö:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s laite\t\t listaa laitteella olevat aktiiviset osiot\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s laite n1 n2 ... aktivoi osiot n1 ..., inaktivoi loput\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An laite\t aktivoi osio n, poista muiden aktivointi\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "ei komentoa?\n"
 
-#: fdisk/sfdisk.c:2639
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2635
+#, c-format
 msgid "total: %llu blocks\n"
-msgstr "yhteensä: %d lohkoa\n"
+msgstr "yhteensä: %llu lohkoa\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "käyttö: sfdisk --print-id laite osionumero\n"
+msgstr "käyttö: sfdisk --print-id laite osionumero\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr "käyttö: sfdisk --change-id laite osionumero Id\n"
+msgstr "käyttö: sfdisk --change-id laite osionumero Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "käyttö: sfdisk --id laite osionumero [Id]\n"
+msgstr "käyttö: sfdisk --id laite osionumero [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "vain yhden laitteen voi antaa (paitsi valitsimella -l tai -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "laitetta %s ei voi avata lukua-kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "laitetta %s ei voi avata lukua varten\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
-msgstr "%s: %ld sylinteriä, %ld päätä, %ld sektoria/ura\n"
+msgstr "%s: %ld sylinteriä, %ld päätä, %ld sektoria/ura\n"
 
-#: fdisk/sfdisk.c:2807
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2803
+#, c-format
 msgid "Cannot get size of %s\n"
-msgstr "laitteen %s kokoa ei voi hakea"
+msgstr "Laitteen %s kokoa ei voida hakea\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "virheellinen aktiivinen tavu: 0x80:n asemesta 0x%x\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5236,44 +5109,44 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
-"Aktiivisia ensiöosioita on %d kappaletta. Tämä ei haittaa LILOa, mutta\n"
-"DOS MBR käynnistää vain levyltä, jolla on tasan yksi aktiivinen osio.\n"
+"Aktiivisia ensiöosioita on %d kappaletta. Tämä ei haittaa LILOa, mutta\n"
+"DOS MBR käynnistää vain levyltä, jolla on tasan yksi aktiivinen osio.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr "osiolla %s id on %x eikä osiota ole kätketty\n"
+msgstr "osiolla %s id on %x eikä osiota ole kätketty\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Virheellinen Id %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
-msgstr "Levy on tällä hetkellä käytössä.\n"
+msgstr "Levy on tällä hetkellä käytössä.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr "Vakava virhe: laitetta %s ei löydy\n"
+msgstr "Vakava virhe: laitetta %s ei löydy\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varoitus: %s ei ole lohkolaite\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
-msgstr "Tarkistetaan, että kukaan ei käytä levyä juuri nyt...\n"
+msgstr "Tarkistetaan, että kukaan ei käytä levyä juuri nyt...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5281,75 +5154,75 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Tämä levy on tällä hetkellä käytössä - sen uudelleenosiointi on\n"
-"todennäköisesti huono ajatus. Irrota kaikki levyn tiedostojärjestelmät\n"
-"(komento umount) ja kaikki levyllä olevat sivutusosiot (komento swapoff).\n"
-"Käytä valitsinta --no-reread tämän testin ohittamiseen.\n"
+"Tämä levy on tällä hetkellä käytössä - sen uudelleenosiointi on\n"
+"todennäköisesti huono ajatus. Irrota kaikki levyn tiedostojärjestelmät\n"
+"(komento umount) ja kaikki levyllä olevat sivutusosiot (komento swapoff).\n"
+"Käytä valitsinta --no-reread tämän testin ohittamiseen.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
-msgstr "Käytä --force -valitsinta ohittaaksesi kaikki tarkistukset.\n"
+msgstr "Käytä --force -valitsinta ohittaaksesi kaikki tarkistukset.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vanha tilanne:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
-msgstr "Osiota %d ei ole olemassa, sitä ei voi muuttaa\n"
+msgstr "Osiota %d ei ole olemassa, sitä ei voi muuttaa\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Uusi tilanne:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
-"En pidä näistä osioista - mitään ei muutettu.\n"
-"(Jos todella haluat tätä, käytä valitsinta --force.)\n"
+"En pidä näistä osioista - mitään ei muutettu.\n"
+"(Jos todella haluat tätä, käytä valitsinta --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
-msgstr "En pidä tästä - kannattaa todennäköisesti vastata \"No\"\n"
+msgstr "En pidä tästä - kannattaa todennäköisesti vastata \"No\"\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
-msgstr "Oletko tyytyväinen tähän? [ynq] "
+msgstr "Oletko tyytyväinen tähän? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
-msgstr "Haluatko kirjoittaa tämän levylle? [ynq] "
+msgstr "Haluatko kirjoittaa tämän levylle? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 "\n"
-"sfdisk: ennenaikainen syötteen loppu\n"
+"sfdisk: ennenaikainen syötteen loppu\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
-msgstr "Lopetetaan - mitään ei muutettu\n"
+msgstr "Lopetetaan - mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Vastaa joko y, n tai q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5358,32 +5231,32 @@ msgstr ""
 "Uusi osiotaulu kirjoitettiin onnistuneesti\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Jos DOS-osio, esim. /dev/foo7, luotiin tai sitä muutettiin, käytä dd(1):tä\n"
-"nollataksesi ensimmäiset 512 tavua:\n"
+"Jos DOS-osio, esim. /dev/foo7, luotiin tai sitä muutettiin, käytä dd(1):tä\n"
+"nollataksesi ensimmäiset 512 tavua:\n"
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Katso fdisk(8).)\n"
 
 #: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
-msgstr "Komento \"getopt --help\" antaa lisää tietoa.\n"
+msgstr "Komento \"getopt --help\" antaa lisää tietoa.\n"
 
 #: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
-msgstr "tyhjä pitkä valitsin argumentin -l tai --long jälkeen"
+msgstr "tyhjä pitkä valitsin argumentin -l tai --long jälkeen"
 
 #: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
-msgstr "tuntematon kuori argumentin -s tai --shell jälkeen"
+msgstr "tuntematon kuori argumentin -s tai --shell jälkeen"
 
 #: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr "Käyttö: getopt valitsinmerkkijono parametrit\n"
+msgstr "Käyttö: getopt valitsinmerkkijono parametrit\n"
 
 #: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
@@ -5403,22 +5276,22 @@ msgstr "              parametrit\n"
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
-"  -a, --alternative            Salli pitkien valitsimien alkaminen yhdellä -:"
+"  -a, --alternative            Salli pitkien valitsimien alkaminen yhdellä -:"
 "lla\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
+msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
+msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
 
 #: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
-"  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden yhteydessä\n"
+"  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden yhteydessä\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
@@ -5434,7 +5307,7 @@ msgstr "  -Q, --quiet-output           Ei normaalia tulostetta\n"
 
 #: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr "  -s, --shell=kuori            Aseta kuoren lainauskäytännöt\n"
+msgstr "  -s, --shell=kuori            Aseta kuoren lainauskäytännöt\n"
 
 #: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
@@ -5442,11 +5315,11 @@ msgstr "  -T, --test                  Testaa getopt(1):n versio\n"
 
 #: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -u, --unquote                Ei lainausmerkkejä tulosteeseen\n"
+msgstr "  -u, --unquote                Ei lainausmerkkejä tulosteeseen\n"
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
-msgstr "  -V, --version                Näytä versiotiedot\n"
+msgstr "  -V, --version                Näytä versiotiedot\n"
 
 #: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
@@ -5459,195 +5332,195 @@ msgstr "getopt (parannettu) 1.1.3)\n"
 
 #: getopt/getopt.c:450
 msgid "internal error, contact the author."
-msgstr "sisäinen virhe, ota yhteyttä tekijään."
+msgstr "sisäinen virhe, ota yhteyttä tekijään."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
-msgstr "käynnistetty MILOsta\n"
+msgstr "käynnistetty MILOsta\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD -kello\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "kelloportiksi asetettu 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: atominen \"%s\" epäonnistui 1000 iteraatiolle!"
+msgstr "%s: atominen \"%s\" epäonnistui 1000 iteraatiolle!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Ei voi avata laitetta /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
-msgstr "En saanut käyttöoikeutta, koska en yrittänyt.\n"
+msgstr "En saanut käyttöoikeutta, koska en yrittänyt.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
-msgstr "%s ei saa käyttöoikeutta I/O-porttiin:  iopl(3)-kutsu epäonnistui.\n"
+msgstr "%s ei saa käyttöoikeutta I/O-porttiin:  iopl(3)-kutsu epäonnistui.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
-msgstr "Tarvitset todennäköisesti pääkäyttäjän oikeudet.\n"
+msgstr "Tarvitset todennäköisesti pääkäyttäjän oikeudet.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Oletetaan laitteistokellon olevan %sajassa.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC-"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "paikallisessa "
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Varoitus: tunnistamaton kolmas rivi adjtime-tiedostossa\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr "(Odotetaan: \"UTC\", \"LOCAL\" tai ei mitään.)\n"
+msgstr "(Odotetaan: \"UTC\", \"LOCAL\" tai ei mitään.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr "Viimeinen siirtymäsäätö tehty %ld sekuntia vuoden 1969 jälkeen\n"
+msgstr "Viimeinen siirtymäsäätö tehty %ld sekuntia vuoden 1969 jälkeen\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr "Viimeinen kalibrointi tehty %ld sekuntia vuoden 1969 jälkeen\n"
+msgstr "Viimeinen kalibrointi tehty %ld sekuntia vuoden 1969 jälkeen\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Laitteistokello on %sajassa\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "tuntemattomassa "
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
-msgstr "Odotetaan kellon tikitystä...\n"
+msgstr "Odotetaan kellon tikitystä...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...saatiin tikitys\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
-"Virheellisiä arvoja laitteistokellossa: %3$.2d.%2$.2d.%1$4d %4$.2d:%5$.2d:%6"
+"Virheellisiä arvoja laitteistokellossa: %3$.2d.%2$.2d.%1$4d %4$.2d:%5$.2d:%6"
 "$.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Laitteistokellon aika: %3$.2d.%2$.2d.%1$4d %4$.2d:%5$.2d:%6$.2d = %7$ld "
 "sekuntia vuodesta 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr ""
 "Laitteistokellosta luettu aika: %3$.2d.%2$.2d.%1$4d %4$02d:%5$02d:%6$02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Asetetaan laitteistokello aikaan %.2d:%.2d:%.2d = %ld sekuntia vuodesta "
 "1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
-msgstr "Kellonaikaa ei muutettu - pelkkä testi.\n"
+msgstr "Kellonaikaa ei muutettu - pelkkä testi.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
 "Viiteajankohdasta on kulunut %.6f sekuntia.\n"
-"Odotetaan seuraavaa täyttä sekuntia.\n"
+"Odotetaan seuraavaa täyttä sekuntia.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
-"Laitteistokellon rekistereissä on arvoja, jotka ovat joko kelvottomia (esim. "
-"kuukauden 50:s päivä) tai suurempia kuin pystymme käsittelemään (esim. vuosi "
+"Laitteistokellon rekistereissä on arvoja, jotka ovat joko kelvottomia (esim. "
+"kuukauden 50:s päivä) tai suurempia kuin pystymme käsittelemään (esim. vuosi "
 "2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekuntia\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Valitsinta --date ei ole annettu.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
-msgstr "liian pitkä --date -argumentti\n"
+msgstr "liian pitkä --date -argumentti\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
-"Valitsimelle --date annettu arvo ei ole kelvollinen päiväys.\n"
-"Se sisältää lainausmerkkejä.\n"
+"Valitsimelle --date annettu arvo ei ole kelvollinen päiväys.\n"
+"Se sisältää lainausmerkkejä.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr "Käynnistetään \"date\"-komento: %s\n"
+msgstr "Käynnistetään \"date\"-komento: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr "Komentoa \"date\" ei voitu ajaa /bin/sh-kuoressa. popen() epäonnistui"
+msgstr "Komentoa \"date\" ei voitu ajaa /bin/sh-kuoressa. popen() epäonnistui"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date-komennon vastaus = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5656,13 +5529,13 @@ msgid ""
 "The response was:\n"
 "  %s\n"
 msgstr ""
-"%sin käynnistämä \"date\"-komento palautti odottamattomia tuloksia.\n"
+"%sin käynnistämä \"date\"-komento palautti odottamattomia tuloksia.\n"
 "Komento oli:\n"
 "  %s\n"
 "Vastaus oli:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5672,111 +5545,111 @@ msgid ""
 "The response was:\n"
 " %s\n"
 msgstr ""
-"%sin käynnistämä \"date\"-komento palautti muuta kuin kokonaisluvun odotetun "
+"%sin käynnistämä \"date\"-komento palautti muuta kuin kokonaisluvun odotetun "
 "muunnetun aika-arvon paikalla.\n"
 "Komento oli:\n"
 "  %s\n"
 "Vastaus oli:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
-msgstr "päiväysmerkkijono %s vastaa %ld sekuntia vuodesta 1969.\n"
+msgstr "päiväysmerkkijono %s vastaa %ld sekuntia vuodesta 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
-"Laitteistokellon aika ei ole kelvollinen, joten järjestelmän aikaa ei voida "
+"Laitteistokellon aika ei ole kelvollinen, joten järjestelmän aikaa ei voida "
 "asettaa sen perusteella.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Kutsutaan settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
-msgstr "Järjestelmäkelloa ei aseteta, koska käytetään testitilaa.\n"
+msgstr "Järjestelmäkelloa ei aseteta, koska käytetään testitilaa.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
-msgstr "Vain pääkäyttäjä voi asettaa järjestelmän kellon.\n"
+msgstr "Vain pääkäyttäjä voi asettaa järjestelmän kellon.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
-msgstr "settimeofday() epäonnistui"
+msgstr "settimeofday() epäonnistui"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
-"Ei säädetä siirtymäkerrointa, koska laitteistokellossa oli edellisellä "
+"Ei säädetä siirtymäkerrointa, koska laitteistokellossa oli edellisellä "
 "kerralla roskaa.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"Ei säädetä siirtymäkerrointa, koska edellinen kalibrointiaika on nolla,\n"
+"Ei säädetä siirtymäkerrointa, koska edellinen kalibrointiaika on nolla,\n"
 "joten historia on virheellinen ja kalibroinnin uudelleen aloitus on\n"
 "tarpeellista.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
-"Ei säädetä siirtymäkerrointa, koska edellisestä kalibroinnista on alle "
+"Ei säädetä siirtymäkerrointa, koska edellisestä kalibroinnista on alle "
 "vuorokausi.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
 "of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"Kellon siirtymä oli %.1f sekuntia viimeisten %d sekunnin aikana, %f sekuntia/"
-"vrk -siirtymäkertoimesta\n"
-"huolimatta. Säädetään siirtymäkerrointa %f sekunnilla/vrk\n"
+"Kellon siirtymä oli %.1f sekuntia viimeisten %d sekunnin aikana, %f sekuntia/"
+"vrk -siirtymäkertoimesta\n"
+"huolimatta. Säädetään siirtymäkerrointa %f sekunnilla/vrk\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "Aikaa edellisestä säädöstä on kulunut %d sekuntia\n"
+msgstr "Aikaa edellisestä säädöstä on kulunut %d sekuntia\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr "On lisättävä %d sekuntia ja viitattava aikaan %.6f sekuntia sitten\n"
+msgstr "On lisättävä %d sekuntia ja viitattava aikaan %.6f sekuntia sitten\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr "Ei päivitetä adjtime-tiedostoa, koska käytetään testaustilaa.\n"
+msgstr "Ei päivitetä adjtime-tiedostoa, koska käytetään testaustilaa.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5785,38 +5658,38 @@ msgstr ""
 "Tiedostoon %s olisi kirjoitettu seuraavaa:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
-msgstr "Siirtymänsäätöparametreja ei päivitetty.\n"
+msgstr "Siirtymänsäätöparametreja ei päivitetty.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr "Laitteistokellon aika ei ole kelvollinen, joten sitä ei voi säätää.\n"
+msgstr "Laitteistokellon aika ei ole kelvollinen, joten sitä ei voi säätää.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Tarvittava muutos on alle sekunti, joten ei aseteta kelloa.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
-msgstr "Käytetään rajapintaa %s.\n"
+msgstr "Käytetään rajapintaa %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
-msgstr "Käyttökelpoista kellorajapintaa ei löytynyt.\n"
+msgstr "Käyttökelpoista kellorajapintaa ei löytynyt.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
-msgstr "Järjestelmäkellon asetus ei onnistu.\n"
+msgstr "Järjestelmäkellon asetus ei onnistu.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5824,38 +5697,43 @@ msgid ""
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
-"Ydin säilyttää laitteistokellon epoch-arvoa vain Alpha-koneilla.\n"
-"Tämä hwclock on käännetty muulle koneelle kuin Alphalle\n"
-"(ja todennäköisesti sitä ei ajeta Alphassa nyt). Toimintoa ei suoritettu.\n"
+"Ydin säilyttää laitteistokellon epoch-arvoa vain Alpha-koneilla.\n"
+"Tämä hwclock on käännetty muulle koneelle kuin Alphalle\n"
+"(ja todennäköisesti sitä ei ajeta Alphassa nyt). Toimintoa ei suoritettu.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
-msgstr "Ytimeltä ei saada epoch-arvoa.\n"
+msgstr "Ytimeltä ei saada epoch-arvoa.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Ydin olettaa epoch-arvoksi %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
-msgstr "Epoch arvon asettamiseksi on käytettävä \"epoch\"-valitsinta.\n"
+msgstr "Epoch arvon asettamiseksi on käytettävä \"epoch\"-valitsinta.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Ei aseteta epoch-arvoksi %d - vain kokeilu.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Ytimen epoch-arvoa ei voi asettaa.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s paketista %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5888,34 +5766,34 @@ msgid ""
 msgstr ""
 "hwclock - lukee ja asettaa laitteistokellon (RTC)\n"
 "\n"
-"Käyttö: hwclock [toiminto] [valitsimet...]\n"
+"Käyttö: hwclock [toiminto] [valitsimet...]\n"
 "\n"
 "Toiminnot:\n"
-"  --help        näyttää tämän ohjeen\n"
-"  --show        lukee laitteistokellon ja näyttää tulokset\n"
-"  --set         asettaa laitteistokellon --date:lla määrättyyn aikaan\n"
-"  --hctosys     asettaa järjestelmäkellon ajan laitteistokellon mukaan\n"
-"  --systohc     asettaa laitteistokellon nykyiseen järjestelmän aikaan\n"
-"  --adjust      säätää laitteistokellon huomioimaan systemaattisen "
-"siirtymän\n"
-"                edellisen asetuksen tai säädön jälkeen\n"
-"  --getepoch    näyttää ytimen epoch-arvon laitteistokellolle\n"
+"  --help        näyttää tämän ohjeen\n"
+"  --show        lukee laitteistokellon ja näyttää tulokset\n"
+"  --set         asettaa laitteistokellon --date:lla määrättyyn aikaan\n"
+"  --hctosys     asettaa järjestelmäkellon ajan laitteistokellon mukaan\n"
+"  --systohc     asettaa laitteistokellon nykyiseen järjestelmän aikaan\n"
+"  --adjust      säätää laitteistokellon huomioimaan systemaattisen "
+"siirtymän\n"
+"                edellisen asetuksen tai säädön jälkeen\n"
+"  --getepoch    näyttää ytimen epoch-arvon laitteistokellolle\n"
 "  --setepoch    asettaa ytimen epoch-arvon laitteistokellolle --epoch:illa\n"
-"                määrättyyn arvoon\n"
-"  --version     näyttää hwclockin versionumeron vakiotulosteeseen\n"
+"                määrättyyn arvoon\n"
+"  --version     näyttää hwclockin versionumeron vakiotulosteeseen\n"
 "\n"
 "Valitsimet: \n"
-"  --utc         laitteistokello on kansainvälisessä ajassa (UTC)\n"
+"  --utc         laitteistokello on kansainvälisessä ajassa (UTC)\n"
 "  --localtime   laitteistokello on paikallisesssa ajassa\n"
-"  --directisa   käytä ISA-väylää suoraan, ei laitteen %s kautta\n"
+"  --directisa   käytä ISA-väylää suoraan, ei laitteen %s kautta\n"
 "  --badyear     ei huomioida laitteistokellon vuotta, koska BIOS on rikki\n"
 "  --date        aika, johon laitteistokello asetetaan\n"
 "  --epoch=year  vuosi, joka on laitteistokellon\n"
 "                epoch-arvon nollakohta\n"
-"  --noadjfile   ei käytetä tiedostoa /etc/adjtime. Vaatii joko valitsimen\n"
-"                --utc tai --localtime käyttämistä\n"
+"  --noadjfile   ei käytetä tiedostoa /etc/adjtime. Vaatii joko valitsimen\n"
+"                --utc tai --localtime käyttämistä\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5924,80 +5802,80 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                kertoo hwclockille Alphan tyypin (katso hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ottaa vain valitsimia argumentteina. Annoit %d muuta.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
-"Monta toimintoa määritelty.\n"
+"Monta toimintoa määritelty.\n"
 "Vain yksi toiminto voidaan suorittaa kerrallaan.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
-"%s: Valitsimet --utc ja --localtime ovat toisensa poissulkevia. Käytit "
+"%s: Valitsimet --utc ja --localtime ovat toisensa poissulkevia. Käytit "
 "molempia.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
-"%s: Valitsimet --adjust ja --noadjfile ovat toisensa poissulkevia. Käytit "
+"%s: Valitsimet --adjust ja --noadjfile ovat toisensa poissulkevia. Käytit "
 "molempia.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
-"%s: Valitsimen --noadjfile kanssa on käytettävä joko valitsinta --utc tai --"
+"%s: Valitsimen --noadjfile kanssa on käytettävä joko valitsinta --utc tai --"
 "localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr "Ei käyttökelpoista aikaa asetettavaksi. Kelloa ei voida asettaa.\n"
+msgstr "Ei käyttökelpoista aikaa asetettavaksi. Kelloa ei voida asettaa.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr "Valitan, vain pääkäyttäjä voi säätää laitteistokelloa.\n"
+msgstr "Valitan, vain pääkäyttäjä voi säätää laitteistokelloa.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr "Valitan, vain pääkäyttäjä voi säätää järjestelmäkelloa.\n"
+msgstr "Valitan, vain pääkäyttäjä voi säätää järjestelmäkelloa.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
-"Valitan, vain pääkäyttäjä voi säätää laitteistokellon epoch-arvoa ytimessä.\n"
+"Valitan, vain pääkäyttäjä voi säätää laitteistokellon epoch-arvoa ytimessä.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr "Laitteistokelloa ei pystytä käyttämään millään tunnetulla tavalla.\n"
+msgstr "Laitteistokelloa ei pystytä käyttämään millään tunnetulla tavalla.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
-"Käytä --debug -valitsinta nähdäksesi yksityiskohdat käyttötavan etsinnästä.\n"
+"Käytä --debug -valitsinta nähdäksesi yksityiskohdat käyttötavan etsinnästä.\n"
 
 #: hwclock/kd.c:55
 #, c-format
@@ -6006,7 +5884,7 @@ msgstr "Odotetaan silmukassa KDGHWCLK-ajan muuttumista\n"
 
 #: hwclock/kd.c:58
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr "ajan lukeva KDGHWCLK-ioctl epäonnistui"
+msgstr "ajan lukeva KDGHWCLK-ioctl epäonnistui"
 
 #: hwclock/kd.c:79 hwclock/rtc.c:188
 #, c-format
@@ -6015,7 +5893,7 @@ msgstr "Aikakatkaisu odotettaessa ajan muutosta.\n"
 
 #: hwclock/kd.c:83
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "ajan lukeva KDGHWCLK-ioctl epäonnistui silmukassa"
+msgstr "ajan lukeva KDGHWCLK-ioctl epäonnistui silmukassa"
 
 #: hwclock/kd.c:105
 #, c-format
@@ -6024,26 +5902,25 @@ msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
 
 #: hwclock/kd.c:141
 msgid "ioctl KDSHWCLK failed"
-msgstr "ioctl KDSHWCLK epäonnistui"
+msgstr "ioctl KDSHWCLK epäonnistui"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Laitetta /dev/tty1 tai /dev/vc/1 ei voi avata"
 
 #: hwclock/kd.c:181
 msgid "KDGHWCLK ioctl failed"
-msgstr "KDGHWCLK-ioctl epäonnistui"
+msgstr "KDGHWCLK-ioctl epäonnistui"
 
 #: hwclock/rtc.c:116 hwclock/rtc.c:209
 #, c-format
 msgid "open() of %s failed"
-msgstr "tiedoston %s avaaminen epäonnistui"
+msgstr "tiedoston %s avaaminen epäonnistui"
 
 #: hwclock/rtc.c:150
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
-msgstr "aikaa lukeva ioctl() laitteelle %s epäonnistui.\n"
+msgstr "aikaa lukeva ioctl() laitteelle %s epäonnistui.\n"
 
 #: hwclock/rtc.c:172
 #, c-format
@@ -6058,34 +5935,35 @@ msgstr "laitteella %s ei ole keskeytysfunktioita. "
 #: hwclock/rtc.c:238
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr "kellon tikitystä odottava luku laitteelle %s epäonnistui"
+msgstr "kellon tikitystä odottava read()-kutsu laitteelle %s epäonnistui"
 
 #: hwclock/rtc.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick failed"
-msgstr "kellon tikitystä odottava luku laitteelle %s epäonnistui"
+msgstr "kellon tikitystä odottava select()-kutsu laitteelle %s epäonnistui"
 
 #: hwclock/rtc.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick timed out\n"
-msgstr "kellon tikitystä odottava luku laitteelle %s epäonnistui"
+msgstr ""
+"kellon tikitystä odottava select()-kutsu laitteelle %s aikakatkaistiin\n"
 
 #: hwclock/rtc.c:268
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
-msgstr "päivityskeskeytykset lopettava ioctl() laitteelle %s epäonnistui"
+msgstr "päivityskeskeytykset lopettava ioctl() laitteelle %s epäonnistui"
 
 #: hwclock/rtc.c:271
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"päivityskeskeytykset aloittava ioctl() laitteelle %s epäonnistui "
+"päivityskeskeytykset aloittava ioctl() laitteelle %s epäonnistui "
 "odottamattomasti"
 
 #: hwclock/rtc.c:330
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr "ajan asettava ioctl() laitteelle %s epäonnistui.\n"
+msgstr "ajan asettava ioctl() laitteelle %s epäonnistui.\n"
 
 #: hwclock/rtc.c:336
 #, c-format
@@ -6095,7 +5973,7 @@ msgstr "ioctl(%s) onnistui.\n"
 #: hwclock/rtc.c:365
 #, c-format
 msgid "Open of %s failed"
-msgstr "Tiedoston %s avaaminen epäonnistui"
+msgstr "Tiedoston %s avaaminen epäonnistui"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
@@ -6104,8 +5982,8 @@ msgid ""
 "device driver via the device special file %s.  This file does not exist on "
 "this system.\n"
 msgstr ""
-"Ytimen epoch-arvon muuttamiseksi on käytettävä Linuxin \"rtc\"-laiteajuria "
-"laitetiedoston %s kautta. Tässä järjestelmässä ei ole kyseistä tiedostoa.\n"
+"Ytimen epoch-arvon muuttamiseksi on käytettävä Linuxin \"rtc\"-laiteajuria "
+"laitetiedoston %s kautta. Tässä järjestelmässä ei ole kyseistä tiedostoa.\n"
 
 #: hwclock/rtc.c:388 hwclock/rtc.c:434
 #, c-format
@@ -6115,20 +5993,17 @@ msgstr "Laitetta %s ei voi avata"
 #: hwclock/rtc.c:395
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr "ioctl(RTC_EPOCH_READ) laitteelle %s epäonnistui"
+msgstr "ioctl(RTC_EPOCH_READ) laitteelle %s epäonnistui"
 
 #: hwclock/rtc.c:401
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr "luimme epoch-arvon %ld laitteelta %s ioctl:llä RTC_EPOCH_READ.\n"
+msgstr "luimme epoch-arvon %ld laitteelta %s ioctl:llä RTC_EPOCH_READ.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr "Epoch-arvo ei voi olla pienempi kuin 1900. Pyyntö oli %ld\n"
+msgstr "Epoch-arvo ei voi olla pienempi kuin 1900. Pyyntö oli %ld\n"
 
 #: hwclock/rtc.c:439
 #, c-format
@@ -6139,18 +6014,17 @@ msgstr "asetetaan epoch-arvoksi %ld, ioctl RTC_EPOCH_SET laitteelle %s.\n"
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr "Ytimen laiteajurissa laitteelle %s ei ole ioctl:ää RTC_EPOCH_SET.\n"
+msgstr "Ytimen laiteajurissa laitteelle %s ei ole ioctl:ää RTC_EPOCH_SET.\n"
 
 #: hwclock/rtc.c:447
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui"
+msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui"
 
 #: login-utils/agetty.c:312
 msgid "calling open_tty\n"
 msgstr "kutsutaan open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "kutsutaan termio_init\n"
@@ -6159,7 +6033,6 @@ msgstr "kutsutaan termio_init\n"
 msgid "writing init string\n"
 msgstr "kirjoitetaan alustusmerkkijonoa\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "ennen autobaudia\n"
@@ -6173,15 +6046,14 @@ msgstr "odotetaan cr-lf\n"
 msgid "read %c\n"
 msgstr "luettiin %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
-msgstr "luetaan käyttäjätunnus\n"
+msgstr "luetaan käyttäjätunnus\n"
 
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "%s: ohjelmaa %s ei voi käynnistää: %m"
+msgstr "%s: ohjelmaa %s ei voi käynnistää: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
@@ -6194,7 +6066,7 @@ msgstr "virheellinen aikakatkaisuarvo: %s"
 
 #: login-utils/agetty.c:480
 msgid "after getopt loop\n"
-msgstr "getopt-silmukan jälkeen\n"
+msgstr "getopt-silmukan jälkeen\n"
 
 #: login-utils/agetty.c:530
 msgid "exiting parseargs\n"
@@ -6220,14 +6092,13 @@ msgstr "poistutaan kohdasta parsespeeds\n"
 #: login-utils/agetty.c:649
 #, c-format
 msgid "/dev: chdir() failed: %m"
-msgstr "/dev: chdir() epäonnistui: %m"
+msgstr "/dev: chdir() epäonnistui: %m"
 
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ei ole merkkilaite"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6235,19 +6106,17 @@ msgstr "open(2)\n"
 #: login-utils/agetty.c:662
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr "/dev/%s: ei voi avata vakiosyötteenä: %m"
+msgstr "/dev/%s: ei voi avata vakiosyötteenä: %m"
 
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: ei ole avoin lukua/kirjoitusta varten"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "kopioidaan tiedostokahva\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6260,12 +6129,12 @@ msgstr "term_io 2\n"
 #: login-utils/agetty.c:937
 #, c-format
 msgid "user"
-msgstr "käyttäjä"
+msgstr "käyttäjä"
 
 #: login-utils/agetty.c:937
 #, c-format
 msgid "users"
-msgstr "käyttäjää"
+msgstr "käyttäjää"
 
 #: login-utils/agetty.c:1025
 #, c-format
@@ -6275,7 +6144,7 @@ msgstr "%s: luku: %m"
 #: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr "%s: syötteen ylivuoto"
+msgstr "%s: syötteen ylivuoto"
 
 #: login-utils/agetty.c:1195
 #, c-format
@@ -6285,75 +6154,70 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"Käyttö: %s [-hiLmw] [-l kirjautumisohjelma] [-t aikakatkaisu] [-I "
-"alustuskomennot] [-H kirjautumisisäntä] linjanopeus,... linja [term.tyyppi]\n"
+"Käyttö: %s [-hiLmw] [-l kirjautumisohjelma] [-t aikakatkaisu] [-I "
+"alustuskomennot] [-H kirjautumisisäntä] linjanopeus,... linja [term.tyyppi]\n"
 "tai\t[-hiLmw] [-l kirjautumisohjelma] [-t aikakatkaisu] [-I alustuskomennot] "
-"[-H kirjautumisisäntä] linja linjanopeus,... [term.tyyppi]\n"
+"[-H kirjautumisisäntä] linja linjanopeus,... [term.tyyppi]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
-msgstr "login: muisti vähissä, kirjautuminen voi epäonnistua\n"
+msgstr "login: muisti vähissä, kirjautuminen voi epäonnistua\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "kohteelle ttyclass ei voi varata muistia"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "kohteelle grplist ei voi varata muistia"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr "Kirjautuminen päätteelle %s osoitteesta %s evätty oletuksena.\n"
+msgstr "Kirjautuminen päätteelle %s osoitteesta %s evätty oletuksena.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr "Kirjautuminen päätteelle %s osoitteesta %s evätty.\n"
+msgstr "Kirjautuminen päätteelle %s osoitteesta %s evätty.\n"
 
 #: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr "%s: sinua (käyttäjä %d) ei ole olemassa.\n"
+msgstr "%s: sinua (käyttäjä %d) ei ole olemassa.\n"
 
 #: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: käyttäjä \"%s\" ei ole olemassa.\n"
+msgstr "%s: käyttäjä \"%s\" ei ole olemassa.\n"
 
 #: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
-"%s: vain paikallisia merkintöjä voi muuttaa; käytä sen sijaan komentoa yp%"
+"%s: vain paikallisia merkintöjä voi muuttaa; käytä sen sijaan komentoa yp%"
 "s.\n"
 
 #: login-utils/chfn.c:151 login-utils/chsh.c:136
-#, fuzzy
 msgid "Unknown user context"
-msgstr "unknown error in key"
+msgstr "Tuntematon käyttäjäympäristö"
 
 #: login-utils/chfn.c:152
 #, c-format
 msgid "%s: %s is not authorized to change the finger info of %s\n"
 msgstr ""
+"%s: käyttäjällä %s ei ole valtuutusta muuttaa käyttäjän %s finger-tietoja\n"
 
 #: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: Tiedoston /etc/passwd oletusympäristöä ei voi asettaa"
 
 #: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr "Vaihdetaan käyttäjän %s finger-tiedot.\n"
+msgstr "Vaihdetaan käyttäjän %s finger-tiedot.\n"
 
 #: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
 #: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
@@ -6361,15 +6225,15 @@ msgstr "Vaihdetaan käyttäjän %s finger-tiedot.\n"
 msgid "Password error."
 msgstr "Salasanavirhe."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Salasana: "
 
 #: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
-msgstr "Väärä salasana."
+msgstr "Väärä salasana."
 
 #: login-utils/chfn.c:217
 #, c-format
@@ -6379,7 +6243,7 @@ msgstr "Finger-tietoja ei muutettu.\n"
 #: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Käyttö: %s [ -f kokonimi ] [ -o toimisto ] "
+msgstr "Käyttö: %s [ -f kokonimi ] [ -o toimisto ] "
 
 #: login-utils/chfn.c:320
 #, c-format
@@ -6407,7 +6271,7 @@ msgstr ""
 #: login-utils/chfn.c:425
 #, c-format
 msgid "field is too long.\n"
-msgstr "kenttä on liian pitkä.\n"
+msgstr "kenttä on liian pitkä.\n"
 
 #: login-utils/chfn.c:433
 #, c-format
@@ -6417,12 +6281,12 @@ msgstr "merkki \"%c\" ei ole sallittu.\n"
 #: login-utils/chfn.c:438
 #, c-format
 msgid "Control characters are not allowed.\n"
-msgstr "Ohjausmerkkejä ei sallita.\n"
+msgstr "Ohjausmerkkejä ei sallita.\n"
 
 #: login-utils/chfn.c:503
 #, c-format
 msgid "Finger information *NOT* changed.  Try again later.\n"
-msgstr "Finger-tietoja *EI* muutettu. Yritä myöhemmin uudelleen.\n"
+msgstr "Finger-tietoja *EI* muutettu. Yritä myöhemmin uudelleen.\n"
 
 #: login-utils/chfn.c:506
 #, c-format
@@ -6431,12 +6295,12 @@ msgstr "Finger-tietoja muutettiin.\n"
 
 #: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:322
 msgid "malloc failed"
-msgstr "\"malloc\" epäonnistui"
+msgstr "\"malloc\" epäonnistui"
 
 #: login-utils/chsh.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: \"%s\" ei ole listattuna tiedostossa /etc/shells.\n"
+msgstr "%s: käyttäjällä %s ei ole valtuutusta vaihtaa käyttäjän %s kuorta\n"
 
 #: login-utils/chsh.c:157
 #, c-format
@@ -6444,16 +6308,18 @@ msgid ""
 "%s: Running UID doesn't match UID of user we're altering, shell change "
 "denied\n"
 msgstr ""
+"%s: Vallitseva UID ei täsmää muutettavan käyttäjän UID:hen, kuoren vaihto "
+"estetty\n"
 
 #: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr "%s: Kuori ei ole tiedostossa /etc/shells, kuoren vaihto evätty\n"
+msgstr "%s: Kuori ei ole tiedostossa /etc/shells, kuoren vaihto evätty\n"
 
 #: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr "Vaihdetaan käyttäjän %s kuori.\n"
+msgstr "Vaihdetaan käyttäjän %s kuori.\n"
 
 #: login-utils/chsh.c:211
 msgid "New shell"
@@ -6467,7 +6333,7 @@ msgstr "Kuorta ei vaihdettu.\n"
 #: login-utils/chsh.c:225
 #, c-format
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr "Kuorta *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
+msgstr "Kuorta *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
 
 #: login-utils/chsh.c:228
 #, c-format
@@ -6480,8 +6346,8 @@ msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
-"Käyttö: %s [ -s kuori ] [ --list-shells ] [ --help ] [ --version ]\n"
-"       [ käyttäjätunnus ]\n"
+"Käyttö: %s [ -s kuori ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ käyttäjätunnus ]\n"
 
 #: login-utils/chsh.c:336
 #, c-format
@@ -6496,17 +6362,17 @@ msgstr "%s: \"%s\" ei ole olemassa.\n"
 #: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
-msgstr "%s: \"%s\" ei ole käynnistettävä.\n"
+msgstr "%s: \"%s\" ei ole käynnistettävä.\n"
 
 #: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s: merkkiä \"%c\" ei sallita.\n"
+msgstr "%s: merkkiä \"%c\" ei sallita.\n"
 
 #: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
-msgstr "%s: Ohjausmerkkejä ei sallita.\n"
+msgstr "%s: Ohjausmerkkejä ei sallita.\n"
 
 #: login-utils/chsh.c:362
 #, c-format
@@ -6521,7 +6387,7 @@ msgstr "%s: \"%s\" ei ole listattuna tiedostossa /etc/shells.\n"
 #: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr "%s: käytä -l -valitsinta nähdäksesi listan\n"
+msgstr "%s: käytä -l -valitsinta nähdäksesi listan\n"
 
 #: login-utils/chsh.c:372
 #, c-format
@@ -6531,41 +6397,13 @@ msgstr "Varoitus: \"%s\" ei ole listattu tiedostossa /etc/shells.\n"
 #: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr "Käytä %s -l nähdäksesi listan.\n"
+msgstr "Käytä %s -l nähdäksesi listan.\n"
 
 #: login-utils/chsh.c:393
 #, c-format
 msgid "No known shells.\n"
 msgstr "Ei tunnettuja kuoria.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "laitetta /dev/urandom ei voitu avata"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "tiedostosta /dev/urandom ei voitu lukea satunnaisdataa"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "tiedostoa %s ei voi avata lukua varten"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "tiedoston %s tilaa ei voi lukea"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "tiedoston %s tila ei ole oikea"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "tiedostosta %s ei voi lukea dataa"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6574,13 +6412,13 @@ msgstr "Tiedostoa %s ei voi lukea, poistutaan."
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
-"käyttö: last [-#] [-f tiedosto] [-t tty] [-h isäntänimi] [käyttäjä ...]\n"
+"käyttö: last [-#] [-f tiedosto] [-t tty] [-h isäntänimi] [käyttäjä ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  edelleen kirjautuneena"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6589,15 +6427,15 @@ msgstr ""
 "\n"
 "wtmp alkaa %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: malloc-virhe.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6606,80 +6444,74 @@ msgstr ""
 "\n"
 "keskeytetty %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "VAKAVAA: päätettä ei voi avata uudelleen: %s"
+msgstr "VAKAVAA: päätettä ei voi avata uudelleen: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
-msgstr "VAKAVAA: virheellinen pääte"
+msgstr "VAKAVAA: virheellinen pääte"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
-msgstr "login: -h on vain pääkäyttäjälle.\n"
+msgstr "login: -h on vain pääkäyttäjälle.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
-msgstr "käyttö: login [-fp] [käyttäjänimi]\n"
+msgstr "käyttö: login [-fp] [käyttäjänimi]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr "login: PAM-virhe, keskeytetään: %s\n"
+msgstr "login: PAM-virhe, keskeytetään: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAMia ei voitu alustaa: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "tunnus: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %3$s KIRJAUTUMINEN %1$d OSOITTEESTA %2$s, %4$s"
+msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %3$s KIRJAUTUMINEN %1$d OSOITTEESTA %2$s, %4$s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
-"Kirjautuminen epäonnistui\n"
+"Kirjautuminen epäonnistui\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
-"LIIAN MONTA (%1$d) KÄYTTÄJÄN %3$s KIRJAUTUMISYRITYSTÄ OSOITTEESTA %2$s, %4$s"
+"LIIAN MONTA (%1$d) KÄYTTÄJÄN %3$s KIRJAUTUMISYRITYSTÄ OSOITTEESTA %2$s, %4$s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %2$s ISTUNTO OSOITTEESTA %1$s, %3$s"
+msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %2$s ISTUNTO OSOITTEESTA %1$s, %3$s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 "\n"
-"Kirjautuminen epäonnistui\n"
+"Kirjautuminen epäonnistui\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6688,135 +6520,120 @@ msgstr ""
 "\n"
 "Istunnon aloitusongelma, keskeytys.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr "Käyttäjänimi on NULL funktiossa %s, rivillä %d. Keskeytys."
+msgstr "Käyttäjänimi on NULL funktiossa %s, rivillä %d. Keskeytys."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr "Virheellinen käyttäjänimi \"%s\" funktiossa %s, rivillä %d. Keskeytys."
+msgstr "Virheellinen käyttäjänimi \"%s\" funktiossa %s, rivillä %d. Keskeytys."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Muisti lopussa\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
-msgstr "Virheellinen käyttäjänimi"
+msgstr "Virheellinen käyttäjänimi"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr "Käyttäjän %s kirjautuminen hylätty tällä päätteellä.\n"
+msgstr "Käyttäjän %s kirjautuminen hylätty tällä päätteellä.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN OSOITTEESTA %s, PÄÄTTEELLÄ %s"
+msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN OSOITTEESTA %s, PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN PÄÄTTEELLÄ %s"
+msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Virheellinen kirjautuminen\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Liian monta käyttäjää on jo kirjautuneena.\n"
-"Yritä myöhemmin uudelleen.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Liian monta prosessia käynnissä.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr "KÄYTTÄJÄN %2$s MODEEMIYHTEYS PÄÄTTEELLÄ %1$s"
+msgstr "KÄYTTÄJÄN %2$s MODEEMIYHTEYS PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s OSOITTEESTA %s"
+msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s OSOITTEESTA %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s"
+msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
-msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s OSOITTEESTA %3$s"
+msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s OSOITTEESTA %3$s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s"
+msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Sinulle on uutta postia.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Sinulle on postia.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: virhe haarautettaessa: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
-msgstr "TIOCSCTTY epäonnistui: %m"
+msgstr "TIOCSCTTY epäonnistui: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
-msgstr "setuid() epäonnistui"
+msgstr "setuid() epäonnistui"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Ei hakemistoa %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
-msgstr "Kirjaudutaan käyttäen kotihakemistona \"/\".\n"
+msgstr "Kirjaudutaan käyttäen kotihakemistona \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ei muistia kuoriskriptille.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr "login: kuoriskriptiä ei voitu käynnistää: %s.\n"
+msgstr "login: kuoriskriptiä ei voitu käynnistää: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ei kuorta: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6825,68 +6642,68 @@ msgstr ""
 "\n"
 "%s, kirjautuminen: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
-msgstr "tunnus aivan liian pitkä.\n"
+msgstr "tunnus aivan liian pitkä.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
-msgstr "NIMI liian pitkä"
+msgstr "NIMI liian pitkä"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
-msgstr "tunnukset eivät voi alkaa merkillä \"-\".\n"
+msgstr "tunnukset eivät voi alkaa merkillä \"-\".\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
-msgstr "liian monta peräkkäistä rivinvaihtoa.\n"
+msgstr "liian monta peräkkäistä rivinvaihtoa.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "LIIKAA rivinvaihtoja"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr "Kirjautuminen aikakatkaistiin %d sekunnin jälkeen\n"
+msgstr "Kirjautuminen aikakatkaistiin %d sekunnin jälkeen\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Edellinen kirjautuminen: %.*s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "osoitteesta %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
-msgstr "päätteeltä %.*s\n"
+msgstr "päätteeltä %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr "EPÄONNISTUNUT KIRJAUTUMINEN OSOITTEESTA %s, %s"
+msgstr "EPÄONNISTUNUT KIRJAUTUMINEN OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr "EPÄONNISTUNUT KIRJAUTUMINEN PÄÄTTEELTÄ %s, %s"
+msgstr "EPÄONNISTUNUT KIRJAUTUMINEN PÄÄTTEELTÄ %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA OSOITTEESTA %s, %s"
+msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA PÄÄTTEELTÄ %s, %s"
+msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA PÄÄTTEELTÄ %s, %s"
 
 #: login-utils/mesg.c:89
 #, c-format
@@ -6901,174 +6718,36 @@ msgstr "on n\n"
 #: login-utils/mesg.c:112
 #, c-format
 msgid "usage: mesg [y | n]\n"
-msgstr "käyttö: mesg [y | n]\n"
+msgstr "käyttö: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
-msgstr "newgrp: Kuka sinä olet?"
+msgstr "newgrp: Kuka sinä olet?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
-msgstr "newgrp: Ryhmää ei ole."
+msgstr "newgrp: Ryhmää ei ole."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
-msgstr "newgrp: Lupa evätty"
+msgstr "newgrp: Lupa evätty"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Ei kuorta"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Salasanassa on oltava vähintään kuusi merkkiä, yritä uudelleen.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Salasanan merkkien on oltava seuraavista kahdesta ryhmästä:\n"
-"isot ja pienet kirjaimet, numerot ja ei-alfanumeeriset\n"
-"merkit. Lisätietoja manuaalisivulla passwd(1).\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Et voi uudelleenkäyttää vanhoja salasanoja.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Älä käytä mitään käyttäjätunnuksesi tapaista salasanana!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Älä käytä mitään oikean nimesi kaltaista salasanana!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Käyttö: passwd [käyttäjätunnus [salasana]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Vain pääkäyttäjä voi käyttää argumentteja.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Käyttö: passwd [-foqsvV] [käyttäjä [salasana]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Ohjelmaa %s ei voi käynnistää: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Käyttäjätunnusta ei löydy"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Vain pääkäyttäjä voi vaihtaa muiden salasanoja.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Liian monta argumenttia.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Käyttäjätunnusta ei löydy mistään. Onko \"%s\" todella käyttäjä?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Valitan, pystyn muuttamaan vain paikallisia salasanoja. Käytä komentoa "
-"yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID ja käyttäjänimi eivät vastaa toisiaan, huijari!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Vaihdetaan käyttäjän %s salasana\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Syötä vanha salasana: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Virheellinen salasana, huijari."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Syötä uusi salasana: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Salasanaa ei vaihdettu."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Syötä uusi salasana uudelleen: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Kirjoitit väärin. Salasanaa ei vaihdettu."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "salasana vaihdettu, käyttäjä %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "PÄÄKÄYTTÄJÄN SALASANA VAIHDETTU"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "pääkäyttäjä vaihtoi käyttäjän %s salasanan"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "kutsutaan setpwnam salasanan asettamiseksi.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Salasanaa *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Salasana vaihdettu.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Käyttö: shutdown [-h|-r] [-fqs] [now|hh:mm|+minuutit]\n"
+msgstr "Käyttö: shutdown [-h|-r] [-fqs] [now|hh:mm|+minuutit]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
@@ -7077,25 +6756,25 @@ msgstr "Sammutustoiminto keskeytetty"
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr "%s: Vain root voi sammuttaa järjestelmän.\n"
+msgstr "%s: Vain root voi sammuttaa järjestelmän.\n"
 
 #: login-utils/shutdown.c:256
 #, c-format
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Tuon täytyy olla huomenna, etkö voi odottaa siihen asti?\n"
+msgstr "Tuon täytyy olla huomenna, etkö voi odottaa siihen asti?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
-msgstr "ylläpitoa varten; mars, mars"
+msgstr "ylläpitoa varten; mars, mars"
 
 #: login-utils/shutdown.c:311
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
-msgstr "aikaraja = %d, hiljaisuus = %d, uudelleenkäynnistys = %d\n"
+msgstr "aikaraja = %d, hiljaisuus = %d, uudelleenkäynnistys = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr "Järjestelmä sammutetaan 5 minuutin kuluttua"
+msgstr "Järjestelmä sammutetaan 5 minuutin kuluttua"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
@@ -7104,21 +6783,20 @@ msgstr "Kirjautuminen on sen vuoksi estetty"
 #: login-utils/shutdown.c:362
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr "uudelleenkäynnisti %s: %s"
+msgstr "uudelleenkäynnisti %s: %s"
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "halted by %s: %s"
 msgstr "sammutti %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
 "\n"
-"Miksi olen edelleen elossa uudelleenkäynnistyksen jälkeen?"
+"Miksi olen edelleen elossa uudelleenkäynnistyksen jälkeen?"
 
 #: login-utils/shutdown.c:431
 msgid ""
@@ -7141,43 +6819,42 @@ msgstr "Virhe virrankatkaisussa\t%s\n"
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr "Käynnistetään ohjelma \"%s\"...\n"
+msgstr "Käynnistetään ohjelma \"%s\"...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr "Virhe käynnistettäessä\t%s\n"
+msgstr "Virhe käynnistettäessä\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "KIIREELLISTÄ: yleislähetysviesti käyttäjältä %s:"
+msgstr "KIIREELLISTÄ: yleislähetysviesti käyttäjältä %s:"
 
 #: login-utils/shutdown.c:494
 #, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr "Järjestelmä sammuu %d tunnin, %d minuutin kuluttua"
+msgstr "Järjestelmä sammuu %d tunnin, %d minuutin kuluttua"
 
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr "Järjestelmä sammuu 1 tunnin ja %d minuutin kuluttua"
+msgstr "Järjestelmä sammuu 1 tunnin ja %d minuutin kuluttua"
 
 #: login-utils/shutdown.c:500
 #, c-format
 msgid "System going down in %d minutes\n"
-msgstr "Järjestelmä sammuu %d minuutin kuluttua\n"
+msgstr "Järjestelmä sammuu %d minuutin kuluttua\n"
 
 #: login-utils/shutdown.c:503
 #, c-format
 msgid "System going down in 1 minute\n"
-msgstr "Järjestelmä sammuu 1 minuutin kuluttua\n"
+msgstr "Järjestelmä sammuu 1 minuutin kuluttua\n"
 
 #: login-utils/shutdown.c:505
 #, c-format
 msgid "System going down IMMEDIATELY!\n"
-msgstr "Järjestelmä sammuu VÄLITTÖMÄSTI!\n"
+msgstr "Järjestelmä sammuu VÄLITTÖMÄSTI!\n"
 
 #: login-utils/shutdown.c:510
 #, c-format
@@ -7190,25 +6867,25 @@ msgstr "Haarauttaminen komentoa swapoff varten ei onnistu. Aivan sama!"
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr "Komentoa swapoff ei voi käynnistää, toivottavasti umount hoitaa asian."
+msgstr "Komentoa swapoff ei voi käynnistää, toivottavasti umount hoitaa asian."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
 msgstr ""
-"Haarauttaminen komentoa umount varten ei onnistu, yritetään manuaalisesti."
+"Haarauttaminen komentoa umount varten ei onnistu, yritetään manuaalisesti."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "Ohjelmaa %s ei voi käynnistää, yritetään käynnistää umount.\n"
+msgstr "Ohjelmaa %s ei voi käynnistää, yritetään käynnistää umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr "Ohjelmaa umount ei voi käynnistää, luovutaan irrotusyrityksestä."
+msgstr "Ohjelmaa umount ei voi käynnistää, luovutaan irrotusyrityksestä."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
-msgstr "Irrotetaan jäljellä olevat tiedostojärjestelmät..."
+msgstr "Irrotetaan jäljellä olevat tiedostojärjestelmät..."
 
 #: login-utils/shutdown.c:659
 #, c-format
@@ -7217,15 +6894,15 @@ msgstr "shutdown: Laitetta %s ei voitu irrottaa: %s\n"
 
 #: login-utils/simpleinit.c:132
 msgid "Booting to single user mode.\n"
-msgstr "Käynnistetään yhden käyttäjän tilaan.\n"
+msgstr "Käynnistetään yhden käyttäjän tilaan.\n"
 
 #: login-utils/simpleinit.c:136
 msgid "exec of single user shell failed\n"
-msgstr "yhden käyttäjän tilan kuoren käynnistys epäonnistui\n"
+msgstr "yhden käyttäjän tilan kuoren käynnistys epäonnistui\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
-msgstr "yhden käyttäjän tilan kuoren haarauttaminen epäonnistui\n"
+msgstr "yhden käyttäjän tilan kuoren haarauttaminen epäonnistui\n"
 
 #: login-utils/simpleinit.c:208
 msgid "error opening fifo\n"
@@ -7239,7 +6916,6 @@ msgstr "virhe asetettaessa \"close-on-exec\" laitteelle /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "virhe ajettaessa finalprogia\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "virhe haarautettaessa finalprogia\n"
@@ -7250,27 +6926,27 @@ msgid ""
 "Wrong password.\n"
 msgstr ""
 "\n"
-"Väärä salasana.\n"
+"Väärä salasana.\n"
 
 #: login-utils/simpleinit.c:418
 msgid "lstat of path failed\n"
-msgstr "polun tilan lukeminen epäonnistui\n"
+msgstr "polun tilan lukeminen epäonnistui\n"
 
 #: login-utils/simpleinit.c:426
 msgid "stat of path failed\n"
-msgstr "polun tilan lukeminen epäonnistui\n"
+msgstr "polun tilan lukeminen epäonnistui\n"
 
 #: login-utils/simpleinit.c:434
 msgid "open of directory failed\n"
-msgstr "hakemiston avaaminen epäonnistui\n"
+msgstr "hakemiston avaaminen epäonnistui\n"
 
 #: login-utils/simpleinit.c:508
 msgid "fork failed\n"
-msgstr "haarauttaminen epäonnistui\n"
+msgstr "haarauttaminen epäonnistui\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
-msgstr "käynnistys epäonnistui\n"
+msgstr "käynnistys epäonnistui\n"
 
 #: login-utils/simpleinit.c:563
 msgid "cannot open inittab\n"
@@ -7278,21 +6954,21 @@ msgstr "tiedostoa inittab ei voi avata\n"
 
 #: login-utils/simpleinit.c:630
 msgid "no TERM or cannot stat tty\n"
-msgstr "TERM-muuttujaa ei ole tai päätteen tilaa ei voi lukea\n"
+msgstr "TERM-muuttujaa ei ole tai päätteen tilaa ei voi lukea\n"
 
 #: login-utils/simpleinit.c:936
 #, c-format
 msgid "error stopping service: \"%s\""
-msgstr "virhe pysäytettäessä palvelua: \"%s\""
+msgstr "virhe pysäytettäessä palvelua: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr "liian monta iov:tä (muuta koodia tiedostossa wall/ttymsg.c)"
+msgstr "liian monta iov:tä (muuta koodia tiedostossa wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 #, c-format
 msgid "excessively long line arg"
-msgstr "liian pitkä riviargumentti"
+msgstr "liian pitkä riviargumentti"
 
 #: login-utils/ttymsg.c:139
 #, c-format
@@ -7317,7 +6993,7 @@ msgstr "%s: salasanatiedosto on varattu.\n"
 #: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr "%s: ryhmätiedosto on varattu.\n"
+msgstr "%s: ryhmätiedosto on varattu.\n"
 
 #: login-utils/vipw.c:162
 #, c-format
@@ -7327,17 +7003,17 @@ msgstr "%s: tiedosto %s on varattu (%s on olemassa)\n"
 #: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr "%s: tiedostoa %s ei voi linkittää: %s\n"
+msgstr "%s: tiedostoa %s ei voi linkittää: %s\n"
 
 #: login-utils/vipw.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't get context for %s"
-msgstr "Laitteelle %s ei voi hakea aikarajaa: %s\n"
+msgstr "%s: Tiedoston %s ympäristöä ei voi hakea"
 
 #: login-utils/vipw.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't set context for %s"
-msgstr "Laitteelle %s ei voi hakea aikarajaa: %s\n"
+msgstr "%s: Tiedoston %s ympäristöä ei voi asettaa"
 
 #: login-utils/vipw.c:217
 #, c-format
@@ -7364,12 +7040,12 @@ msgstr "%s: muutoksia ei tehty\n"
 #: login-utils/vipw.c:352
 #, c-format
 msgid "You are using shadow groups on this system.\n"
-msgstr "Tässä järjestelmässä käytetään varjoryhmiä.\n"
+msgstr "Tässä järjestelmässä käytetään varjoryhmiä.\n"
 
 #: login-utils/vipw.c:353
 #, c-format
 msgid "You are using shadow passwords on this system.\n"
-msgstr "Tässä järjestelmässä käytetään varjosalasanoja.\n"
+msgstr "Tässä järjestelmässä käytetään varjosalasanoja.\n"
 
 #: login-utils/vipw.c:354
 #, c-format
@@ -7379,22 +7055,22 @@ msgstr "Haluatko muokata tiedostoa %s nyt [y/n]? "
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "käyttö: %s [tiedosto]\n"
+msgstr "käyttö: %s [tiedosto]\n"
 
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
+msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
 #: login-utils/wall.c:186
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr "Yleislähetysviesti käyttäjältä %s@%s"
+msgstr "Yleislähetysviesti käyttäjältä %s@%s"
 
 #: login-utils/wall.c:204
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr "%s: ei lueta tiedostoa %s - käytä vakiosyötettä.\n"
+msgstr "%s: ei lueta tiedostoa %s - käytä vakiosyötettä.\n"
 
 #: login-utils/wall.c:209
 #, c-format
@@ -7404,27 +7080,21 @@ msgstr "%s: tiedostoa %s ei voi lukea.\n"
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: väliaikaistiedoston tilaa ei voi lukea.\n"
+msgstr "%s: väliaikaistiedoston tilaa ei voi lukea.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
+msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
 #: misc-utils/cal.c:327
 msgid "illegal month value: use 1-12"
-msgstr "virheellinen kuukauden arvo: käytä 1-12"
+msgstr "virheellinen kuukauden arvo: käytä 1-12"
 
 #: misc-utils/cal.c:331
 msgid "illegal year value: use 1-9999"
-msgstr "virheellinen vuoden arvo: käytä 1-9999"
-
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
+msgstr "virheellinen vuoden arvo: käytä 1-9999"
+
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7433,15 +7103,14 @@ msgstr "%s %d"
 #: misc-utils/cal.c:780
 #, c-format
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr "käyttö: cal [-13smjyV] [[kuukausi] vuosi]\n"
+msgstr "käyttö: cal [-13smjyV] [[kuukausi] vuosi]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr "käyttö: %s [+muoto] [päivä kuukausi vuosi]\n"
+msgstr "käyttö: %s [+muoto] [päivä kuukausi vuosi]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tib's Day"
 
@@ -7453,7 +7122,7 @@ msgstr "%s: tuntematon signaali %s\n"
 #: misc-utils/kill.c:270
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s: prosessia \"%s\" ei löydy\n"
+msgstr "%s: prosessia \"%s\" ei löydy\n"
 
 #: misc-utils/kill.c:314
 #, c-format
@@ -7463,7 +7132,7 @@ msgstr "%s: tuntematon signaali %s; kelvolliset signaalit:\n"
 #: misc-utils/kill.c:354
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "käyttö: %s [ -s signaali | -p ] [ -a ] pid ...\n"
+msgstr "käyttö: %s [ -s signaali | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:355
 #, c-format
@@ -7490,13 +7159,13 @@ msgstr "logger: tuntematon prioriteetin nimi: %s.\n"
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
-"käyttö: logger [-is] [-f tiedosto] [-p pri] [-t tag] [-u pistoke] "
+"käyttö: logger [-is] [-f tiedosto] [-p pri] [-t tag] [-u pistoke] "
 "[ viesti ... ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr "käyttö: look [-dfa] [-t merkki] merkkijono [tiedosto]\n"
+msgstr "käyttö: look [-dfa] [-t merkki] merkkijono [tiedosto]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
@@ -7511,22 +7180,22 @@ msgstr "Tiedostosta %2$s saatiin %1$d tavua\n"
 #: misc-utils/namei.c:103
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr "namei: nykyistä hakemistoa ei voida hakea - %s\n"
+msgstr "namei: nykyistä hakemistoa ei voida hakea - %s\n"
 
 #: misc-utils/namei.c:116
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei: hakemistoon %s ei voi siirtyä - %s (%d)\n"
+msgstr "namei: hakemistoon %s ei voi siirtyä - %s (%d)\n"
 
 #: misc-utils/namei.c:126
 #, c-format
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "käyttö: namei [-mx] polku [polku ...]\n"
+msgstr "käyttö: namei [-mx] polku [polku ...]\n"
 
 #: misc-utils/namei.c:151
 #, c-format
 msgid "namei: could not chdir to root!\n"
-msgstr "namei: juureen siirtyminen epäonnistui!\n"
+msgstr "namei: juureen siirtyminen epäonnistui!\n"
 
 #: misc-utils/namei.c:158
 #, c-format
@@ -7541,12 +7210,12 @@ msgstr "namei: puskurin ylivuoto\n"
 #: misc-utils/namei.c:218
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr " ? siirtyminen hakemistoon %s epäonnistui - %s (%d)\n"
+msgstr " ? siirtyminen hakemistoon %s epäonnistui - %s (%d)\n"
 
 #: misc-utils/namei.c:247
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr " ? ongelmia luettaessa symlinkkiä %s - %s (%d)\n"
+msgstr " ? ongelmia luettaessa symlinkkiä %s - %s (%d)\n"
 
 #: misc-utils/namei.c:257
 #, c-format
@@ -7566,14 +7235,14 @@ msgstr "%s: muisti lopussa\n"
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "%s: uudelleennimeäminen %s -> %s epäonnistui: %s\n"
+msgstr "%s: uudelleennimeäminen %s -> %s epäonnistui: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
-msgstr "käyttö: %s lähde kohde tiedostot...\n"
+msgstr "käyttö: %s lähde kohde tiedostot...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7581,25 +7250,25 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 "Varoitus: \"%s\" on linkki.\n"
-"Käytä \"%s [valitsimet] %s\" jos todella haluat käyttää sitä.\n"
-"Skriptiä ei käynnistetty.\n"
+"Käytä \"%s [valitsimet] %s\" jos todella haluat käyttää sitä.\n"
+"Skriptiä ei käynnistetty.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "käyttö: script [-a] [-f] [-q] [-t] [tiedosto]\n"
+msgstr "käyttö: script [-a] [-f] [-q] [-t] [tiedosto]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr "Skripti käynnistetty, tiedosto on %s\n"
+msgstr "Skripti käynnistetty, tiedosto on %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
-msgstr "Skripti käynnistetty %s"
+msgstr "Skripti käynnistetty %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7608,257 +7277,256 @@ msgstr ""
 "\n"
 "Skripti suoritettu %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skripti suoritettu, tiedosto on %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
-msgstr "openpty epäonnistui\n"
+msgstr "openpty epäonnistui\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Pty:t lopussa\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
-msgstr "%s: Argumenttivirhe, käyttö\n"
+msgstr "%s: Argumenttivirhe, käyttö\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
-msgstr "  [ -term päätteen_nimi ]\n"
+msgstr "  [ -term päätteen_nimi ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
-msgstr "  [ -dump   [1-KONSOLIEN_MÄÄRÄ] ]\n"
+msgstr "  [ -dump   [1-KONSOLIEN_MÄÄRÄ] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
-msgstr "  [ -append [1-KONSOLIEN_MÄÄRÄ] ]\n"
+msgstr "  [ -append [1-KONSOLIEN_MÄÄRÄ] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumptiedostonimi ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
-msgstr "virransäästötilaa ei voi asettaa (pois)\n"
+msgstr "virransäästötilaa ei voi asettaa (pois)\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl-virhe: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Virhe luettaessa %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
-msgstr "Virhe kirjoitettaessa näyttövedosta\n"
+msgstr "Virhe kirjoitettaessa näyttövedosta\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr "tiedostoa %s ei voitu lukea, eikä dump-ioctl onnistu\n"
+msgstr "tiedostoa %s ei voitu lukea, eikä dump-ioctl onnistu\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr "%s: $TERM ei ole määritelty.\n"
+msgstr "%s: $TERM ei ole määritelty.\n"
 
 #: misc-utils/whereis.c:157
 #, c-format
@@ -7868,7 +7536,7 @@ msgstr "whereis [ -sbmu ] [ -SBM hak ... -f ] nimi...\n"
 #: misc-utils/write.c:99
 #, c-format
 msgid "write: can't find your tty's name\n"
-msgstr "write: tty:si nimeä ei löydy\n"
+msgstr "write: tty:si nimeä ei löydy\n"
 
 #: misc-utils/write.c:110
 #, c-format
@@ -7878,17 +7546,17 @@ msgstr "write: sinulla ei ole kirjoitusoikeutta.\n"
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr "write: %s ei ole kirjautuneena päätteellä %s.\n"
+msgstr "write: %s ei ole kirjautuneena päätteellä %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr "write: %s on estänyt viestit päätteellä %s\n"
+msgstr "write: %s on estänyt viestit päätteellä %s\n"
 
 #: misc-utils/write.c:146
 #, c-format
 msgid "usage: write user [tty]\n"
-msgstr "käyttö: write käyttäjä [tty]\n"
+msgstr "käyttö: write käyttäjä [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
@@ -7898,7 +7566,7 @@ msgstr "write: %s ei ole kirjautuneena\n"
 #: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr "write: %s ei vastaanota viestejä\n"
+msgstr "write: %s ei vastaanota viestejä\n"
 
 #: misc-utils/write.c:247
 #, c-format
@@ -7910,12 +7578,12 @@ msgstr ""
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
-"Viesti %4$s:lle kirjautuneelta käyttäjältä %1$s@%2$s (%3$s), kello %5$s..."
+"Viesti %4$s:lle kirjautuneelta käyttäjältä %1$s@%2$s (%3$s), kello %5$s..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s..."
+msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s..."
 
 #: mount/fstab.c:136
 #, c-format
@@ -7931,26 +7599,22 @@ msgstr "virhe: tiedostoa %s ei voi avata: %s"
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
-"mount: tiedostoa %s ei voitu avata - käytetään tiedostoa %s sen sijaan\n"
+"mount: tiedostoa %s ei voitu avata - käytetään tiedostoa %s sen sijaan\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr "lukkotiedostoa %s ei voi luoda: %s (käytä lippua -n ohittaaksesi)"
+msgstr "lukkotiedostoa %s ei voi luoda: %s (käytä lippua -n ohittaaksesi)"
 
 #: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr "lukkotiedostoa %s ei voi linkittää: %s (käytä lippua -n ohittaaksesi)"
+msgstr "lukkotiedostoa %s ei voi linkittää: %s (käytä lippua -n ohittaaksesi)"
 
 #: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr "lukkotiedostoa %s ei voi avata: %s (käytä lippua -n ohittaaksesi)"
+msgstr "lukkotiedostoa %s ei voi avata: %s (käytä lippua -n ohittaaksesi)"
 
 #: mount/fstab.c:526
 #, c-format
@@ -7972,13 +7636,13 @@ msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
-"Linkkiä %s ei voi luoda\n"
-"Ehkä jossakin on vanhentunut lukkotiedosto?\n"
+"Linkkiä %s ei voi luoda\n"
+"Ehkä jossakin on vanhentunut lukkotiedosto?\n"
 
 #: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr "hakemistoa %s ei voi avata (%s) - mtabia ei päivitetty"
+msgstr "hakemistoa %s ei voi avata (%s) - mtabia ei päivitetty"
 
 #: mount/fstab.c:633
 #, c-format
@@ -7993,7 +7657,7 @@ msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
 #: mount/fstab.c:661
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "nimeäminen %s -> %s ei onnistu: %s\n"
+msgstr "nimeäminen %s -> %s ei onnistu: %s\n"
 
 #: mount/lomount.c:73
 #, c-format
@@ -8003,7 +7667,7 @@ msgstr "loop: laitetta %s ei voi avata: %s\n"
 #: mount/lomount.c:89
 #, c-format
 msgid ", offset %lld"
-msgstr ", siirtymä %lld"
+msgstr ", siirtymä %lld"
 
 #: mount/lomount.c:92
 #, c-format
@@ -8018,7 +7682,7 @@ msgstr ", salaus %s (tyyppi %d)"
 #: mount/lomount.c:114
 #, c-format
 msgid ", offset %d"
-msgstr ", siirtymä %d"
+msgstr ", siirtymä %d"
 
 #: mount/lomount.c:117
 #, c-format
@@ -8031,29 +7695,29 @@ msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
 #: mount/lomount.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any device /dev/loop#"
-msgstr "mount: ei löytynyt yhtään laitetta /dev/loop#"
+msgstr "%s: ei löytynyt yhtään laitetta /dev/loop#"
 
 #: mount/lomount.c:181
 #, c-format
 msgid "%s: no permission to look at /dev/loop#"
-msgstr ""
+msgstr "%s: ei oikeuksia laitteeseen /dev/loop#"
 
 #: mount/lomount.c:184
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: Ei löytynyt yhtään loop-laitetta, ja tiedoston %s mukaan\n"
-"       tämä ydin ei ole tietoinen loop-laitteesta?\n"
-"       (Jos näin on, käännä uudelleen tai suorita \"modprobe loop\".)"
+"%s: Ei löytynyt yhtään loop-laitetta. Ehkä tämä ydin ei ole tietoinen\n"
+"       loop-laitteista?\n"
+"       (Jos näin on, käännä uudelleen tai suorita \"modprobe loop\".)"
 
 #: mount/lomount.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any free loop device"
-msgstr "mount: ei löytynyt yhtään vapaata loop-laitetta"
+msgstr "%s: ei löytynyt yhtään vapaata loop-laitetta"
 
 #: mount/lomount.c:287
 #, c-format
@@ -8061,9 +7725,9 @@ msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Muistia ei voitu lukita, poistutaan.\n"
 
 #: mount/lomount.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
-msgstr "set_loop(%s,%s,%d): onnistui\n"
+msgstr "set_loop(%s,%s,%llu): onnistui\n"
 
 #: mount/lomount.c:351
 #, c-format
@@ -8078,10 +7742,10 @@ msgstr "del_loop(%s): onnistui\n"
 #: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "Tämä mount on käännetty ilman loop-tukea. Käännä uudelleen.\n"
+msgstr "Tämä mount on käännetty ilman loop-tukea. Käännä uudelleen.\n"
 
 #: mount/lomount.c:406
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage:\n"
 "  %s loop_device                                       # give info\n"
@@ -8089,20 +7753,21 @@ msgid ""
 "  %s -f                                                # find unused\n"
 "  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
 msgstr ""
-"käyttö:\n"
-"  %s loop-laite                                        # näytä tietoja\n"
+"käyttö:\n"
+"  %s loop-laite                                        # näytä tietoja\n"
 "  %s -d loop-laite                                     # poista\n"
-"  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
+"  %s -f                                                # etsi vapaa\n"
+"  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
 
 #: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
 msgid "not enough memory"
-msgstr "muisti ei riitä"
+msgstr "muisti ei riitä"
 
 #: mount/lomount.c:540
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr "Loop-tukea ei ollut käännöksen aikana. Käännä uudelleen.\n"
+msgstr "Loop-tukea ei ollut käännöksen aikana. Käännä uudelleen.\n"
 
 #: mount/mntent.c:166
 #, c-format
@@ -8116,34 +7781,34 @@ msgstr "[mntent]: rivi %d tiedostossa %s on virheellinen%s\n"
 
 #: mount/mntent.c:220
 msgid "; rest of file ignored"
-msgstr "; loput tiedostosta jätetään huomioimatta"
+msgstr "; loput tiedostosta jätetään huomioimatta"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: nimiö %s esiintyy sekä paikassa %s että %s\n"
+msgstr "%s: nimiö %s esiintyy sekä paikassa %s että %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: liitetään %s %sn perusteella\n"
+msgstr "mount: liitetään %s UUID:n perusteella\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: liitetään %s %sn perusteella\n"
+msgstr "mount: liitetään %s nimiön perusteella\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount: laitetta %s ei voitu avata, joten UUID- ja LABEL-muunnosta ei voi "
-"tehdä.\n"
+"%s: laitetta %s ei voitu avata, joten UUID- ja LABEL-muunnosta ei voi "
+"tehdä.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: virheellinen UUID"
+msgstr "%s: virheellinen UUID"
 
 #: mount/mount.c:382
 #, c-format
@@ -8173,16 +7838,16 @@ msgstr "mount: virhe muutettaessa tiedoston %s tilaa: %s"
 #: mount/mount.c:483
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr "%s vaikuttaa olevan sivutustilaa - ei liitetä"
+msgstr "%s vaikuttaa olevan sivutustilaa - ei liitetä"
 
 #: mount/mount.c:570
 msgid "mount failed"
-msgstr "liittäminen epäonnistui"
+msgstr "liittäminen epäonnistui"
 
 #: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: vain root voi liittää %s pisteeseen %s"
+msgstr "mount: vain root voi liittää %s pisteeseen %s"
 
 #: mount/mount.c:600
 msgid "mount: loop device specified twice"
@@ -8200,12 +7865,12 @@ msgstr "mount: ohitetaan loop-laitteen asettaminen\n"
 #: mount/mount.c:626
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr "mount: aiotaan käyttää loop-laitetta %s\n"
+msgstr "mount: aiotaan käyttää loop-laitetta %s\n"
 
 #: mount/mount.c:631
 #, c-format
 msgid "mount: failed setting up loop device\n"
-msgstr "mount: loop-laitteen asettaminen epäonnistui\n"
+msgstr "mount: loop-laitteen asettaminen epäonnistui\n"
 
 #: mount/mount.c:635
 #, c-format
@@ -8231,83 +7896,74 @@ msgstr "mount: tiedostoa %s ei voi avata nopeuden asetusta varten"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: nopeutta ei voi asettaa: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: haarauttaminen ei onnistu: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: tämä versio on käännetty ilman tukea tyypille \"nfs\""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
-msgstr "mount: epäonnistui nfs mount -versiolla 4, yritetään versiolla 3..\n"
+msgstr "mount: epäonnistui nfs mount -versiolla 4, yritetään versiolla 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
-"mount: Tiedostojärjestelmän tyyppiä ei voitu määrittää, eikä tyyppiä ole "
+"mount: Tiedostojärjestelmän tyyppiä ei voitu määrittää, eikä tyyppiä ole "
 "annettu"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
-msgstr "mount: tiedostojärjestelmän tyyppi on annettava"
+msgstr "mount: tiedostojärjestelmän tyyppi on annettava"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
-msgstr "mount: liitos epäonnistui"
+msgstr "mount: liitos epäonnistui"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: liitospiste %s ei ole hakemisto"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
-msgstr "mount: lupa evätty"
+msgstr "mount: lupa evätty"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
-msgstr "mount: mountin käyttöön vaaditaan pääkäyttäjän oikeudet"
+msgstr "mount: mountin käyttöön vaaditaan pääkäyttäjän oikeudet"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s on varattu"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc on jo liitetty"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s on jo liitetty tai %s on varattu"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: liitospiste %s ei ole olemassa"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: liitospiste %s on symlinkki olemattomaan"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: erikoislaite %s ei ole olemassa"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8316,165 +7972,162 @@ msgstr ""
 "mount: erikoislaite %s ei ole olemassa\n"
 "       (polun etuliite ei ole hakemisto)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
-msgstr "mount: %s ei ole vielä liitetty, tai virheellinen valitsin"
+msgstr "mount: %s ei ole vielä liitetty, tai virheellinen valitsin"
 
-#: mount/mount.c:966
-#, fuzzy, c-format
+#: mount/mount.c:959
+#, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
-"mount: väärä tiedostojärjestelmätyyppi, virheellinen valitsin, viallinen \n"
-"       superlohko laitteella %s, tai liian monta liitettyä \n"
-"       tiedostojärjestelmää"
+"mount: väärä tiedostojärjestelmätyyppi, virheellinen valitsin, viallinen \n"
+"       superlohko laitteella %s, puuttuva koodisivu, tai muu virhe"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
+"       (voisiko tämä olla IDE-laite, joka käyttää ide-scsi-ajuria,\n"
+"       jolloin käytetään sr0:aa tai sda:ta?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
+"       (etkö yritäkin liittää laajennettua osiota, etkä\n"
+"       sen sisältämää loogista osiota?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"       Joissakin tapauksissa järjestelmälokista löytyy hyödyllistä\n"
+"       tietoa - kokeile esim. komentoa \"dmesg | tail\".\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
-msgstr "liitostaulukko täynnä"
+msgstr "liitostaulukko täynnä"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superlohkoa ei voi lukea"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: tuntematon laite"
 
-#: mount/mount.c:1016
-#, fuzzy, c-format
+#: mount/mount.c:1009
+#, c-format
 msgid "mount: unknown filesystem type '%s'"
-msgstr "   l    listaa tunnetut tiedostojärjestelmätyypit"
+msgstr "mount: tuntematon tiedostojärjestelmän tyyppi \"%s\""
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr "mount: tarkoitat todennäköisesti %s"
+msgstr "mount: tarkoitat todennäköisesti %s"
 
-#: mount/mount.c:1030
-#, fuzzy
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
-msgstr "mount: ehkä tarkoitit iso9660?"
+msgstr "mount: ehkä tarkoitit \"iso9660\"?"
 
-#: mount/mount.c:1032
-#, fuzzy
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
-msgstr "mount: ehkä tarkoitit iso9660?"
+msgstr "mount: ehkä tarkoitit \"vfat\"?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
-"mount: tiedoston %s laitenumero on väärä tai tiedostojärjestelmätyyppi %s ei "
+"mount: tiedoston %s laitenumero on väärä tai tiedostojärjestelmätyyppi %s ei "
 "ole tuettu"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s ei ole lohkolaite, ja tilan luku epäonnistuu?"
+msgstr "mount: %s ei ole lohkolaite, ja tilan luku epäonnistuu?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 "mount: ydin ei tunnista tiedostoa %s lohkolaitteeksi\n"
-"       (ehkä \"insmod ajuri\" auttaa?)"
+"       (ehkä \"insmod ajuri\" auttaa?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount: %s ei ole lohkolaite (yritä \"-o loop\"?)"
+msgstr "mount: %s ei ole lohkolaite (yritä \"-o loop\"?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ei ole lohkolaite"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ei ole kelvollinen lohkolaite"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "lohkolaite "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
+msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s on kirjoitussuojattu, mutta \"-w\" -lippu on annettu"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
-msgstr "mount: %s%s on kirjoitussuojattu, liitetään vain luku -tilassa"
+msgstr "mount: %s%s on kirjoitussuojattu, liitetään vain luku -tilassa"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
-"mount: tyyppiä ei annettu - kaksoispisteen perusteella sen oletetaan olevan "
+"mount: tyyppiä ei annettu - kaksoispisteen perusteella sen oletetaan olevan "
 "nfs\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
-"mount: tyyppiä ei annettu - //-alkuliitteen perusteella sen oletetaan olevan "
+"mount: tyyppiä ei annettu - //-alkuliitteen perusteella sen oletetaan olevan "
 "smbfs\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr "mount: siirretään taustalle \"%s\"\n"
+msgstr "mount: siirretään taustalle \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: luovutetaan \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s on jo liitetty paikkaan %s\n"
 
-# valitsin -p passwdfd, mitä se tekee???
-#: mount/mount.c:1426
+# valitsin -p passwdfd, mitä se tekee???
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8499,182 +8152,182 @@ msgid ""
 "Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
-"Käyttö: mount -V                 : näytä versio\n"
-"        mount -h                 : näytä tämä ohje\n"
-"        mount                    : näytä liitetyt tiedostojärjestelmät\n"
-"        mount -l                 : sama kuin edellä, lisäksi nimiöt\n"
-"Siinä informatiivinen osuus. Seuraavaksi liittäminen.\n"
-"Komento kuuluu \"mount [-t tied.järj.tyyppi] jotakin jonnekin\".\n"
-"Tiedostossa /etc/fstab olevat yksityiskohdat voi jättää pois.\n"
-"        mount -a [-t|-O] ...     : liitä kaikki tiedostosta /etc/fstab\n"
-"        mount laite              : liitä laite tunnettuun paikkaan\n"
-"        mount hakemisto          : liitä tunnettu laite tänne\n"
+"Käyttö: mount -V                 : näytä versio\n"
+"        mount -h                 : näytä tämä ohje\n"
+"        mount                    : näytä liitetyt tiedostojärjestelmät\n"
+"        mount -l                 : sama kuin edellä, lisäksi nimiöt\n"
+"Siinä informatiivinen osuus. Seuraavaksi liittäminen.\n"
+"Komento kuuluu \"mount [-t tied.järj.tyyppi] jotakin jonnekin\".\n"
+"Tiedostossa /etc/fstab olevat yksityiskohdat voi jättää pois.\n"
+"        mount -a [-t|-O] ...     : liitä kaikki tiedostosta /etc/fstab\n"
+"        mount laite              : liitä laite tunnettuun paikkaan\n"
+"        mount hakemisto          : liitä tunnettu laite tänne\n"
 "        mount -t tyyppi laite hak: normaali liitoskomento\n"
-"Huomaa, että oikeasti ei liitetä laitetta, vaan laitteella oleva\n"
-"(annetun tyypin mukainen) tiedostojärjestelmä.\n"
-"Voidaan myös liittää jo näkyvissä oleva hakemistopuu muualle:\n"
+"Huomaa, että oikeasti ei liitetä laitetta, vaan laitteella oleva\n"
+"(annetun tyypin mukainen) tiedostojärjestelmä.\n"
+"Voidaan myös liittää jo näkyvissä oleva hakemistopuu muualle:\n"
 "        mount --bind vanha_hak uusi_hak\n"
-"tai siirtää alipuu:\n"
+"tai siirtää alipuu:\n"
 "        mount --move vanha_hak uusi_hak\n"
-"Laite voidaan antaa nimellä, esim. /dev/hda1 tai /dev/cdrom,\n"
-"tai nimiöllä, käyttäen  -L nimiö  tai uuid:lla, käyttäen  -U uuid .\n"
+"Laite voidaan antaa nimellä, esim. /dev/hda1 tai /dev/cdrom,\n"
+"tai nimiöllä, käyttäen  -L nimiö  tai uuid:lla, käyttäen  -U uuid .\n"
 "Muut valitsimet: [-nfFrsvw] [-o valitsimet] [-p passwdfd].\n"
-"Paljon lisätietoja komennolla:  man 8 mount .\n"
+"Paljon lisätietoja komennolla:  man 8 mount .\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
-msgstr "mount: vain root voi tehdä tuon"
+msgstr "mount: vain root voi tehdä tuon"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: ei löytynyt %s - luodaan se..\n"
+msgstr "mount: ei löytynyt %s - luodaan se..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
-msgstr "mount: osiota ei löydy"
+msgstr "mount: osiota ei löydy"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr "mount: liitetään %s\n"
+msgstr "mount: liitetään %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
-msgstr "mitään ei liitetty"
+msgstr "mitään ei liitetty"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr "mount: %s ei löydy tiedostosta %s"
+msgstr "mount: %s ei löydy tiedostosta %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr "mount: %s ei löydy tiedostosta %s, eikä %s"
+msgstr "mount: %s ei löydy tiedostosta %s, eikä %s"
 
 #: mount/mount_guess_fstype.c:489
 #, c-format
 msgid "mount: error while guessing filesystem type\n"
-msgstr "mount: virhe arvattaessa tiedostojärjestelmän tyyppiä\n"
+msgstr "mount: virhe arvattaessa tiedostojärjestelmän tyyppiä\n"
 
 #: mount/mount_guess_fstype.c:541
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount: et antanut tyyppiä tiedostojärjestelmälle %s\n"
+msgstr "mount: et antanut tyyppiä tiedostojärjestelmälle %s\n"
 
 #: mount/mount_guess_fstype.c:544
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr "       Kokeillaan kaikkia tiedostoissa %s ja %s mainittuja tyyppejä\n"
+msgstr "       Kokeillaan kaikkia tiedostoissa %s ja %s mainittuja tyyppejä\n"
 
 #: mount/mount_guess_fstype.c:547
 #, c-format
 msgid "       and it looks like this is swapspace\n"
-msgstr "       ja tämä näyttää olevan sivutustilaa\n"
+msgstr "       ja tämä näyttää olevan sivutustilaa\n"
 
 #: mount/mount_guess_fstype.c:549
 #, c-format
 msgid "       I will try type %s\n"
-msgstr "       Kokeillaan tyyppiä %s\n"
+msgstr "       Kokeillaan tyyppiä %s\n"
 
 #: mount/mount_guess_fstype.c:637
 #, c-format
 msgid "Trying %s\n"
 msgstr "Kokeillaan %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
-msgstr "mount: liian pitkä isäntä:hakemisto-argumentti\n"
+msgstr "mount: liian pitkä isäntä:hakemisto-argumentti\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr "mount: varoitus: useita isäntänimiä ei tueta\n"
+msgstr "mount: varoitus: useita isäntänimiä ei tueta\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr "mount: liitettävä hakemisto ei ole isäntä:hakemisto-muodossa\n"
+msgstr "mount: liitettävä hakemisto ei ole isäntä:hakemisto-muodossa\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: nimelle %s ei voi hakea osoitetta\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: saatiin virheellinen hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
-msgstr "mount: liian pitkä valitsinargumentti\n"
+msgstr "mount: liian pitkä valitsinargumentti\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Varoitus: Tunnistamaton proto= -valitsin.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Varoitus: Valitsinta namlen ei tueta.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "tuntematon nfs-liitosparametri: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Varoitus: valitsinta nolock ei tueta.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "tuntematon nfs-liitosvalitsin: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: saatiin virheellinen hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS yli TCP:n ei ole tuettu.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
-msgstr "nfs-palvelin ilmoitti, ettei palvelu ole käytettävissä"
+msgstr "nfs-palvelin ilmoitti, ettei palvelu ole käytettävissä"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
-msgstr "käytettiin porttikartoitinta NFS-portin etsimiseen\n"
+msgstr "käytettiin porttikartoitinta NFS-portin etsimiseen\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr "käytetään porttia %d nfs-palvelimelle\n"
+msgstr "käytetään porttia %d nfs-palvelimelle\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "tuntematon nfs status -paluuarvo: %d"
@@ -8683,231 +8336,227 @@ msgstr "tuntematon nfs status -paluuarvo: %d"
 msgid "bug in xstrndup call"
 msgstr "ohjelmistovirhe xstrndup-kutsussa"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
 "       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
-"käyttö: %s [-hV]\n"
+"käyttö: %s [-hV]\n"
 "        %s -a [-e] [-v]\n"
-"        %s [-v] [-p prioriteetti] erikoistiedosto ...\n"
+"        %s [-v] [-p prioriteetti] erikoistiedosto|LABEL=levyn_nimiö ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
-"käyttö: %s [-hV]\n"
+"käyttö: %s [-hV]\n"
 "        %s -a [-v]\n"
 "        %s [-v] erikoistiedosto ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s laitteella %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: merkkijonoa \"_stext\" ei löydy tiedostosta %s\n"
+msgstr "%s: tiedostolle %s ei löydy laitetta\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: tiedoston %s tilaa ei voi lukea: %s\n"
+msgstr "%s: tiedoston %s tilaa ei voi lukea: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
-"swapon: varoitus: tiedostolla %s on turvattomat oikeudet %04o, %04o "
-"suositellaan\n"
+"%s: varoitus: tiedostolla %s on turvattomat oikeudet %04o, suositellaan %"
+"04o\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: Ohitetaan tiedosto %s - siinä vaikuttaa olevan reikiä.\n"
+msgstr "%s: Ohitetaan tiedosto %s - siinä vaikuttaa olevan reikiä.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
-msgstr "Et ole pääkäyttäjä.\n"
+msgstr "Et ole pääkäyttäjä.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi avata: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
-msgstr "umount: käännetty ilman tukea valitsimelle -f\n"
+msgstr "umount: käännetty ilman tukea valitsimelle -f\n"
 
-#: mount/umount.c:141
-#, fuzzy, c-format
+#: mount/umount.c:139
+#, c-format
 msgid "umount: cannot fork: %s"
-msgstr "mount: haarauttaminen ei onnistu: %s"
+msgstr "umount: haarauttaminen ei onnistu: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr "isäntä: %s, hakemisto: %s\n"
+msgstr "isäntä: %s, hakemisto: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: nimelle %s ei saada osoitetta\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: saatiin virheellinen hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: virheellinen lohkolaite"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr "umount: %s: ei ole liitettynä"
+msgstr "umount: %s: ei ole liitettynä"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superlohkoa ei voi kirjoittaa"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: laite on varattu"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
-msgstr "umount: %s: ei löydy"
+msgstr "umount: %s: ei löydy"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: %s: vaaditaan pääkäyttäjän oikeudet"
+msgstr "umount: %s: vaaditaan pääkäyttäjän oikeudet"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr "umount: %s: lohkolaitteita ei sallita tiedostojärjestelmässä"
+msgstr "umount: %s: lohkolaitteita ei sallita tiedostojärjestelmässä"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ohjelmaa umount2 ei ole, kokeillaan ohjelmaa umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
-"kohteen %s irrottaminen epäonnistui - yritetään sen sijaan irrottaa %s\n"
+"kohteen %s irrottaminen epäonnistui - yritetään sen sijaan irrottaa %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s on varattu - uudelleenliitettiin vain luku -tilassa\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
-"umount: kohteen %s uudelleenliittäminen vain luku -tilassa epäonnistui\n"
+"umount: kohteen %s uudelleenliittäminen vain luku -tilassa epäonnistui\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s irrotettu\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr "umount: irrotettavien tiedostojärjestelmien listaa ei löydy"
+msgstr "umount: irrotettavien tiedostojärjestelmien listaa ei löydy"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Käyttö: umount [-hV]\n"
-"        umount -a [-f] [-r] [-n] [-v] [-t vtied.järj.tyypit] [-O "
+"Käyttö: umount [-hV]\n"
+"        umount -a [-f] [-r] [-n] [-v] [-t vtied.järj.tyypit] [-O "
 "valitsimet]\n"
 "        umount [-f] [-r] [-n] [-v] erikoistied | solmu...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
-#, fuzzy
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
-msgstr "Ei voi avata "
+msgstr "Ei voi avata \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr "Yritetään irrottaa %s\n"
+msgstr "Yritetään irrottaa %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr "%s ei löytynyt tiedostosta mtab\n"
+msgstr "%s ei löytynyt tiedostosta mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ei ole liitetty (tiedoston mtab mukaan)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount: %s vaikuttaa olevan liitettynä useita kertoja"
+msgstr "umount: %s vaikuttaa olevan liitettynä useita kertoja"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount: %s ei ole tiedostossa fstab (etkä ole root)"
+msgstr "umount: %s ei ole tiedostossa fstab (etkä ole root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s on ristiriidassa tiedoston fstab kanssa"
 
-#: mount/umount.c:637
-#, fuzzy, c-format
+#: mount/umount.c:630
+#, c-format
 msgid "umount: only %s can unmount %s from %s"
-msgstr "umount: vain root voi irrottaa laitteen %s paikasta %s"
+msgstr "umount: vain %s voi irrottaa laitteen %s paikasta %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
-msgstr "umount: vain root voi tehdä tämän"
+msgstr "umount: vain root voi tehdä tämän"
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr "Vain root voi määritellä Ctrl-Alt-Del:n vaikutuksen.\n"
+msgstr "Vain root voi määritellä Ctrl-Alt-Del:n vaikutuksen.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 #, c-format
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Käyttö: ctrlaltdel hard|soft\n"
+msgstr "Käyttö: ctrlaltdel hard|soft\n"
 
 #: sys-utils/cytune.c:115
 #, c-format
@@ -8915,8 +8564,8 @@ msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Tiedosto %s, kynnysarvolle %lu, suurin merkkimäärä fifossa oli %d,\n"
-"ja suurin siirtonopeus (merkkiä/sekunti) oli %f\n"
+"Tiedosto %s, kynnysarvolle %lu, suurin merkkimäärä fifossa oli %d,\n"
+"ja suurin siirtonopeus (merkkiä/sekunti) oli %f\n"
 
 #: sys-utils/cytune.c:126
 #, c-format
@@ -8926,13 +8575,13 @@ msgid ""
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
 "Tiedosto %s, kynnysarvolle %lu ja aikakatkaisuarvolle %lu, suurin "
-"merkkimäärä fifossa oli %d,\n"
-"ja suurin siirtonopeus (merkkiä/sekunti) oli %f\n"
+"merkkimäärä fifossa oli %d,\n"
+"ja suurin siirtonopeus (merkkiä/sekunti) oli %f\n"
 
 #: sys-utils/cytune.c:190
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr "Virheellinen sisäinen arvo: %s\n"
+msgstr "Virheellinen sisäinen arvo: %s\n"
 
 #: sys-utils/cytune.c:198
 #, c-format
@@ -8960,7 +8609,7 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
-"Käyttö: %s [-q [-i väli]] ([-s arvo]|[-S arvo]) ([-t arvo]|[-T arvo]) [-g|-"
+"Käyttö: %s [-q [-i väli]] ([-s arvo]|[-S arvo]) ([-t arvo]|[-T arvo]) [-g|-"
 "G] tiedosto [tiedosto...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
@@ -8972,17 +8621,17 @@ msgstr "Laitetta %s ei voi avata: %s\n"
 #: sys-utils/cytune.c:258
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr "Laitteelle %s ei voi asettaa kynnystä %d: %s\n"
+msgstr "Laitteelle %s ei voi asettaa kynnystä %d: %s\n"
 
 #: sys-utils/cytune.c:277
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr "Laitteelle %s ei voi asettaa aikakynnystä %d: %s\n"
+msgstr "Laitteelle %s ei voi asettaa aikakynnystä %d: %s\n"
 
 #: sys-utils/cytune.c:295 sys-utils/cytune.c:352 sys-utils/cytune.c:383
 #, c-format
 msgid "Can't get threshold for %s: %s\n"
-msgstr "Laitteelle %s ei voi hakea kynnystä: %s\n"
+msgstr "Laitteelle %s ei voi hakea kynnystä: %s\n"
 
 #: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
 #, c-format
@@ -9001,16 +8650,16 @@ msgstr "%s: %ld oletuskynnys ja %ld oletusaikakatkaisu\n"
 
 #: sys-utils/cytune.c:328
 msgid "Can't set signal handler"
-msgstr "Signaalikäsittelijää ei voi asettaa"
+msgstr "Signaalikäsittelijää ei voi asettaa"
 
 #: sys-utils/cytune.c:332 sys-utils/cytune.c:367
 msgid "gettimeofday failed"
-msgstr "gettimeofday epäonnistui"
+msgstr "gettimeofday epäonnistui"
 
 #: sys-utils/cytune.c:345 sys-utils/cytune.c:377
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr "Laitteelle %s ei voi käyttää CYGETMONia: %s\n"
+msgstr "Laitteelle %s ei voi käyttää CYGETMONia: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
@@ -9039,18 +8688,19 @@ msgstr "   %f int/sec; %f rec (char/sec)\n"
 #: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr "Käyttö: %s [-c] [-n taso] [-s puskurin_koko]\n"
+msgstr "Käyttö: %s [-c] [-n taso] [-s puskurin_koko]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: tuntematon signaali %s\n"
+msgstr "flock: tuntematon valitsin, keskeytetään.\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Käyttö: flock [--shared | --timeout=sekunnit] tiedosto komento {arg arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9060,7 +8710,7 @@ msgstr "virheellinen id: %s\n"
 #: sys-utils/ipcrm.c:84
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "id:tä %s ei voi poistaa (%s)\n"
+msgstr "id:tä %s ei voi poistaa (%s)\n"
 
 #: sys-utils/ipcrm.c:99
 #, c-format
@@ -9217,27 +8867,25 @@ msgstr "kernel not configured for shared memory\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Shared Memory Limits --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "max number of segments = %lu\n"
-msgstr "max number of segments = %ld\n"
+msgstr "max number of segments = %lu\n"
 
 #: sys-utils/ipcs.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "max seg size (kbytes) = %lu\n"
-msgstr "max seg size (kbytes) = %ld\n"
+msgstr "max seg size (kbytes) = %lu\n"
 
 #: sys-utils/ipcs.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "max total shared memory (pages) = %lu\n"
-msgstr "max total shared memory (kbytes) = %ld\n"
+msgstr "max total shared memory (kbytes) = %lu\n"
 
 #: sys-utils/ipcs.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "min seg size (bytes) = %lu\n"
-msgstr "min seg size (bytes) = %ld\n"
+msgstr "min seg size (bytes) = %lu\n"
 
 #: sys-utils/ipcs.c:289
 #, c-format
@@ -9716,12 +9364,12 @@ msgstr "pid"
 
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "käyttö: rdev [ -rv ] [ -o SIIRTYMÄ ] [ KUVA [ VALUE [ SIIRTYMÄ ] ] ]"
+msgstr "käyttö: rdev [ -rv ] [ -o SIIRTYMÄ ] [ KUVA [ VALUE [ SIIRTYMÄ ] ] ]"
 
 #: sys-utils/rdev.c:70
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (tai rdev /linux, jne) näyttää nykyisen JUURIlaitteen"
+msgstr "  rdev /dev/fd0  (tai rdev /linux, jne) näyttää nykyisen JUURIlaitteen"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -9737,11 +9385,11 @@ msgstr "  rdev -r /dev/fd0 627\t\t  aseta RAM-levyn koko"
 
 #: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1\t\t  aseta käynnistyksen NÄYTTÖTILA"
+msgstr "  rdev -v /dev/fd0 1\t\t  aseta käynnistyksen NÄYTTÖTILA"
 
 #: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...\t\t\t  käytä tavusiirtymää N"
+msgstr "  rdev -o N ...\t\t\t  käytä tavusiirtymää N"
 
 #: sys-utils/rdev.c:76
 msgid "  rootflags ...                   same as rdev -R"
@@ -9759,12 +9407,12 @@ msgstr "  vidmode ...\t\t\t  sama kuin rdev -v"
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
-"Huom: Näyttötilat ovat: -3=Kysy, -2=Laajennettu, -1=NormaaliVga, 1=avain1, "
+"Huom: Näyttötilat ovat: -3=Kysy, -2=Laajennettu, -1=NormaaliVga, 1=avain1, "
 "2=avain2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      -R 1 liittää juuren vain luku -tilaan, -R 0 luku/kirjoitus."
+msgstr "      -R 1 liittää juuren vain luku -tilaan, -R 0 luku/kirjoitus."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
@@ -9777,7 +9425,7 @@ msgstr "muisti lopussa"
 
 # c-format
 #: sys-utils/readprofile.c:118
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9793,18 +9441,19 @@ msgid ""
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s: Käyttö: \"%s [valitsimet]\n"
+"%s: Käyttö: \"%s [valitsimet]\n"
 "\t -m <karttatied> (oletukset: \"%s\" ja\n"
 "\t\t\t\t    \"%s\")\n"
 "\t -p <profiili>   (oletus: \"%s\")\n"
-"\t -M <mult>       asettaa profilointikertoimeksi <mult>\n"
-"\t -i              näyttää vain tiedon \"sampling step\":istä\n"
+"\t -M <kerr>       asettaa profilointikertoimeksi <kerr>\n"
+"\t -i              näyttää vain tiedon \"sampling step\":istä\n"
 "\t -v              monisanaisuus\n"
-"\t -a              näyttää kaikki symbolit, vaikka määrä olisi 0\n"
-"\t -b              näyttää yksittäiset \"histogram-bin\"-määrät\n"
-"\t -r              nollaa kaikki laskurit (vain pääkäyttäjälle)\n"
-"\t -n              poistaa käytöstä tavujärjestyksen automaattitunnistuksen\n"
-"\t -V              näyttää version ja poistuu\n"
+"\t -a              näyttää kaikki symbolit, vaikka määrä olisi 0\n"
+"\t -b              näyttää yksittäiset \"histogram-bin\"-määrät\n"
+"\t -s              näyttää yksittäiset laskurit funktioissa\n"
+"\t -r              nollaa kaikki laskurit (vain pääkäyttäjälle)\n"
+"\t -n              poistaa käytöstä tavujärjestyksen automaattitunnistuksen\n"
+"\t -V              näyttää version ja poistuu\n"
 
 #: sys-utils/readprofile.c:197
 #, c-format
@@ -9819,35 +9468,35 @@ msgstr "Sampling_step: %i\n"
 #: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr "%s: %s(%i): väärä kartan rivi\n"
+msgstr "%s: %s(%i): väärä kartan rivi\n"
 
 #: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr "%s: merkkijonoa \"_stext\" ei löydy tiedostosta %s\n"
+msgstr "%s: merkkijonoa \"_stext\" ei löydy tiedostosta %s\n"
 
 #: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
-"%s: profiiliosoite sallitun välin ulkopuolella. Väärä karttatiedosto?\n"
+"%s: profiiliosoite sallitun välin ulkopuolella. Väärä karttatiedosto?\n"
 
 #: sys-utils/readprofile.c:401
 msgid "total"
-msgstr "yhteensä"
+msgstr "yhteensä"
 
 #: sys-utils/renice.c:68
 #, c-format
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
-"käyttö: renice prioriteetti [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
-"käyttäjät ]\n"
+"käyttö: renice prioriteetti [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"käyttäjät ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr "renice: %s: tuntematon käyttäjä\n"
+msgstr "renice: %s: tuntematon käyttäjä\n"
 
 #: sys-utils/renice.c:105
 #, c-format
@@ -9870,7 +9519,7 @@ msgstr "%d: vanha prioriteetti %d, uusi prioriteetti %d\n"
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "käyttö: %s ohjelma [ arg ...]\n"
+msgstr "käyttö: %s ohjelma [ arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9879,7 +9528,7 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"Käyttö: %s <laite> [ -i <IRQ> | -t <AIKA> | -c <MERKIT> | -w <ODOTUS> | \n"
+"Käyttö: %s <laite> [ -i <IRQ> | -t <AIKA> | -c <MERKIT> | -w <ODOTUS> | \n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
@@ -9934,12 +9583,12 @@ msgstr "LPGETIRQ-virhe"
 #: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr "%s käyttää IRQ:ta %d\n"
+msgstr "%s käyttää IRQ:ta %d\n"
 
 #: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr "%s käyttää kiertokyselyä\n"
+msgstr "%s käyttää kiertokyselyä\n"
 
 #: text-utils/col.c:153
 #, c-format
@@ -9949,7 +9598,7 @@ msgstr "col: virheellinen -l -argumentti %s.\n"
 #: text-utils/col.c:535
 #, c-format
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "käyttö: col [-bfpx] [-l rivimäärä]\n"
+msgstr "käyttö: col [-bfpx] [-l rivimäärä]\n"
 
 #: text-utils/col.c:541
 #, c-format
@@ -9963,7 +9612,7 @@ msgstr "col: varoitus: varmistaminen ei onnistu %s.\n"
 
 #: text-utils/col.c:549
 msgid "past first line"
-msgstr "ensimmäisestä rivistä eteenpäin"
+msgstr "ensimmäisestä rivistä eteenpäin"
 
 #: text-utils/col.c:549
 msgid "-- line already flushed"
@@ -9972,16 +9621,16 @@ msgstr "-- rivipuskuri on jo tyhjennetty"
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "käyttö: %s [ - ] [ -2 ] [ tiedosto ... ]\n"
+msgstr "käyttö: %s [ - ] [ -2 ] [ tiedosto ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
-msgstr "liian pitkä rivi"
+msgstr "liian pitkä rivi"
 
 #: text-utils/column.c:374
 #, c-format
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "käyttö: column [-tx] -c sarakkeet] [tiedosto ...]\n"
+msgstr "käyttö: column [-tx] -c sarakkeet] [tiedosto ...]\n"
 
 #: text-utils/hexsyntax.c:82
 #, c-format
@@ -10001,17 +9650,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e muoto] [-f muototied] [-n pituus] [-s ohita] "
 "[tiedosto ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "käyttö: %s [-dflpcsu] [+rivinumero | +/hahmo] nimi1 nimi2 ...\n"
+msgstr "käyttö: %s [-dflpcsu] [+rivinumero | +/hahmo] nimi1 nimi2 ...\n"
 
-#: text-utils/more.c:484
-#, fuzzy, c-format
+#: text-utils/more.c:439
+#, c-format
 msgid "%s: unknown option \"-%c\"\n"
-msgstr "%s: tuntematon signaali %s\n"
+msgstr "%s: tuntematon valitsin \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10022,8 +9671,7 @@ msgstr ""
 "*** %s: hakemisto ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10034,45 +9682,45 @@ msgstr ""
 "***** %s: Ei ole tekstitiedosto *****\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
-msgstr "[Käytä q tai Q lopettaaksesi]"
+msgstr "[Käytä q tai Q lopettaaksesi]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
-msgstr "--Lisää--"
+msgstr "--Lisää--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Seuraava tiedosto: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr "[Välilyönti jatkaa, \"q\" lopettaa.]"
+msgstr "[Välilyönti jatkaa, \"q\" lopettaa.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
-msgstr "...%d sivua taaksepäin"
+msgstr "...%d sivua taaksepäin"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
-msgstr "...1 sivu taaksepäin"
+msgstr "...1 sivu taaksepäin"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...ohitetaan yksi rivi"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
-msgstr "...ohitetaan %d riviä"
+msgstr "...ohitetaan %d riviä"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10082,7 +9730,7 @@ msgstr ""
 "***Takaisin***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10090,12 +9738,12 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"Useimpia komentoja voi edeltää valinnainen kokonaislukuargumentti k.\n"
+"Useimpia komentoja voi edeltää valinnainen kokonaislukuargumentti k.\n"
 "Oletusasetukset hakasulkeissa.\n"
-"Asteriskilla (*) merkityissä komennoissa argumentista tulee uusi "
+"Asteriskilla (*) merkityissä komennoissa argumentista tulee uusi "
 "oletusarvo.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10117,74 +9765,74 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<väli>                  Näytä seuraavat k riviä tekstiä [nykyinen ruudun "
-"rivimäärä]\n"
-"z                       Näytä seuraavat k riviä tekstiä [nykyinen ruudun "
-"rivimäärä]*\n"
-"<return>                Näytä seuraavat k riviä tekstiä [1]*\n"
-"d tai ctrl-D            Vieritä k riviä [nykyinen vieritysmäärä, alkuarvo 11]"
+"<väli>                  Näytä seuraavat k riviä tekstiä [nykyinen ruudun "
+"rivimäärä]\n"
+"z                       Näytä seuraavat k riviä tekstiä [nykyinen ruudun "
+"rivimäärä]*\n"
+"<return>                Näytä seuraavat k riviä tekstiä [1]*\n"
+"d tai ctrl-D            Vieritä k riviä [nykyinen vieritysmäärä, alkuarvo 11]"
 "*\n"
 "q tai Q or <keskeytys>  Poistu moresta\n"
-"s                       Ohita k riviä ja siirry eteenpäin [1]\n"
-"f                       Ohita k ruutua tekstiä ja siirry eteenpäin [1]\n"
-"b tai ctrl-B            Ohita k ruutua tekstiä ja siirry taaksepäin [1]\n"
+"s                       Ohita k riviä ja siirry eteenpäin [1]\n"
+"f                       Ohita k ruutua tekstiä ja siirry eteenpäin [1]\n"
+"b tai ctrl-B            Ohita k ruutua tekstiä ja siirry taaksepäin [1]\n"
 "'                       Palaa kohtaan, josta edellinen haku alkoi\n"
-"=                       Näytä nykyinen rivinumero\n"
-"/<säännöllinen lauseke> Etsi säännöllisen lausekkeen k:s esiintymä [1]\n"
-"n                       Etsi edellisen säännöllisen lausekkeen k:s esiintymä "
+"=                       Näytä nykyinen rivinumero\n"
+"/<säännöllinen lauseke> Etsi säännöllisen lausekkeen k:s esiintymä [1]\n"
+"n                       Etsi edellisen säännöllisen lausekkeen k:s esiintymä "
 "[1]\n"
-"!<kom> tai :!<kom>      Käynnistä <kom> alikuoressa\n"
-"v                       Käynnistä /usr/bin/vi nykyiselle riville\n"
-"ctrl-L                  Piirrä ruutu uudelleen\n"
+"!<kom> tai :!<kom>      Käynnistä <kom> alikuoressa\n"
+"v                       Käynnistä /usr/bin/vi nykyiselle riville\n"
+"ctrl-L                  Piirrä ruutu uudelleen\n"
 ":n                      Siirry k:nteen seuraavaan tiedostoon [1]\n"
 ":p                      Siirry k:nteen edelliseen tiedostoon [1]\n"
-":f                      Näytä nykyinen tiedostonimi ja rivinumero\n"
+":f                      Näytä nykyinen tiedostonimi ja rivinumero\n"
 ".                       Toista edellinen komento\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
-msgstr "[Näppäin \"h\" näyttää ohjeita.]"
+msgstr "[Näppäin \"h\" näyttää ohjeita.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" rivi %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ei tiedosto] rivi %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Ylivuoto\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...ohitetaan\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
-msgstr "Virhe säännöllisessä lausekkeessa"
+msgstr "Virhe säännöllisessä lausekkeessa"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 "\n"
-"Hahmoa ei löydy\n"
+"Hahmoa ei löydy\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
-msgstr "Hahmoa ei löydy"
+msgstr "Hahmoa ei löydy"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "haarauttaminen ei onnistu\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10192,26 +9840,26 @@ msgstr ""
 "\n"
 "...Ohitetaan"
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Vaihdetaan tiedostoon "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Palataan tiedostoon "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
-msgstr "Liian pitkä rivi"
+msgstr "Liian pitkä rivi"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
-msgstr "Ei edellistä komentoa korvattavaksi"
+msgstr "Ei edellistä komentoa korvattavaksi"
 
 #: text-utils/odsyntax.c:130
 #, c-format
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr "od: od(1) on vanhentunut, on suositeltavaa käyttää hexdump(1).\n"
+msgstr "od: od(1) on vanhentunut, on suositeltavaa käyttää hexdump(1).\n"
 
 #: text-utils/odsyntax.c:133
 #, c-format
@@ -10230,22 +9878,22 @@ msgstr "hexdump: tiedostoa %s ei voi lukea.\n"
 #: text-utils/parse.c:68
 #, c-format
 msgid "hexdump: line too long.\n"
-msgstr "hexdump: liian pitkä rivi.\n"
+msgstr "hexdump: liian pitkä rivi.\n"
 
 #: text-utils/parse.c:401
 #, c-format
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr "hexdump: tavumäärä useiden muunnosmerkkien kanssa.\n"
+msgstr "hexdump: tavumäärä useiden muunnosmerkkien kanssa.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr "hexdump: virheellinen tavumäärä muunnosmerkille %s.\n"
+msgstr "hexdump: virheellinen tavumäärä muunnosmerkille %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr "hexdump: %%s vaatii tarkkuuden tai tavumäärän.\n"
+msgstr "hexdump: %%s vaatii tarkkuuden tai tavumäärän.\n"
 
 #: text-utils/parse.c:496
 #, c-format
@@ -10257,92 +9905,89 @@ msgstr "hexdump: virheellinen muoto {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: virheellinen muunnosmerkki %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
-"%s: Käyttö: %s [-number] [-p merkkijono] [-cefnrs] [+rivi] [+/hahmo/] "
+"%s: Käyttö: %s [-number] [-p merkkijono] [-cefnrs] [+rivi] [+/hahmo/] "
 "[tiedostot]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: valitsin vaatii argumentin -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: virheellinen valitsin -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
-msgstr "...ohitetaan eteenpäin\n"
+msgstr "...ohitetaan eteenpäin\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
-msgstr "...ohitetaan taaksepäin\n"
+msgstr "...ohitetaan taaksepäin\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Ei seuraavaa tiedostoa"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
-msgstr "Ei edellistä tiedostoa"
+msgstr "Ei edellistä tiedostoa"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Lukuvirhe tiedostosta %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Odottamaton tiedoston loppu (EOF) tiedostossa %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Tuntematon virhe tiedostossa %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr "%s: Väliaikaistiedostoa ei voi luoda\n"
+msgstr "%s: Väliaikaistiedostoa ei voi luoda\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
-msgstr "Virhe säännöllisessä lausekkeessa: "
+msgstr "Virhe säännöllisessä lausekkeessa: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(tiedoston loppu)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Ei muistettua hakumerkkijonoa"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Ei voi avata "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "tallennettu"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !-komento ei ole sallittu rajoitetussa tilassa.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
-msgstr "fork() epäonnistui, yritä myöhemmin uudelleen\n"
+msgstr "fork() epäonnistui, yritä myöhemmin uudelleen\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Seuraava tiedosto: "
 
@@ -10354,22 +9999,22 @@ msgstr "Puskuritilaa ei voi varata\n"
 #: text-utils/rev.c:156
 #, c-format
 msgid "usage: rev [file ...]\n"
-msgstr "käyttö: rev [tiedosto ...]\n"
+msgstr "käyttö: rev [tiedosto ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "laitetta %s ei voi avata lukua varten\n"
+msgstr "Tiedostoa \"%s\" ei voi avata lukua varten\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "käyttö: %s [tiedosto]\n"
+msgstr "käyttö: tailf lokitiedosto\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "käyttö: %s [ -i ] [ -tTerm ] tiedosto...\n"
+msgstr "käyttö: %s [ -i ] [ -tTerm ] tiedosto...\n"
 
 #: text-utils/ul.c:152
 #, c-format
@@ -10379,7 +10024,7 @@ msgstr "ongelma luettaessa terminfoa"
 #: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr "Tuntematon ohjaussarja syötteessä: %o, %o\n"
+msgstr "Tuntematon ohjaussarja syötteessä: %o, %o\n"
 
 #: text-utils/ul.c:425
 #, c-format
@@ -10389,59 +10034,209 @@ msgstr "Puskuria ei voi varata.\n"
 #: text-utils/ul.c:586
 #, c-format
 msgid "Input line too long.\n"
-msgstr "Syöterivi on liian pitkä.\n"
+msgstr "Syöterivi on liian pitkä.\n"
 
 #: text-utils/ul.c:599
 #, c-format
 msgid "Out of memory when growing buffer.\n"
 msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Virheellinen luku: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaksivirhe: \"%s\"\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Parametria ei ole asetettu: \"%s\"\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] laite nimi\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] laite koko sekt päät raidat venytys väli aste erik1 "
+#~ "fmt_väli\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] laite\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] laite\n"
+
+#~ msgid "version"
+#~ msgstr "versio"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "laitetta /dev/urandom ei voitu avata"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "tiedostosta /dev/urandom ei voitu lukea satunnaisdataa"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "tiedostoa %s ei voi avata lukua varten"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "tiedoston %s tilaa ei voi lukea"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "tiedoston %s tila ei ole oikea"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "tiedostosta %s ei voi lukea dataa"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Liian monta käyttäjää on jo kirjautuneena.\n"
+#~ "Yritä myöhemmin uudelleen.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Liian monta prosessia käynnissä.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Salasanassa on oltava vähintään kuusi merkkiä, yritä uudelleen.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Salasanan merkkien on oltava seuraavista kahdesta ryhmästä:\n"
+#~ "isot ja pienet kirjaimet, numerot ja ei-alfanumeeriset\n"
+#~ "merkit. Lisätietoja manuaalisivulla passwd(1).\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Et voi uudelleenkäyttää vanhoja salasanoja.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Älä käytä mitään käyttäjätunnuksesi tapaista salasanana!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Älä käytä mitään oikean nimesi kaltaista salasanana!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Käyttö: passwd [käyttäjätunnus [salasana]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Vain pääkäyttäjä voi käyttää argumentteja.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Käyttö: passwd [-foqsvV] [käyttäjä [salasana]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Ohjelmaa %s ei voi käynnistää: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Käyttäjätunnusta ei löydy"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Vain pääkäyttäjä voi vaihtaa muiden salasanoja.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Liian monta argumenttia.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Käyttäjätunnusta ei löydy mistään. Onko \"%s\" todella käyttäjä?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Valitan, pystyn muuttamaan vain paikallisia salasanoja. Käytä komentoa "
+#~ "yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID ja käyttäjänimi eivät vastaa toisiaan, huijari!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Vaihdetaan käyttäjän %s salasana\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Syötä vanha salasana: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Virheellinen salasana, huijari."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Syötä uusi salasana: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Salasanaa ei vaihdettu."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Syötä uusi salasana uudelleen: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Kirjoitit väärin. Salasanaa ei vaihdettu."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "salasana vaihdettu, käyttäjä %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "PÄÄKÄYTTÄJÄN SALASANA VAIHDETTU"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "pääkäyttäjä vaihtoi käyttäjän %s salasanan"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "kutsutaan setpwnam salasanan asettamiseksi.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Salasanaa *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Salasana vaihdettu.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: tämä versio on käännetty ilman tukea tyypille \"nfs\""
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
-#~ msgstr "Varoitus: poistetaan osion %d jälkeiset osiot\n"
+#~ msgstr "Varoitus: poistetaan osion %d jälkeiset osiot\n"
 
 #~ msgid "mount: fs type %s not supported by kernel"
-#~ msgstr "mount: ydin ei tue tiedostojärjestelmätyyppiä %s"
+#~ msgstr "mount: ydin ei tue tiedostojärjestelmätyyppiä %s"
 
 #~ msgid "BLKGETSIZE ioctl failed for %s\n"
-#~ msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
+#~ msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
 
 #~ msgid "%s: not compiled with minix v2 support\n"
-#~ msgstr "%s: ei ole käännetty minix v2 -tuen kanssa\n"
+#~ msgstr "%s: ei ole käännetty minix v2 -tuen kanssa\n"
 
 #~ msgid "mount: %s duplicate - not mounted"
-#~ msgstr "mount: %s on kaksinkertainen - ei liitetä"
+#~ msgstr "mount: %s on kaksinkertainen - ei liitetä"
 
 #~ msgid "UUID"
 #~ msgstr "UUID:"
 
 #~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-#~ msgstr "mount: nimiö %s esiintyy sekä paikassa %s, että %s - ei liitetä\n"
+#~ msgstr "mount: nimiö %s esiintyy sekä paikassa %s, että %s - ei liitetä\n"
 
 #~ msgid "Boot (%02X)"
-#~ msgstr "Käynnistettävä (%02X)"
+#~ msgstr "Käynnistettävä (%02X)"
 
 #~ msgid "None (%02X)"
-#~ msgstr "Ei mitään (%02X)"
+#~ msgstr "Ei mitään (%02X)"
 
 #~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
-#~ msgstr "%s: [%04x]:%ld (%s) siirtymä %d, %s-salaus\n"
+#~ msgstr "%s: [%04x]:%ld (%s) siirtymä %d, %s-salaus\n"
 
 #~ msgid ""
 #~ "mount: Could not find any loop device.\n"
 #~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "mount: Yhtään loop-laitetta ei löytynyt.\n"
-#~ "       Ehkä tiedostoilla /dev/loop# on väärä major-arvo?"
+#~ "mount: Yhtään loop-laitetta ei löytynyt.\n"
+#~ "       Ehkä tiedostoilla /dev/loop# on väärä major-arvo?"
 
 #~ msgid ""
 #~ "mount: Could not find any loop device. Maybe this kernel does not know\n"
 #~ "       about the loop device (then recompile or `insmod loop.o'), or\n"
 #~ "       maybe /dev/loop# has the wrong major number?"
 #~ msgstr ""
-#~ "mount: Ei löytynyt yhtään loop-laitetta. Ehkä tämä ydin ei ole tietoinen\n"
-#~ "       loop-laitteesta (käännä uudelleen tai \"insmod loop.o\"), tai\n"
-#~ "       ehkä /dev/loop#:in major-arvo on väärä?"
+#~ "mount: Ei löytynyt yhtään loop-laitetta. Ehkä tämä ydin ei ole tietoinen\n"
+#~ "       loop-laitteesta (käännä uudelleen tai \"insmod loop.o\"), tai\n"
+#~ "       ehkä /dev/loop#:in major-arvo on väärä?"
 
 #~ msgid "Init (up to 16 hex digits): "
 #~ msgstr "Alkuarvo (korkeintaan 16 heksanumeroa): "
@@ -10450,7 +10245,7 @@ msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 #~ msgstr "Ei-heksanumero \"%c\".\n"
 
 #~ msgid "Don't know how to get key for encryption system %d\n"
-#~ msgstr "Avaimen haku salausjärjestelmälle %d ei ole tuettu\n"
+#~ msgstr "Avaimen haku salausjärjestelmälle %d ei ole tuettu\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Osion %i loppu ei ole sylinterin rajalla:\n"
@@ -10465,6 +10260,6 @@ msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Levy %1$s: %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
-#~ "Yksiköt = %6$d * %7$d -tavuiset %5$s\n"
+#~ "Levy %1$s: %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
+#~ "Yksiköt = %6$d * %7$d -tavuiset %5$s\n"
 #~ "\n"
diff --git a/po/fr.gmo b/po/fr.gmo
new file mode 100644
index 000000000..b24fdafa7
--- /dev/null
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index d9d6b9aed..6d6e90231 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2005-01-02 12:00-0500\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-28 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -117,7 +117,7 @@ msgstr "%s: erreur ioctl() sur %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   Début Sec    Taille  Périphérique\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "usage:\n"
@@ -161,13 +161,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "usage: %s [ -n ] périphérique\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s de %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -192,7 +191,7 @@ msgstr "Double"
 msgid "Single"
 msgstr "Simple"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -207,103 +206,103 @@ msgstr ""
 " -v         travailler en mode bavard\n"
 " file       fichier à tester\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: erreur %d lors de la décompression! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: erreur taille dans le lien symbolique « %s »\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  décompression du bloc à %ld vers %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: mode bogus sur « %s » (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  trou à %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: (%ld) octets de type non bloc\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: (%ld vs %ld) octets de type non taille\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: cramfs invalide -- longueur invalide du chemin\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: compilé sans support de -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 "%s: AVERTISSEMENT -- incapable de déterminer la taille du système de "
 "fichiers\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s n'est pas un périphérique de type bloc ou de fichiers\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: cramfs invalide -- longueur du fichier trop courte\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: cramfs invalide -- nombre magique erroné\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 "%s: AVERTISSEMENT - longueur du fichier trop longue, remplissage de "
 "l'image?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: cramfs invalide -- erreur CRC\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: AVERTISSEMENT -- vieille image cramfs, sans CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: cramfs invalide -- superbloc erroné\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: cramfs invalide -- fin des données du répertoire (%ld) != début des "
 "données du fichier (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: cramfs invalide -- décalage invalide des données du fichier\n"
@@ -785,7 +784,7 @@ msgstr "trop d'inodes - maximum est 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "pas suffisamment d'espace, a besoin au moinds de %lu blocs"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Périphérique: %s\n"
@@ -854,20 +853,20 @@ msgstr "erreur d'écriture de l'entrée « .. »"
 msgid "error closing %s"
 msgstr "erreur de fermeture %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Usage: mkfs [-V] [-t type-système-de-fichiers] [options] péridphérique "
 "[taille]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: mémoire épuisée!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
@@ -933,7 +932,6 @@ msgstr ""
 "Dépassement de MAXENTRIES. Augmenter la valeur dans mkcramfs.c et "
 "recompiler. Fin d'exécution.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -988,10 +986,6 @@ msgstr "pas assez d'espace alloué pour l'image ROM (%Ld alloué, %d utilisé)\n"
 msgid "ROM image write failed (%d %d)\n"
 msgstr "Échec de l'écriture de l'image dans le ROM (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1072,7 +1066,6 @@ msgstr "incapable d'écrire les inodes"
 msgid "write failed in write_block"
 msgstr "échec d'écriture dans write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1108,7 +1101,7 @@ msgstr "éched de repérage durant l'examen des blocs"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valeur étranges dans do_check: probablement un bug\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "échec de repérage dans check_blocks"
 
@@ -1151,109 +1144,111 @@ msgstr "incapable d'évaluer par stat() %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "n'essayera pas de créer un système de fichiers sur « %s »"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Taille de page erronée tel que spécifiée par l'usager %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Utilise la taille de page spécifiée par l'usager %d, au lieu de %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "On assume des pages de taille %d (pas %d)\n"
+msgstr "On assume des pages de taille %d (et non pas de %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
-msgstr ""
+msgstr "Taille erronée d'en-tête de swap, aucune étiquette n'a été écrite.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "L'étiquette a été tronquée.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "étiquette"
+msgstr "pas d'étiquette, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "pas de uuid\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr "Usage: %s [-c] [-v0|-v1] [-pTAILLE-PAGES] /dev/name [blocs]\n"
+msgstr ""
+"Usage: %s [-c] [-v0|-v1] [-pTAILLE-PAGES][-L étiquette] /dev/name [blocs]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "trop de pages corrompus"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Mémoire épuisée"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "une page corrompue\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu pages corrompues\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: erreur: aucun endroit pour définir un espace d'échange (swap)?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 "%s: erreur: taille %lu est plus grande que la taille du périphérique %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: erreur: version inconnue %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr ""
 "%s: erreur: zone d'échange (swap) a besoin d'une taille d'au moins %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: AVERTISSEMENT: truncation de la zone d'échange (swap) à %ldkB\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: erreur: aucun endroit pour définir un espace d'échange (swap)?\n"
+msgstr ""
+"%s: erreur: étiquette avec seulement un espace d'échanger (swap) de type v1\n"
 
 # disk-utils/mkswap.c:566
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Ne tentera pas de créer un périphérique de type swap sur « %s »"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "ERREUR FATALE: la première page est illisible"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1269,127 +1264,88 @@ msgstr ""
 "pour forcer sa création.\n"
 
 # disk-utils/mkswap.c:605
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Incapable de fixer l'espace de swap: illisible"
 
 # disk-utils/mkswap.c:606
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr ""
 "Initialisation de la version de l'espace de swap %d, taille = %llu kB\n"
 
 # disk-utils/mkswap.c:612
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "incapable de rembobiner le périphérique de swap"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "incapable d'écrire la page de signature"
 
 # disk-utils/mkswap.c:623
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "Échec de la synchronisation du système de fichiers par fsync"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Nombre invalide: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Erreur de syntaxe: « %s »\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Aucun paramètre de ce type initialisé: « %s »\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] périphérique nom\n"
-
-# disk-utils/setfdprm.c:101
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] périphérique taille sect têtes pistes stretch intervalle taux "
-"spec1 format_de_intervalle\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] périphérique\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] périphérique\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilisable"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Espace libre"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disque a été changé.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Réamorcer le système pour s'assurer que la table de partition a été "
 "correctement mise à jour.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1402,327 +1358,308 @@ msgstr ""
 "partition DOS 6.x, svp consulter les pages du manuel\n"
 "de cfdisk pour de plus amples informations.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERREUR FATALE"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Appuyer n'importe quelle clé pour quitter cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Ne peut effectuer de repérage sur l'unité de disque"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Ne peut lire à partir de l'unité de disque"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Ne peut lire de l'unité de disque"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Trop de partitions"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "La partition débute avant le secteur 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "La partition se termine avant le secteur 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "La partition débute après la fin du disque"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "La partition se termine après la fin du disque"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partition se termine dans le cylindre final"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "partitions logiques ne sont pas en ordre sur le disque"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "chevauchement des partitions logiques"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "chevauchement des partitions logiques qui ont été grossies"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Erreur interne créant un disque logique sans partition étendue !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Ne peut créer un disque logique ici -- cela créerait 2 partitions étendues"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Item de menu trop long. Le menu pourrait paraître erroné."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu sans direction. Mis en horizontal par défaut."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Clé illégale"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Appuyer sur une touche pour continuer"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaire"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Créer une nouvelle partition primaire"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logique"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Créer une nouvelle partition logique"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Annuler"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Ne pas créer une partition"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Erreur interne !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Taille (en MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Début"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Ajouter une partition au début de l'espace libre"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Ajouter une partition à la fin de l'espace libre"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Pas d'espace pour créer une partition étendue"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Aucune table de partitions.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Aucune table de partitions. On commence avec une table à zéro."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Signature erronée dans la table de partitions"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Type inconnu de table de partitions"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Voulez-vous débuter avec une table à zéro [y (pour oui)/N (pour non)]"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Vous avez spécifié plus de cylindres que le disque ne peut contenir"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Ne peut ouvrir l'unité de disque"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disque ouvert en mode lecture seulement - aucune permission d'écriture"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Ne peut obtenir la taille du disque"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partition primaire erronée"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partition logique erronnée"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "AVERTISSEMENT!!  Cela pourrait détruire les données sur votre disque!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Êtes-vous certain de vouloir écrire la table de partitions sur le disque? "
 "yes (pour oui) ou no (pour non)"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "non"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "N'a pas écrit la table de partitions sur le disque"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "oui"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "SVP répondre « yes » (pour oui) ou « no » (pour non)"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Écriture de la table de partitions sur le disque..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Table de partitions écrite sur le disque"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Table de partitions écrite, échec de la relecture. Réamorcer pour mettre à "
 "jour la table."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr "Aucune partition primaire marqué amorçable. DOS MBR ne peut amorcer."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Plus d'une partition primaire marqué amorçable. DOS MBR ne peut amorcer."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Entrer le nom du fichier ou appuyer « RETURN » pour affichage à l'écran:"
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ne peut ouvrir le fichier « %s »"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unité de disque: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Secteur 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Secteur %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Aucun   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primaire"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logique"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Amorce"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Aucun"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Table de partitions de %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Premier     Dernier\n"
 
 # fdisk/cfdisk.c:1969
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1730,7 +1667,7 @@ msgstr ""
 " # Type       Secteur     Secteur  Offset    Longueur Sys.FichierType (ID) "
 "Fanions\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1738,481 +1675,478 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         --- Début  ---      ---- Fin  ----    Début     Numéro de\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Fan.  Tête Sect Cyl   ID  Tête Sect Cyl     Secteur   Secteurs\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Brut"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Afficher le contenu de la table en format brut"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Secteurs"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Afficher le contenu de la table ordonné par secteurs"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Table"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Afficher juste le contenue de la table de partitions"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Ne pas afficher le contenu de la table"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Écran d'aide pour cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk, est un programme de partionnement basé sur curses. cfdisk"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "permet de créer, détruire et modifier les partitions de votre unité de"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "disque dur."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Commande     Signification"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          basculer le fanion d'amorce sur la partition courante"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          détruire la partition courante"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          modifier les paramètres: cylindres, têtes, secteurs par piste"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             AVERTISSEMENT: cette option ne doit pas être utilisé par"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             des gens qui ne savent pas ce qu'ils font."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          afficher cet écran d'aide"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          maximiser l'usage du disque de la partition courante"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Note: cela peut rendre la partition incompatible avec"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          créer une nouvelle partition à partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          afficher le contenu de la table de partitions à l'écran ou dans "
 "un fichier"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Il y a plusieurs formats différents pour la partition"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             que vous désirez:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - données brutes (exactement ce que vous écrivez sur le "
 "disque)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - table ordonnée par secteurs"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - table en format brut"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          quitter le programme sans écrire la table de partitions"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          modifier le type de système de fichiers"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
 "  u          modifier les unités d'affichage de la taille des partition"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             faire la rotation avec MB, secteurs et cylindres"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          écrire la table de partitions sur le disque (taper W en "
 "majuscule)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 "             Étant donné que cela peut détruire des données sur le disque, "
 "vous devez"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             confirmer ou annuler la commande par la réponse « yes » (pour "
 "oui) ou"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             « no » (pour non)"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Flèche-haut  déplacer le curseur vers la partition précédente"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Flèche-bas   déplacer le curseur vers la partition suivante"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       réafficher le contenu à l'écran"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          afficher cet écran d'aide"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Note: toutes les commandes peuvent être soumises en lettres"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "majuscules ou minuscules (sauf pour les écritures)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylindres"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Modifier la géométrie des cylindres"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Têtes"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Modifier la géométrie de tête"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Modifier la géométrie de secteur"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Complété"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Modification de la géométrie complété"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Entrer le nombre de cylindres: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Valeur illégale pour les cylindres"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Entrer le nombre de têtes: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Valeur illégale pour les têtes"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Entrer le nombre de secteurs par piste: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Valeur illégale pour les secteurs"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Entrer le type de système de fichiers:"
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Ne peut modifier le type de SF pour aucun type"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Ne peut modifier le type de SF à étendu"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Inconnu (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unité de disque: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Taille: %lld octets,  %lld Mo"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Taille: %lld octets,  %lld.%lld Go"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Têtes: %d   Secteurs par piste: %d  Cylindres: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Fanions"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part Type"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Type SF"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Étiq.]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Secteurs"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cylindres"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Taille (Mo)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Taille (Go)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Amorçable"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Basculer le fanion d'amorce pour la partition courante"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Détruire"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Détruire la partition courante"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Géométrie"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Modifier la géométrie du disque (pour expert seulement)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Aide"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Afficher l'écran d'aide"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximiser l'usage du disque de la partition courante (experts seulement)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nouveau"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Créer une nouvelle partition à partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Afficher"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr ""
 "Afficher le contenu de la table de partitions à l'écran (ou dans un fichier)"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Quitter"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Quitter le programme sans écrire la table de partitions"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Modifier le type de système de fichier (DOS, Linux, OS/2, etc)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Unités"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Mofifier les unités d'affichage des taille des partitions (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Écrire"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "ÉCrire la table de partitions sur le dsique (cela peut détruire les données)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Ne peut créer cette partition comme étant amorçable"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Ne peut détruire une partition vide"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Ne peut maaximiser cette partition"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Cette partition est inutilisable"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Cette partition est déjà en usage"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Ne peut changer le type d'une partition vide"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Pas de partition disponible"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Commande illégale"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2287,9 +2221,9 @@ msgstr ""
 "\n"
 "Étiquette BSD sur le périphérique: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Commande action"
 
@@ -2309,10 +2243,9 @@ msgstr "   i   installer une amorce"
 msgid "   l   list known filesystem types"
 msgstr "   l   lister les types de système de fichiers connus"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   afficher ce menu"
 
@@ -2324,14 +2257,14 @@ msgstr "   n   ajouter une nouvelle partition BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   afficher la table de partitions BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   quitter sans faire de sauvegarde"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   retourner au menu principal"
 
@@ -2374,13 +2307,13 @@ msgstr "Il n'y a pas de partition *BSD sur %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Commande d'étiquetage BSD (m pour de l'aide): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Premier %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Dernier %s ou +taille or +tailleM ou +tailleK"
@@ -2425,8 +2358,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " mauvais secteur"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2527,8 +2458,8 @@ msgstr "secteurs/piste"
 msgid "tracks/cylinder"
 msgstr "pistes/cylindre"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cylindres"
 
@@ -2585,7 +2516,7 @@ msgstr "Amorce installée sur %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Le nombre maximum de partitions a été créé\n"
@@ -2609,7 +2540,7 @@ msgstr ""
 "\n"
 "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2630,7 +2561,7 @@ msgstr ""
 "-u: donne le Début et la Fin en unités de secteurs (au lieu de cylindres)\n"
 "-b 2048: (pour certains disques MO) utilise 2048-octets par secteur\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2647,198 +2578,184 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Incapable d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Incapable de lire %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Incapable de repérage sur %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Incapable d'écrire %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "échec de BLKGETSIZE ioctl sur %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Incapable d'allouer de la mémoire additionnelle\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "ERREUR FATALE\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   basculer le fanion de lecture seulement"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   éditer l'étiquette BSD du disque"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   basculer le fanion mount"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   détruire la partition"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   lister les types de partitions connues"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   ajouter une nouvelle partition"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   créer une nouvelle table vide de partitions DOS"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   afficher la table de partitions"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   créer une nouvelle étiquette vide pour disque de type Sun"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   modifier l'identificateur de la partition système"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   modifier l'affichage et la saisie des unités"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   vérifier la table de partitions"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   écrire la table sur le disque et quitter"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fonctionnalité additionnelle (pour experts seulement)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   sélectionner une partition amorçable"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   éditier l'entrée du fichier d'amorce"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   sélectionner une partition swap ppour SGI"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   bascule le fanion d'amorce"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   basculer le fanion de compatibilité DOS"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifier le nombre de cylindres alternatifs"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   modifier le nombre de cylindres"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   afficher les données brutes de la table de partition"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifier le nombre de secteurs additionnels par cylindre"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   modifier le nombre de têtes"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   changer le facteur d'inter-feuillage"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   modifier la vitesse de rotation en tour par minute (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifier le nombre de secteurs par piste"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifier le nombre de cylindres physiques"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   déplacer le début des données dans une partition"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   lister les partitions étendues"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   créer une table de partitions de type IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   fixer l'ordonnancement des partitions"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Vous devez initialiser"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "têtes"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "secteurs"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2847,11 +2764,11 @@ msgstr ""
 "%s%s.\n"
 "Vous pouvez faire cela à partir du menu des fonctions additionnelles.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " et "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2872,12 +2789,12 @@ msgstr ""
 "2) logiciels d'amorçage et de partitionnement pour d'autres SE\n"
 "   (i.e., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Décalage erronée dans la partition primaire étendue\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2886,18 +2803,18 @@ msgstr ""
 "AVERTISSEMENT: omission des partitions après #%d.\n"
 "Elles seront détruites si vous sauvegardez cette table de partition.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "AVERTISSEMENT: pointeur additionnel dans la table de partitions %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "AVERTISSEMENT: données surperflues ignorées dans la table de partition %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2912,17 +2829,17 @@ msgstr ""
 "ne sera par récupérable.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Note: taille de secteur est %d (et non pas %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Vous ne serez pas capable d'écrire la table de partitions.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2931,7 +2848,7 @@ msgstr ""
 "Ce disque a des nombres magiques à la fois DOS et BSD.\n"
 "Exécuter la commande 'b' pour passer en mode BSD.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2940,17 +2857,17 @@ msgstr ""
 "Le périphérique ne contient ni une partition ni une étiquette DOS, Sun, SGI "
 "ou OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Erreur interne\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Partition additionnelle étendue ignorée %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2959,7 +2876,7 @@ msgstr ""
 "AVERTISSEMENT: fanion 0x%04x invalide de la table de partitions %d sera "
 "corrigé par w(écriture)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2968,83 +2885,83 @@ msgstr ""
 "\n"
 "a obtenu EOF 3 fois - fin du programme...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Code Hex (taper L pour lister les codes): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, par défaut %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Utilisation de la valeur par défaut %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valeur hors limites.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Numéro de partition"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "AVERTISSEMENT: partition %d a un type vide\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition sélectionnée %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Aucune partition n'est définie encore!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Toutes les partitions primaires ont déjà été définies!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylindre"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "secteur"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Modification des unités d'affichage/saisie à %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "AVERTISSEMENT: Partition %d est une partition étendue\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Fanion de compatibilité DOS est initialisé\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Fanion de compatibilité DOS n'est initialisé\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d n'existe pas encore!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3057,7 +2974,7 @@ msgstr ""
 "type 0 n'est pas recommandé. Vous pouvez détruire\n"
 "la partition en utilisant la commande « d ».\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3066,7 +2983,7 @@ msgstr ""
 "Vous ne pouvez la modifier en partition étendue et vice versa.\n"
 "Vous devez la détruire d'abord.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3077,7 +2994,7 @@ msgstr ""
 "tel que SunOS/Solaris l'exige et tel que qu'il est préférable  pour Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3088,52 +3005,52 @@ msgstr ""
 "et la partition 11 comme un volume entier (6) tel que IRIX l'exige.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Type de partition système modifié de %d à %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d a des débuts différents physique/logique (non Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logique=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d a des fins différentes physique/logique:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i ne débute pas sur une frontière de cylindre:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "devrait être (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partition %i ne se termine pas sur une frontière de cylindre.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "devrait être (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3142,7 +3059,7 @@ msgstr ""
 "\n"
 "Disque %s: %ld Mo, %lld octets\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3151,17 +3068,17 @@ msgstr ""
 "\n"
 "Disque %s: %ld.%ld Go, %lld octets\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d têtes, %d secteurs/piste, %d cylindres"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", total %llu secteurs"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3170,7 +3087,7 @@ msgstr ""
 "Unités = %s de %d * %d = %d octets\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3179,7 +3096,7 @@ msgstr ""
 "Rien à faire. L'ordonnancement est déjà correct.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3190,16 +3107,16 @@ msgstr ""
 "Probablement vous avez sélectionné le mauvais périphérique.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Amorce    Début         Fin      Blocs    Id  Système\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Périphérique"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3208,7 +3125,7 @@ msgstr ""
 "\n"
 "Les entrées de la table de partitions ne sont pas dans l'ordre du disque\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3219,84 +3136,84 @@ msgstr ""
 "Disq %s: %d têtes, %d secteurs, %d cylindres\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Début      Tail.ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "AVERTISSEMENT: partition %d contient un secteur 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: tête %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: secteur %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitions %d: cylindre %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d: secteurs précédents %d ne concorde pas avec le total %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "AVERTISSEMENT: start-of-data erroné dans la partition %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "AVERTISSEMENT: la partition %d chevauche la partition %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "AVERTISSEMENT: la partition %d est vide\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partition logique %d n'est pas entièrement dans la partition %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 "Nombre total de secteurs alloués %d est plus grand que le maximum %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld secteurs non-alloués\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partition %d est déjà défini.  La détruire avant de la rajouter.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Secteur %d est déjà alloué\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Aucun secteur disponible\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3310,24 +3227,24 @@ msgstr ""
 "\tune nouvelle table de partition DOS vide. (Utiliser o.)\n"
 "\tAVERTISSEMENT: cela va détruire le contenu du disque présent.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Vous devez détruire quelques partitions et ajouter une partition étendue "
 "d'abord\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Toutes les partitions logiques sont utilisées\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Ajout d'une partition primaire\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3338,20 +3255,20 @@ msgstr ""
 "   %s\n"
 "   p   partition primaire (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logique (5 ou plus)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   étendue"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Numéro invalide de partition pour le type « %c »\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3360,12 +3277,12 @@ msgstr ""
 "La table de partitions a été altérée!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Appel de ioctl() pour relire la table de partitions.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3379,7 +3296,7 @@ msgstr ""
 "Le kernel va continuer d'utiliser l'ancienne table.\n"
 "La nouvelle table sera utilisé lors du prochain réamorçage.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3392,7 +3309,7 @@ msgstr ""
 "svp consulter les pages du manuel de fdisk pour des informations\n"
 "additionnelles.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -3401,68 +3318,68 @@ msgstr ""
 "\n"
 "Erreur de fermeture du fichier\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d n'a pas de zone de données\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nouveau début des données"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Commande pour experts (m pour de l'aide): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Numbre de cylindres"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Numbre de têtes"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Numbre de secteurs"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "AVERTISSEMENT: initialisation du décalage de secteur pour compatibilité DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disque %s ne contient pas une table de partition valide\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ne peut ouvrir %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ne peut ouvrir %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: commande inconnue\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Ce kernel repère lui-même la taille des secteurs - -b option ignorée\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3471,19 +3388,18 @@ msgstr ""
 "AVERTISSEMENT: l'option -b (initialisé la taille de secteur) doit être "
 "utilisé avec le périphérique spécifié\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Détection d'une étiquette de disque pour OSF/1 sur %s, passage en mode "
 "d'édition d'étiquette.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Commande (m pour l'aide): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3492,16 +3408,16 @@ msgstr ""
 "\n"
 "Le fichier courant d'amorçage est: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "SVP entrer le nom du nouveau fichier d'amorçage: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Fichier d'amorçage n'a pas été modifié\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3569,15 +3485,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3657,7 +3573,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s secteur%5u taille%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3715,7 +3630,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Plus d'une entrée entière de disque présente.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Aucune partition définie\n"
@@ -3802,7 +3717,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVous avez choisi un nom de fichier d'amorce inhabituel.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3824,11 +3738,10 @@ msgstr ""
 "Taper YES (pour oui) si vous êtes certain de l'étiquetage différent de cette "
 "partition.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "YES (pour oui)\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3909,45 +3822,44 @@ msgstr "Tentative de conservation des paramètres de la partition %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tDÉBUT=%d\tLONGUEUR=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Vide"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disque entier"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
 # fdisk/fdisksunlabel.c:132
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3960,12 +3872,12 @@ msgstr ""
 "e.g. heads, sectors, cylinders and partitions\n"
 "or force a fresh label (s command in main menu)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "L'autoconfiguration a repéré %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3979,7 +3891,7 @@ msgstr ""
 "sera irrécupérable.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3990,74 +3902,74 @@ msgstr ""
 "   0   configuration manuelle (à l'aide de la détection\n"
 "        matérielle des paramètres par défaut)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr ""
 "Sélectionner le type (? pour autoconfiguration, 0 pour configuration "
 "manuelle)"
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Échec d'autoconfiguration.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Secteurs/piste"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cylindres alternatifs"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cylindres physiques"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Vitesse de rotation (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Facteur d'inter-feuillage"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Secteurs additionnels par cylindre"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Vous pouvez modifier toues les paramètres du disque à partir du menu x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" disquette"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Configuration Linux"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partition %d ne se termine pas sur une frontière de cylindre\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partition %d en chevauche d'autres dans les secteurs %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Espace inutilisé - secteurs 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espace inutilisé - secteurs %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4066,7 +3978,7 @@ msgstr ""
 "D'autres partitions couvrent déjà le disque entier.\n"
 "En détruire/réduire quelques unes avant de ré-essayer.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4077,7 +3989,7 @@ msgstr ""
 "mais la valeur %d %s en couvre d'autres. Votre entrée a été modifiée\n"
 "à %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4087,7 +3999,7 @@ msgstr ""
 "laisser cette\n"
 "partition comme disque entier (5), débutant à 0, avec les secteurs %u\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4103,7 +4015,7 @@ msgstr ""
 "soit étiquetée 82 (Linux swap): "
 
 # fdisk/fdisksunlabel.c:656
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4122,7 +4034,7 @@ msgstr ""
 "Unités = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4135,16 +4047,16 @@ msgstr ""
 "Unités = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Fanions Début       Fin    Blocs    Id  Système\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cylindres alternatifs"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Nombre de cylindres physiques"
 
@@ -4168,32 +4080,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Extended"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX bootable"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4202,7 +4108,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4295,12 +4200,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4321,8 +4224,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4332,7 +4233,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD or SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4353,12 +4253,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
@@ -4387,12 +4285,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4401,7 +4297,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4466,30 +4361,22 @@ msgstr "Non-FS data"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4498,119 +4385,112 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secondary"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "erreur de repérage sur %s - ne peut repérer %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erreur de repérage: désiré 0x%08x%08x, obtenu 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "mémoire épuisée - abandon\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "erreur de lecture sur %s - ne peut lire le secteur %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERREUR: secteur %lu n'a pas un signature MS-DOS\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Erreur d'écriture sur %s - ne peut écrire le secteur %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "Ne peut ouvrir le fichier de sauvegarde de secteur de partition (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "erreur d'écriture sur %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 "ne peut évaluer par stat() le fichier de recouvrement de partition (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "le fichier de recouvrement de partition a une taille erronée - pas de "
 "recouvrement\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "mémoire épuisée?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "ne peut ouvrir le fichier de recouvrement de partition (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "erreur de lecture %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "ne peut ouvrir le périphérique %s pour écriture\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "erreur d'écriture du secteur %lu sur %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disque %s: ne peut obtenir la géométrie\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disque %s: ne peut obtenir sa taille\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4621,23 +4501,23 @@ msgstr ""
 "un disque entier. Utiliser fdisk n'aurait probablement pas de sens.\n"
 "[Utiliser l'option --force si vous désirez faire cela]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "AVERTISSEMENT: HDIO_GETGEO indique qu'il a %lu têtes\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "AVERTISSEMENT: HDIO_GETGEO indique qu'il y a %lu secteurs\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 "AVERTISSEMENT: BLKGETSIZE/HDIO_GETGEO indique qu'il y a %lu cylindres\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4647,7 +4527,7 @@ msgstr ""
 "Cela occasionnera des problèmes avec tous les logiciels qui utilisent un "
 "adressage C/H/S.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4656,7 +4536,7 @@ msgstr ""
 "\n"
 "Disque %s: %lu cylindres, %lu têtes, %lu secteurs/piste\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4664,7 +4544,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour la tête: %lu (devrait "
 "être 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4673,7 +4553,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour le secteur: %lu (devrait "
 "être 1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4682,7 +4562,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour les cylindres: %lu "
 "(devrait être 0-%lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4691,12 +4571,12 @@ msgstr ""
 "Id  Nom\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Relecture de la table de partitions ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4704,31 +4584,31 @@ msgstr ""
 "La commande de relecture de la table de partitions a échouée.\n"
 "Ré-amorcer le système maintenant, avant d'utiliser mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erreur de fermeture %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: pas de telle partition\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "format non reconnu - utilisation de secteurs\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# table de partitions de %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "format non implanté - using %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4738,12 +4618,12 @@ msgstr ""
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Périph Amor Début     Fin   #cyls    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4752,12 +4632,12 @@ msgstr ""
 "Unités= secteurs de 512 octets, décompte à partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Périph Amorce  Début       Fin   #secteurs Id  Système\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4766,12 +4646,12 @@ msgstr ""
 "Unités= blocs de 1024 octets, décompte à partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Périph Amorce Début       Fin    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4781,32 +4661,32 @@ msgstr ""
 "partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Périph Amor Début   Fin     Mo    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tdébut: (c,h,s) expecté (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tfin: (c,h,s) expecté (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "partition se termine sur le cylindre %ld, au delà de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Aucune partition repérée\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4817,54 +4697,54 @@ msgstr ""
 "  pour C/H/S=*/%ld/%ld (au lieu de %ld/%ld/%ld).\n"
 "Pour ce rapport, la géométrie suivante sera assumée.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "aucune table de partitions présente.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "étrange, seulement %d partitions définies.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "AVERTISSEMENT: partition %s a une taille 0 mais n'est pas marquée Empty\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "AVERTISSEMENT: partition %s a une taille 0 et est amorçable\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "AVERTISSEMENT: partition %s a une taille 0 et une adresse de début non à "
 "zéro\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "AVERTISSEMENT: partition %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "n'est par contenue dans la partition %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "AVERTISSEMENT: partitions %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "et %s se chevauchent\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4874,17 +4754,17 @@ msgstr ""
 "(secteur %lu),\n"
 "et cela la détruira lorsqu'elle se remplira\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "AVERTISSEMENT: la partition %s débute au secteur 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "AVERTISSEMENT: la partition %s s'étend au delà de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4892,20 +4772,20 @@ msgstr ""
 "Parmi les partitions primaires, au plus une seule peut être étendue\n"
 " (quoique cela ne soit pas un problème sous Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 "AVERTISSEMENT: la partition %s ne débute pas sur une frontière de cylindre\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 "AVERTISSMENT: la partition %s ne se termine pas sur une frontière de "
 "cylindre\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4914,7 +4794,7 @@ msgstr ""
 "Cela n'a pas d'importance pour LILO, mais en a pour DOS MBR qui n'amorcera "
 "ce disque.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4922,7 +4802,7 @@ msgstr ""
 "AVERTISSEMENT: habituellement une seule permet l'amorçage à partir d'une\n"
 "partition primaire LILO ne s'occupe pas du fanion d'amorçage.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4931,33 +4811,33 @@ msgstr ""
 "Cela n'a pas d'importance pour LILO, mais en a pour DOS MBR qui n'amorcera "
 "pas ce disque.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "début"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: début: (c,h,s) espéré (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "fin"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "partition %s: fin: (c,h,s) espéré (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "partition %s se termine sur le cylindre %ld, au delà de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4966,7 +4846,7 @@ msgstr ""
 "AVERTISSEMENT: début décalé de la partition étendue de %ld à %ld\n"
 "(pour fins d'affichage seulement. Ne modifier pas le contenu.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4974,134 +4854,133 @@ msgstr ""
 "AVERTISSEMENT: la partition étendue ne débute pas sur une frontière de.\n"
 "cylindres DOS et Linux interpréteront les contenus différemment.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "top de partitions - celles au delà de nr (%d) sont ignorées\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "arbre de partitions?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gestionnaire de disque détecté - incapable de traiter cela\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "signature DM6 signature repéré - abandon\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "étrange..., une partition étendue de taille 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "étrange..., une partition BSD de taille 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: type non reconnu de table de partition\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n flag a été utilisé: rien n'a changé\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Échec de sauvegarde des vieux secteurs - abandon\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Échec de l'écriture de la partition sur %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "ligne d'entrée longue ou incomplète - abandon\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erreur d'entrée: « = » espéré après le champ %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "erreur d'entrée: caractère inattendu %c après le champ %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrée non reconnu: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "numbre trop grand\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "rebut après le nombre\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "aucun espace pour le descripteur de partition\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "ne peut construire autour de la partition étendue\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "trop de champs à l'entrée\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Aucun espace pour en accepter d'avantage\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Type illégal\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "AVERTISSEMENT: la taille donnée (%lu) excède la taille maximale allouable (%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "AVERTISSEMENT: partition vide\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "AVERTISSEMENT: début de partition corrompu (auparavant %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "fanion d'amorçage non reconnu - choisir « - » ou « * »\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "spécification partielle c,h,s?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Partition étendue par à l'endroit attendu\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "entrée erronée\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "trop de partitions\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5113,47 +4992,43 @@ msgstr ""
 "Habituellement vous n'avez besoin que de spécifier:\n"
 "<début> et <taille> (et parfois <type>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "version"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Usage: %s [options] périphérique ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "périphérique: quelque chose comme /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "options utiles:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ou --show-size]: lister la taille d'une partition"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [ou --id]:        afficher ou modifier l'identificateur de partition"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lister les partitions de chaque périphérique"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [ou --dump]:      identique, mais dans un format utile pour une "
 "saisie ultérieure"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [ou --increment]: numbre de cylindres etc. de 1 au lieu de 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5161,68 +5036,67 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  accepter/reporter en unités de secteurs/blocs/"
 "cylindres/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ou --list-types]:lister les types de partitions connus"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [ou --DOS]:       pour la compatibilité DOS: perte d'un peu d'espace"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [ou --re-read]:   forcer le kernel à relire la table de partitions"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                modifier seulement la partition ayant le numéro #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ne pas écrire sur le disque"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fichier :         sauvegarder les secteurs qui seront écrasés dans le "
 "fichier"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichier :         restaurer ces secteurs à nouveau"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   afficher la version"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      afficher l'aide mémoire"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "options dangereuses:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [ou --show-geometry]: afficher les données contenues dans le\n"
 "                             kernel de la géométrie"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
-"    -g [ou --show-geometry]: afficher les données contenues dans le\n"
-"                             kernel de la géométrie"
+"    -G [ou --show-pt-geometry]: afficher la géométrie estimée à partir de la "
+"table de partitions"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5231,121 +5105,121 @@ msgstr ""
 "                             ou les descripteurs attendus à l'entrée pour "
 "ellest"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [ou --Linux]:      ne pas afficher de message qui ne concerne pas "
 "Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      supprimer tous les messages d'avertissement"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Vous pouvez écraser la géométrie en utilisant:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [ou --cylinders #]:initialiser le nombre de cylindres à utiliser"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ou --heads #]:    initialiser le nombre de têtes à utiliser"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S# [ou --sectors #]:  initialiser le numbre de secteurs à utiliser"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Vous pouvez désactiver toutes les vérifications de consistence avec:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [ou --force]:      exécuter aveuglément la commande donnée"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Usage:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s périphérique\t\t lister les partitions actives du périphérique\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s périphérique n1 n2 ... activer les partitions n1 ..., désactiver les "
 "autres\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An préiphérique\t activer la partition n, désactiver les autres\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "pas de commande?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu blocs\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "usage: sfdisk --print-id périphérique numéro-de-partition\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "usage: sfdisk --change-id périphérique numéro-de-partition Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "usage: sfdisk --id périphérique numéro-de-partition [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 "vous ne pouvez spécifier seulement un périphérique (sauf avec -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ne peut ouvrir %s en lecture-écriture\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ne peut ouvrir %s en lecture\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindres, %ld têtes, %ld secteurs/piste\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Ne peut obtenir la taille de %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "octet actif erroné: 0x%x au lieu de 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5353,7 +5227,7 @@ msgstr ""
 "Complété\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5363,35 +5237,35 @@ msgstr ""
 "mais en a un pour DOS MBR qui ne pourra amorcer un disque qu'avec une seule "
 "partition active.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s a un identificateur %x qui n'est pas caché\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identifcateur erroné %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Le disque est présentement en usage.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erreur fatale: ne peut trouver %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "AVERTISSEMENT: %s n'est pas un périphérique fonctionnant par blocs\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Vérification qu'aucun autre n'utilise le disque en ce moment ...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5405,30 +5279,30 @@ msgstr ""
 "partitions swap sur ce disque.\n"
 "Utiliser le fanion --no-reread pour supprimer cette vérification.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utiliser l'option --force pour annuler toutes les vérifications.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vieille situation:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partition %d n'existe pas, ne peut la modifer\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nouvelle situation:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5436,23 +5310,23 @@ msgstr ""
 "Ces partitions sont questionnables -- rien n'a changé.\n"
 "(Si vous désirez cela, utiliser l'option --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 "Cette situation n'est pas recommandable -- vous devriez probablement "
 "répondre Non\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Êtes-vous satisfait avec cela? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Voulez-vous écrire cela sur le disque? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5461,16 +5335,16 @@ msgstr ""
 "\n"
 "sfdisk: fin prématurée de l'entrée\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Abandon - rien n'a changé\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "SVP fournir une réponse suivante: y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5479,7 +5353,7 @@ msgstr ""
 "Succès d'écriture de la nouvelle table de partitions\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5590,139 +5464,139 @@ msgstr "getopt (amélioré) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "erreur interne, contacter l'auteur."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "amorcé à partir de MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Horloge Ruffian BCD\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "le port d'horloge a été ajusté à 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "drôle de TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomic %s a échoué pour 1000 itérations!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Ne peut ouvrir le port /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr ""
 "Échec d'obtention des permissions parce qu'aucun essai n'a été tenté.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s incapable d'obtenir un port d'accès d'E/S :  l'appel à iopl(3) a échoué.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Probablement que vous avez besoin des privilèges de root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr ""
 "On assume que l'horloge matérielle est conservée dans le temps de %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "locale"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr ""
 "%s: AVERTISSEMENT: 3e ligne non reconnue dans le fichier d'ajustement de "
 "l'heure\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Attendu: « UTC » ou « LOCAL » ou nothing.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Le dernier ajustement de dérive a été fait %ld secondes après 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "La dernière calibration a été faite %ld secondes après 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "L'horloge matérielle fonctionne selon le temps %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "inconnu"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "En attente d'un tic d'horloge...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...a obtenu un tic d'horloge\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "valeurs invalides dans l'horloge matérielle: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Heure de l'horloge matérielle : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld secondes "
 "depuis 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Heure lu de l'horloge matérielle: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Initialiser l'horloge matérielle à %.2d:%.2d:%.2d = %ld secondes depuis "
 "1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Horloge n'est pas modifiée - test seulement.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5731,7 +5605,7 @@ msgstr ""
 "Le temps écoulé depuis le temps de référence a été de %.6f secondes.\n"
 "Delai en cours pour atteindre la prochaine seconde complète.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5741,22 +5615,22 @@ msgstr ""
 "soit invalides (i.e. 50e jour du mois) ou en dehors de la plage\n"
 "pouvant être traitée (i.e. année 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f secondes\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Aucune option --date spécifié.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date argument trop long\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5765,22 +5639,22 @@ msgstr ""
 "La valeur de l'option --date n'est pas une date valide.\n"
 "En particulier, elle contient des guillemets.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Émission de la commande de date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Échec de popen(), incapable d'exécuter « date » à partir de /bin/sh shell"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "réponse de la commande date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5795,7 +5669,7 @@ msgstr ""
 "Le résultat est:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5812,12 +5686,12 @@ msgstr ""
 "Le résultat est:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "la chaîne de date %s équivaut à %ld secondes depuis 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5826,38 +5700,38 @@ msgstr ""
 "L'horloge matérielle ne contient de temps valide, aussi on ne peut pas "
 "initialisé l'heure du système à partir d'elle.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Appel de settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "Ne peut initialiser l'horloge système parce que le programme tourne en mode "
 "test.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Vous devez être le super-usager pour initialiser l'horloge système.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "Échec de settimeofday()"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5866,7 +5740,7 @@ msgstr ""
 "Pas d'ajustement du facteur de dérive parce l'horloge matérielle contient "
 "déjà des donnéez corrompues.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5876,7 +5750,7 @@ msgstr ""
 "calibration indique zéro.\n"
 "L'hitorique étant erroné une recalibration est nécessaire.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5885,7 +5759,7 @@ msgstr ""
 "Pas d'ajustement du facteur de dérive parce qu'elle est moins qu'un jour "
 "depuis la dernière calibration.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5896,25 +5770,25 @@ msgstr ""
 "dépit d'un facteur de dérive de %f secondes/jour.\n"
 "Ajustement du facteur de dérive de %f secondes/jour\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "L'heure depuis le dernier ajustement est de %d secondes\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Besoin d'insérer %d secondes et de faire une référence arrière dans le temps "
 "de %.6f secondes\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr ""
 "Pas de mise à jour du fichier de temps d'ajustement en raison du mode test.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5923,41 +5797,41 @@ msgstr ""
 "Devrait avoir écrit ce qui suit dans %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Ajustement des paramètres de dérive n'ont pas été mis à jour.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "L'horloge matérielle ne contient pas une heure valide, on ne peut l'ajuster\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "L'ajustement requis est inférieur à une seconde, pas d'initialisation de "
 "l'horloge.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Utilisant %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Aucune interface d'horloge utilisable n'a été repérée.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Incapable d'initialiser l'horloge système.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5972,17 +5846,17 @@ msgstr ""
 "(et présumément ne tournant pas sur un Alpha maintenant).  Aucune action n'a "
 "été exécutée.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Incapable d'obtenir la valeur d'époque à partir du kernel.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Le kernel assume une valeur d'époque de %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5991,20 +5865,25 @@ msgstr ""
 "Pour initialiser la valeur d'époque, vous devez utiliser l'option « epoch » "
 "pour y mettre la valeur voulue.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 "La valeur d'époque %d n'est pas utilisée pour initialisation - test "
 "seulement.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Incapable d'initialiser la valeur d'époque dans le kernel.\n"
 
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s de %s\n"
+
 # hwclock/hwclock.c:1108
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6068,7 +5947,7 @@ msgstr ""
 "  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
 "                either --utc or --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -6078,14 +5957,14 @@ msgstr ""
 "                indiquer hwclock le type de alpha en usage (voir hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s ne peut pas prendre des arguments d'options qui n'en sont pas. Vous avez "
 "fourni %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6094,7 +5973,7 @@ msgstr ""
 "Vous avez spécifé de multiples options de fonctions.\n"
 "Vous ne pouvez qu'en exécuter une à la fois.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6103,7 +5982,7 @@ msgstr ""
 "%s: les options --utc et --localtime sont mutuellement exclusives. Vous avez "
 "soumis les deux.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6112,28 +5991,28 @@ msgstr ""
 "%s: les options --adjust et --noadjfile sont mutuellement exclusives. Vous "
 "avez soumis les deux.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: avec --noadjfile, vous devez spécifier soit --utc ou --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "Pas utilisable pour initialiser l'heure.  Ne peut initialiser l'horloge.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Désolé, seul le super usager peut modifier l'horloge matérielle.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Désolé, seul le super usager peut modifier l'horloge système.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6142,13 +6021,13 @@ msgstr ""
 "Désole, seul le super usager peut modifier l'époque de l'horloge matérielle "
 "dans le kernel.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "Ne peut accéder l'horloge matérielle par le biais d'une méthode connue.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6185,7 +6064,6 @@ msgstr "Échec de ioctl() lors de la lecture de l'heure depuis %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "Échec de ioctl KDSHWCLK"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Ne peut ouvrir /dev/tty1 ou /dev/vc/1"
@@ -6286,9 +6164,6 @@ msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 "l'époque %ld a été lu à partir de %s à l'aide de RTC_EPOCH_READ ioctl().\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6319,7 +6194,6 @@ msgstr "Échec de ioctl(RTC_EPOCH_SET) vers %s"
 msgid "calling open_tty\n"
 msgstr "appel de open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "appel de termio_init\n"
@@ -6328,7 +6202,6 @@ msgstr "appel de termio_init\n"
 msgid "writing init string\n"
 msgstr "chaîne d'initialisation en écriture\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "avant le mode autobaud\n"
@@ -6342,7 +6215,6 @@ msgstr "en attente de cr-lf\n"
 msgid "read %c\n"
 msgstr "lire %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "lecture du nom de login\n"
@@ -6396,7 +6268,6 @@ msgstr "/dev: chdir() a échoué: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: n'est pas périphérique pour caractères"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6411,12 +6282,10 @@ msgstr "/dev/%s: ne peut ouvrir en tant qu'entrées standard: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: n,est pas ouvert pour lecture/écriture"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "dup() en cours\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6459,30 +6328,25 @@ msgstr ""
 "ou\t[-hiLmw] [-l programme-de-login] [-t minuterie-d-expiration] [-I chaîne-"
 "init] [-H hôte-cible] ligne vitesse-en-bauds,... [type-de-terminal]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: bas en espace mémoire, login peut échouer\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "ne peut exécuter malloc() pour ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "ne peut exécuter malloc() pour grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login sur %s de %s n'est pas permis par défaut.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login sur %s de %s n'est pas permis.\n"
@@ -6529,8 +6393,8 @@ msgstr "Modification de l'information de finger pour %s.\n"
 msgid "Password error."
 msgstr "Erreur de mot de passe"
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Mot de passe: "
@@ -6710,34 +6574,6 @@ msgstr "Utiliser %s -l pour afficher la liste.\n"
 msgid "No known shells.\n"
 msgstr "Aucun shell connu.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "ne peut ouvrir /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "ne peut lire des données au hasard à partir de /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "ne peut ouvrir %s pour lecture"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "ne peut évaluer par stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s n'a pas les modes d'accès corrects"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "nepeut lire les données à partir de %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6748,11 +6584,11 @@ msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 "usage: last [-#] [-f fichier] [-t tty] [-h nom-de-l'hôte] [usager ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  encore loggé au système"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6761,15 +6597,15 @@ msgstr ""
 "\n"
 "wtmp débute %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: échec de malloc().\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: obtention du nom de l'hôte"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6778,51 +6614,45 @@ msgstr ""
 "\n"
 "interruption %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Erreur fatale: ne peut réouvrir tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "Erreur fatale: tty erroné"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h pour le super usager seulement.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "usage: login [-fp] [nom-d-usager]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "Échec de login: PAM, arrêt de l'exécution: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Ne peut initialiser PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "ÉCHEC DE LOGIN %d À PARTIR DE %s POUR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6831,17 +6661,17 @@ msgstr ""
 "Login incorrect\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TROP DE TENTATIVES DE LOGIN (%d) DE %s POUR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "ÉCHEC DE LOGIN POUR UNE SESSION DE %s POUR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6850,7 +6680,7 @@ msgstr ""
 "\n"
 "Login incorrect\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6859,136 +6689,121 @@ msgstr ""
 "\n"
 "Problème d'initialisation de la session, abandon.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Nom d'usager null dans %s:%d. Abandon."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Nom d'usager invalide « %s » dans %s:%d. Abandon."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: mémoire épuisée\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Nom d'usager illégal"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login refusé sur ce terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSÉ DE %s SUR TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSÉ SUR TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorrect\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Trop d'usagers présentement.\n"
-"Essayer plus tard.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Vous avez trop de processus actifs.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "APPEL à %s fait par %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN DE %s À PARTIR DE %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN SUR %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN SUR %s PAR %s À PARTIR DE %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN SUR %s PAR %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Vous avez du courrier.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Vous avez du courrier.\n"
 
 # login-utils/login.c:1087too many bare linefeeds.\n"
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: échec d'établissement de relais par fork(): %s "
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "Éched de TIOCSCTTY: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "échec de setuid()"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Pas de répertoire %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login avec un répertoire home = « / ».\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: mémoire épuisée pour le script du shell.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ne peut exécuter le script du shell: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: pas de shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6997,65 +6812,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "nom du compte usager login trop long.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NOM trop long"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "noms de login ne peuvent débuter avec « - ».\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "trop de sauts de page (linefeeds)\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "Nombre escessif de sauts de page (linefeeds)"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Expiration du délai de grâce lors du login après %d secondes\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Dernier login: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "à partir de %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "sur %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Échec de login à partir de %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Échec de login à partir de %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d login en échec à partir de %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d login en échec sur %s, %s"
@@ -7075,173 +6890,30 @@ msgstr "est n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "usage: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Qui êtes-vous?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: pas de tel groupe."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: permission refusée"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Pas de shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Le mot de passe doit avoir au moins 6 caractères, essayer encore.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Le mot de passe doit contenir des caractères en dehors des classes\n"
-"suivantes: majuscules et minuscules, chiffres et caractères non\n"
-"alphanuériques. Consulter passwd(1) pour plus d'informations.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Vous ne pouvez pas réutiliser votre ancien mot de passe.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"SVP ne pas utiliser quelque choses comme votre nom de compte usager comme "
-"mot de passe!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr ""
-"SVP ne pas utiliser quelque chose comme votre vrai nom comme mot de passe!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Usage: passwd [nom-d-usager [mot-de-passe]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Seul le super usager peut utiliser une des deux formes d'arguments.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Usage: passwd [-foqsvV] [usager [mot-de-passe]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Ne peut exécuter %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Ne peut repérer le nom de login"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Seul le super usager peut modifier le mot de passe des autres.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Trop d'arguments.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"Ne peut repérer le nom de l'usager.Est-ce que « %s » est réellement un "
-"usager?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Désolé, seuls les mots de passe locaux peuvent être modifiés. Utiliser "
-"ypasswd à la place."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "Le nom de l'usager et le UID ne concordent pas, imposteur!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Changement du mot de passe pour %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Entrer le vieux mot de passe: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Mot de passe illégal, imposteur."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Entrer le nouveau mot de passe: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Le mot de passe n'a pas été modifié."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Re-taper le nouveau mot de passe: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Vous l'avez mal epelé. Le mot de passe n'a pas été changé."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "mot de passe modifié. usager %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "Mot de passe du compte ROOT modifié"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "mot de passe modifié par root, usager %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "appel de setpwnam() pour initialiser le mot de passe.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Mot de passe *NON* modifié. Essayer à nouveau plus tard.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Mot de passe modifié.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7288,7 +6960,6 @@ msgstr "réamorçé par %s: %s"
 msgid "halted by %s: %s"
 msgstr "stoppé par %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7325,7 +6996,6 @@ msgstr "Exécution du programme « %s » ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Erreur d'exécution\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7415,7 +7085,6 @@ msgstr "erreur d'initialisaton close-on-exec sur /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "erreur d'exécution de finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "erreur de fork() de finalprog\n"
@@ -7444,7 +7113,7 @@ msgstr "échec d'ouverture du répertoire\n"
 msgid "fork failed\n"
 msgstr "échec de fork()\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "échec de exec()\n"
 
@@ -7594,12 +7263,6 @@ msgstr "valeur de mois illégal: utiliser 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "valeur d'année illégale: utiliser 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7610,13 +7273,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "usage: cal [-13smjyV] [[mois] année]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "usage: %s [+format] [jour mois année]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Jour de la St. Tib"
 
@@ -7748,7 +7410,7 @@ msgstr "%s: changer le nom de %s vers %s a échoué: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s vers les fichiers...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7759,22 +7421,22 @@ msgstr ""
 "Utiliser « %s [options] %s » si vous désirez réellement l'utiliser.\n"
 "Le script n'a pas été démarré.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "usage: script [-a] [-f] [-q] [-t] [fichier]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Le script a débuté, le fichier est %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Le script a débuté sur %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7783,254 +7445,253 @@ msgstr ""
 "\n"
 "Script complété sur %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script complélé, le fichier est %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "échec de openpty\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Manque de pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: erreur d,arguement, usage\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nom-de-terminal ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file nom-de-fichier-de-vidange ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq nombre-de-la-fréquence ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "ne peut exécuter le mode (un)set powersave\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "erreur klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Erreur de lecture %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Erreur lors de l'écriture du screendump\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "ne peut lire %s et ne peut peut faire un dump via ioctl()\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM n'est pas défini.\n"
@@ -8105,10 +7766,6 @@ msgstr "AVERTISSEMENT: ne peut ouvrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: ne peut ouvrir %s - on utilise %s à la place\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8302,31 +7959,31 @@ msgid "; rest of file ignored"
 msgstr "; reste du fichier est ignoré"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: l'étiquette %s apparaît à la fois sur %s et %s\n"
+msgstr "%s: erreur: l'étiquette %s apparaît à la fois sur %s et %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: on va monter %s par %s\n"
+msgstr "mount: on va monter %s par UUID\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: on va monter %s par %s\n"
+msgstr "mount: on va monter %s par l'étiquette\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount: ne peut ouvrir %s, la conversion de UUID et LABEL ne peut être "
-"faite.\n"
+"%s: ne peut ouvrir %s, aussi la conversion de UUID et de l'ÉTIQUETTE ne peut "
+"être faite.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: UUID erroné"
+msgstr "%s: UUID erroné"
 
 #: mount/mount.c:382
 #, c-format
@@ -8414,85 +8071,76 @@ msgstr "mount: ne peut ouvrir %s pour ajuster la vitesse"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ne peut initialiser la vitesse: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ne peut établir un relais fork(): %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: cette version a été compilé sans support pour le type « nfs »"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: échec avec la version 4 de mount nfs, on tente la 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: je ne peux déterminer le type de système de fichiers et aucun n'a été "
 "spécifié"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: vous devez spécifier le type de système de fichiers"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: échec de mount"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: le point de montage %s n'est pas un répertoire"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: permission refusée"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: doit être le super usager pour utiliser mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est occupé"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc déjà monté"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s est déjà monté ou %s est occupé"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: le point de montage %s n'existe pas"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 "mount: le point de montage %s est un lien symbolique qui pointe vers nulle "
 "part"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: périphérique spécial %s n'existe pas"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8501,12 +8149,12 @@ msgstr ""
 "mount: le périphérique spécial %s n'existe pas\n"
 "       (un préfixe de chemin n'est pas un répertoire)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s n'est pas déjà monté ou option erronée"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8516,7 +8164,7 @@ msgstr ""
 "sur %s,\n"
 "       codepage manquante ou autre erreur"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8524,7 +8172,7 @@ msgstr ""
 "       (cela pourrait être le périphérique IDE où vous utilisez\n"
 "       ide-scsi alors que sr0 ou sda ou autre serait requis?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8532,7 +8180,7 @@ msgstr ""
 "       (tentez-vous de monter une partition étendue,\n"
 "       au lieu d'une partition logique à l'intérieur?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8541,52 +8189,51 @@ msgstr ""
 "essayez\n"
 "       dmesg | tail  ou quelque chose du genre\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "table de périphériques montés est pleine"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ne peut lire le super bloc"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: périphérique inconnnu"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: type inconnu de système de fichiers '%s'"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablement vous voulez dire %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: peut-être voulez-vous dire 'iso9660'?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: peut-être voulez-vous dire 'vfat'?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s a un nombre de périphérique erroné ou le type du syst. de fichiers "
 "%s n'est pas supporté"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s n'est pas un périphérique de type bloc et stat() a échoué?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8595,76 +8242,71 @@ msgstr ""
 "mount: le kernel ne reconnaît pas %s comme un périphérique de type bloc\n"
 "       (peut-être un pilote « insmod »?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s n'est pas un périphérique de type bloc (essayer « -o loop » ?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s n'est pas un périphérique de type bloc"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s n'est pas un périphérique valide de type bloc"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "périphérique de type bloc"
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ne peut monter %s%s en lecture seulement"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s est protégé en écriture mais l'option « -w » a été fournie"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s est protégé en écriture, on le monte en lecture seulement"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: aucun type n'a été donné - ja vais assumer nfs en raison du « : »\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: aucun type n'a été fourni - je vais assumer smbfs en raison du "
 "préfixe //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: mise en arrière plan de \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: abandon \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s est déjà monté sur %s\n"
 
 # mount/mount.c:1323
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8715,34 +8357,34 @@ msgstr ""
 "Autres options: [-nfFrsvw] [-o options] [-p mot_de_passe].\n"
 "Pour plus de détails exécuter:  man 8 mount .\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: seul l'usager ROOT peut faire cela"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s n'a pas été repéré - on le crée..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: pas de telle partition repérée"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: on monte %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "rien n'a été monté"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: ne peut repérer %s dans %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ne peut repérer %s dans %s ou %s"
@@ -8779,99 +8421,99 @@ msgstr "       Je vais essayer le type %s\n"
 msgid "Trying %s\n"
 msgstr "On tente %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argument excessivement long  pour hôte:répertoire\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: AVERTISSEMENT: multiples noms d'hôtes non supportés\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 "mount: le répertoire à monter n'utilise pas le format hôte:répertoire\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: ne peut obtenir l'adresse de %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: a obtenu un hp->h_length erroné\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argument excessivement long pour une option\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "AVERTISSEMENT: l'option proto= n'est pas reconnue.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "AVERTISSEMENT: l'option namlen n'est pas supportée.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "paramètre mount nfs inconnu: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "AVERTISSEMENT: l'option nolock n'est pas supportée.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "option mount nfs inconnue: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: a obtenu un hp->h_length erroné?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sur TCP n'est pas supporté.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "socket nfs"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "bindresvport nfs"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "serveur nfs rapporte que le service n'est pas disponible"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "utilisation du portmapper pour repérer le port NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "utilisation du port %d pour le démon nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "connexion nfs"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valeur d'état retournée nfs inconnue: %d"
@@ -8880,8 +8522,8 @@ msgstr "valeur d'état retournée nfs inconnue: %d"
 msgid "bug in xstrndup call"
 msgstr "problème dans l'appel de xstrndup"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8890,10 +8532,10 @@ msgid ""
 msgstr ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
-"       %s [-v] [-p priorité] spécial ...\n"
+"       %s [-v] [-p priorité] spécial|ÉTIQUETTE=nom_du_volume ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8904,141 +8546,139 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] spécial ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s sur %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: ne peut repérer « _stext » dans %s\n"
+msgstr "%s: ne peut repérer le périphérique pour %s\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: ne peut évaluer pas stat() %s: %s\n"
+msgstr "%s: ne peut évaluer pas stat() %s: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
-"swapon: AVERTISSEMENT: %s a des permissions non sécuritaires %04o, %04o est "
+"%s: AVERTISSEMENT: %s a des permissions non sécuritaires %04o, %04o est "
 "suggéré\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: escamotage du fichier %s - il semble avoir des trous.\n"
+msgstr "%s: escamotage du fichier %s - il semble avoir des trous.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "N'est pas super usager.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: ne peut ouvrir %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilé sans support pour -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: ne peut faire un fork(): %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "hôte: %s, répertoire: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: ne peut obtenir l'adresse pour %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: a obtenu un hostp->h_length erroné\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: périphérique de type bloc invalide"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: n'est pas monté"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ne peut écrire sur le super bloc"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: périphérique occupé"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: n'a pas été trouvé"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: doit être le super usager pour utiliser umount"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: périphérique de type bloc non autorisé sur le système de fichiers"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "pas de umount2, tentative avec umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "ne peut démonter %s - essayer %s à la place\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est occupé - remonté en lecture seulement\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ne peut remonter %s en lecture seulement\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s démonté\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ne peut repérer la liste des systèmes de fichiers à démonter"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -9049,47 +8689,46 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t type-vfs] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] spécial | noeud...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "Ne peut démonter \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentative pour démonter %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Ne peut repérer %s dans mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s n'est pas monté (selon mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: il semble que %s ait été monté plusieurs fois"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s n'est pas dans fstab (et vous n'êtes pas l'usager ROOT)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount est en désaccord avec fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: seul %s peut démonter %s de %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: seul l'usager ROOT peut exécuter la commande"
 
@@ -9238,15 +8877,17 @@ msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Usage: %s [-c] [-n niveau] [-s taille-de-tampon]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: option inconnue \"-%c\"\n"
+msgstr "flock: option inconnue, annulation de l'opération \n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Usage flock [--shared | --timeout=secondes] nom_de_fichier commandes {arg "
+"arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9414,8 +9055,6 @@ msgstr "kernel n'est pas configuré pour traiter la mémoire partagée\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Limites de la mémoire partagé --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -10209,17 +9848,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e format] [-f fichier-format] [-n longueur] [-s saut] "
 "[fichier ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "usage: %s [-dflpcsu] [+no-de-ligne | +/patron] nom1 nom2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: option inconnue \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10230,8 +9869,7 @@ msgstr ""
 "*** %s: répertoire ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10242,46 +9880,46 @@ msgstr ""
 "******** %s: N'est pas un fichier texte ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Utiliser q ou Q pour quitter]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Plus--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Prochain fichier: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr ""
 "[Appuyer sur la barre d'espacement pour continuer, « q » pour quitter.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...reculé de %d pages"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...reculé de 1 page"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...escamotage d'une ligne"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...escamotage de %d ligne(s)"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10291,7 +9929,7 @@ msgstr ""
 "***Arrière***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10303,7 +9941,7 @@ msgstr ""
 "Par défaut entre crochets.\n"
 "L'étoile \"*\" indique que l'arguement devient le nouveau défaut.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10354,34 +9992,34 @@ msgstr ""
 "ligne\n"
 ".                        répéter la commande précédente\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Appuyer « h » pour obtenir les instructions.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "« %s » ligne %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Pas un fichier] ligne %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Débordement\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...escamotage\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Expression régulière bâclée"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10389,15 +10027,15 @@ msgstr ""
 "\n"
 "Patron non repéré\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Patron non repéré"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "ne peut établir un relais fork()\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10405,19 +10043,19 @@ msgstr ""
 "\n"
 "...Escamotage en cours "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Escamotage vers le fichier "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Escamotage arrière vers le fichier "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Ligne trop longue"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Aucune commande précédente pour subsitution"
 
@@ -10471,7 +10109,7 @@ msgstr "hexdumpo: format erroné {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: conversion erronée de caractères %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10479,84 +10117,81 @@ msgstr ""
 "%s: Usage: %s [-numéro] [-p chaîne] [-cefnrs] [+ligne] [+/patron/] "
 "[fichiers]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: l'option requiert un argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: option illégale -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...escamotage avant\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...escamotage arrière\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Pas de prochain fichier"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Pas de fichier précédent"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: erreur de lecture à partir du fichier %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF inattendue dans le fichier %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: erreur inconnue dans le fichier %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ne peut créer le fichier temporaire\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "erreur RE: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Pas de chaîne de recherche mémorisée"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Ne peut ouvrir"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "sauvegarder"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !commande non autoirisée en mode rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "échec du fork(), essayer à nouveau plus tard.\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Prochain fichier: "
 
@@ -10571,14 +10206,14 @@ msgid "usage: rev [file ...]\n"
 msgstr "usage: rev [fichier ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "ne peut ouvrir %s en lecture\n"
+msgstr "Ne peut ouvrir \"%s\" en lecture\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "usage: %s [fichier]\n"
+msgstr "usage: tailf fichier_journal\n"
 
 #: text-utils/ul.c:141
 #, c-format
@@ -10610,6 +10245,165 @@ msgstr "Ligne d'entrée trop longue.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Mémoire épuisée lors de l'accroissement du tampon.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Nombre invalide: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Erreur de syntaxe: « %s »\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Aucun paramètre de ce type initialisé: « %s »\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] périphérique nom\n"
+
+# disk-utils/setfdprm.c:101
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] périphérique taille sect têtes pistes stretch intervalle "
+#~ "taux spec1 format_de_intervalle\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] périphérique\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] périphérique\n"
+
+#~ msgid "version"
+#~ msgstr "version"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "ne peut ouvrir /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "ne peut lire des données au hasard à partir de /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "ne peut ouvrir %s pour lecture"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "ne peut évaluer par stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s n'a pas les modes d'accès corrects"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "nepeut lire les données à partir de %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Trop d'usagers présentement.\n"
+#~ "Essayer plus tard.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Vous avez trop de processus actifs.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Le mot de passe doit avoir au moins 6 caractères, essayer encore.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Le mot de passe doit contenir des caractères en dehors des classes\n"
+#~ "suivantes: majuscules et minuscules, chiffres et caractères non\n"
+#~ "alphanuériques. Consulter passwd(1) pour plus d'informations.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Vous ne pouvez pas réutiliser votre ancien mot de passe.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "SVP ne pas utiliser quelque choses comme votre nom de compte usager comme "
+#~ "mot de passe!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "SVP ne pas utiliser quelque chose comme votre vrai nom comme mot de "
+#~ "passe!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Usage: passwd [nom-d-usager [mot-de-passe]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr ""
+#~ "Seul le super usager peut utiliser une des deux formes d'arguments.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Usage: passwd [-foqsvV] [usager [mot-de-passe]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Ne peut exécuter %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Ne peut repérer le nom de login"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Seul le super usager peut modifier le mot de passe des autres.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Trop d'arguments.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Ne peut repérer le nom de l'usager.Est-ce que « %s » est réellement un "
+#~ "usager?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Désolé, seuls les mots de passe locaux peuvent être modifiés. Utiliser "
+#~ "ypasswd à la place."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "Le nom de l'usager et le UID ne concordent pas, imposteur!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Changement du mot de passe pour %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Entrer le vieux mot de passe: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Mot de passe illégal, imposteur."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Entrer le nouveau mot de passe: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Le mot de passe n'a pas été modifié."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Re-taper le nouveau mot de passe: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Vous l'avez mal epelé. Le mot de passe n'a pas été changé."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "mot de passe modifié. usager %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "Mot de passe du compte ROOT modifié"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "mot de passe modifié par root, usager %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "appel de setpwnam() pour initialiser le mot de passe.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Mot de passe *NON* modifié. Essayer à nouveau plus tard.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Mot de passe modifié.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: cette version a été compilé sans support pour le type « nfs »"
+
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "AVERTISSEMENT: omission de partitions après %d\n"
 
diff --git a/po/insert-header.sin b/po/insert-header.sin
new file mode 100644
index 000000000..b26de01f6
--- /dev/null
+++ b/po/insert-header.sin
@@ -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 --git a/po/it.gmo b/po/it.gmo
new file mode 100644
index 000000000..bb6f58130
--- /dev/null
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index c9b392d43..7a600d7d0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,83 +1,85 @@
-# Italian translation of the util-linux messages.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# <support@turbolinux.com>, 2000.
-msgid ""
-msgstr ""
-"Project-Id-Version: util-linux 2.10f\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2000-04-04 21:52-0800\n"
-"Last-Translator: Beth Powell <bpowell@turbolinux.com>\n"
-"Language-Team: <support@turbolinux.com>\n"
+# Italian messages for util-linux.
+# Copyright (C) 2000, 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the util-linux package.
+# Marco Colombo <m.colombo@ed.ac.uk>, 2005.
+# Beth Powell <bpowell@turbolinux.com>, 2000.
+#
+# partition table: tavola delle partizioni? tabella delle partizioni?
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-02-25 12:33+0000\n"
+"Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
+"Language-Team: Italian <tp@lists.linux.it>\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"
 
 #: disk-utils/blockdev.c:62
 msgid "set read-only"
-msgstr "impostare sola lettura"
+msgstr "imposta sola lettura"
 
 #: disk-utils/blockdev.c:63
 msgid "set read-write"
-msgstr "impostare lettura-scrittura"
+msgstr "imposta lettura-scrittura"
 
 #: disk-utils/blockdev.c:66
 msgid "get read-only"
-msgstr "visualizzare sola-lettura"
+msgstr "visualizza sola lettura"
 
 #: disk-utils/blockdev.c:69
 msgid "get sectorsize"
-msgstr "visualizzare la dimensione del settore"
+msgstr "visualizza la dimensione del settore"
 
 #: disk-utils/blockdev.c:72
-#, fuzzy
 msgid "get blocksize"
-msgstr "visualizzare la dimensione"
+msgstr "visualizza la dimensione del blocco"
 
 #: disk-utils/blockdev.c:75
-#, fuzzy
 msgid "set blocksize"
-msgstr "visualizzare la dimensione"
+msgstr "imposta la dimensione del blocco"
 
 #: disk-utils/blockdev.c:78
 msgid "get 32-bit sector count"
 msgstr ""
 
+# FIXME
 #: disk-utils/blockdev.c:81
-#, fuzzy
 msgid "get size in bytes"
-msgstr "visualizzare la dimensione"
+msgstr "visualizza la dimensione in byte"
 
 #: disk-utils/blockdev.c:84
 msgid "set readahead"
-msgstr "impostare readahead"
+msgstr "imposta readahead"
 
 #: disk-utils/blockdev.c:87
 msgid "get readahead"
-msgstr "visualizzare readahead"
+msgstr "visualizza readahead"
 
 #: disk-utils/blockdev.c:90
 msgid "flush buffers"
-msgstr "scaricamento buffer"
+msgstr "scarica i buffer"
 
 #: disk-utils/blockdev.c:94
 msgid "reread partition table"
-msgstr "rilettura della tabella delle partizioni"
+msgstr "rileggi la tabella delle partizioni"
 
 #: disk-utils/blockdev.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "Usage:\n"
-msgstr "Utilizzo:"
+msgstr "Uso:\n"
 
 #: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
-msgstr ""
+msgstr "  %s --report [dispositivi]\n"
 
 #: disk-utils/blockdev.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "  %s [-v|-q] commands devices\n"
-msgstr "Utilizzo: %s [-V] [-v|-q] dispositivi comandi\n"
+msgstr "  %s [-v|-q] comandi dispositivi\n"
 
 #: disk-utils/blockdev.c:107
 #, c-format
@@ -87,7 +89,7 @@ msgstr "Comandi disponibili:\n"
 #: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
-msgstr "%s: comando sconosciuto: %s\n"
+msgstr "%s: Comando sconosciuto: %s\n"
 
 #: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
@@ -97,32 +99,32 @@ msgstr "%s richiede un argomento\n"
 #: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
-msgstr ""
+msgstr "%s riuscito.\n"
 
 #: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot open %s\n"
-msgstr "%s: impossibile aprire %s: %s\n"
+msgstr "%s: impossibile aprire %s\n"
 
 #: disk-utils/blockdev.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "%s: ioctl error on %s\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: errore di ioctl su %s\n"
 
 #: disk-utils/blockdev.c:391
 #, c-format
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
-#, fuzzy, c-format
+#: disk-utils/elvtune.c:50
+#, c-format
 msgid "usage:\n"
-msgstr "Utilizzo:"
+msgstr "Uso:\n"
 
 #: disk-utils/fdformat.c:31
 #, c-format
 msgid "Formatting ... "
-msgstr "Formattazione in corso ... "
+msgstr "Formattazione in corso... "
 
 #: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
 #, c-format
@@ -132,7 +134,7 @@ msgstr "fatto\n"
 #: disk-utils/fdformat.c:60
 #, c-format
 msgid "Verifying ... "
-msgstr "Verifica in corso ... "
+msgstr "Verifica in corso... "
 
 #: disk-utils/fdformat.c:71
 msgid "Read: "
@@ -155,22 +157,21 @@ msgstr ""
 #: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "utilizzo: dispositivo %s [ -n ]\n"
+msgstr "Uso:  %s [ -n ] dispositivo\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s da %s\n"
 
 #: disk-utils/fdformat.c:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s: not a block device\n"
-msgstr "%s: non si tratta di un dispositivo floppy\n"
+msgstr "%s: non si tratta di un dispositivo a blocchi\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
@@ -179,17 +180,19 @@ msgstr "Impossibile determinare il tipo di formato attuale"
 #: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
-msgstr "%s-completo, tracce %d , %d sec/traccia. Capacità totale %d kB.\n"
+msgstr "faccia %s, %d tracce, %d sec/traccia. Capacità totale %d kB.\n"
 
+# Questo messaggio e quello successivo concordano con "faccia" del messaggio 
+# sopra.
 #: disk-utils/fdformat.c:142
 msgid "Double"
-msgstr "Doppio"
+msgstr "doppia"
 
 #: disk-utils/fdformat.c:142
 msgid "Single"
-msgstr "Singolo"
+msgstr "singola"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -198,98 +201,104 @@ msgid ""
 " -v         be more verbose\n"
 " file       file to test\n"
 msgstr ""
+"Uso: %s [-hv] [-x dir] file\n"
+" -h         mostra questo aiuto\n"
+" -x dir     estrai nella directory dir\n"
+" -v         sii più prolisso\n"
+" file       file da verificare\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
-msgstr ""
+msgstr "%s: errore %d durante la decompressione! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
-#, fuzzy, c-format
+#: disk-utils/fsck.cramfs.c:250
+#, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: errore di dimensione nel link simbolico `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
-#, fuzzy, c-format
+#: disk-utils/fsck.cramfs.c:326
+#, c-format
 msgid "  hole at %ld (%d)\n"
-msgstr "dovrebbe essere (%d, %d, %d)\n"
+msgstr "  buco in %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
-#, fuzzy, c-format
+#: disk-utils/fsck.cramfs.c:479
+#, c-format
 msgid "%s: compiled without -x support\n"
-msgstr "%s: non e' stato compilato con il supporto per minix v2\n"
+msgstr "%s: è stato compilato senza il supporto per -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
+"%s: attenzione -- impossibile determinare la dimensione del filesystem \n"
 
-#: disk-utils/fsck.cramfs.c:518
-#, fuzzy, c-format
+#: disk-utils/fsck.cramfs.c:515
+#, c-format
 msgid "%s is not a block device or file\n"
-msgstr "mount: %s non è un dispositivo di blocchi"
+msgstr "%s non è un dispositivo a blocchi o un file\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -297,12 +306,12 @@ msgstr ""
 #: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Utilizzo: %s [-larvsmf] /dev/name\n"
+msgstr "Uso: %s [-larvsmf] /dev/nome\n"
 
 #: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
-msgstr "%s è montato.\t"
+msgstr "%s è montato.\t"
 
 #: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
@@ -314,28 +323,28 @@ msgid "check aborted.\n"
 msgstr "controllo interrotto.\n"
 
 #: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr " Zona n. < FIRSTZONE nel file `"
+msgstr " N. zona < FIRSTZONE nel file `%s'"
 
 #: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
-#, fuzzy, c-format
+#, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr "N. Zona >= ZONES nel file `"
+msgstr "N. Zona >= ZONES nel file `%s'"
 
 #: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Rimuovere blocco"
 
 #: disk-utils/fsck.minix.c:368
-#, fuzzy, c-format
+#, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr "Errore di lettura: ricerca del blocco nel file' impossibile"
+msgstr "Errore di lettura: ricerca del blocco nel file '%s' impossibile\n"
 
 #: disk-utils/fsck.minix.c:374
-#, fuzzy, c-format
+#, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr "Errore di lettura: blocco danneggiato nel file '"
+msgstr "Errore di lettura: blocco danneggiato nel file '%s'\n"
 
 #: disk-utils/fsck.minix.c:389
 #, c-format
@@ -351,9 +360,9 @@ msgid "seek failed in write_block"
 msgstr "tentativo fallito in write_block "
 
 #: disk-utils/fsck.minix.c:398
-#, fuzzy, c-format
+#, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr "Errore di scrittura: blocco danneggiato nel file '"
+msgstr "Errore di scrittura: blocco danneggiato nel file '%s'\n"
 
 #: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
@@ -389,7 +398,7 @@ msgstr "numero magico danneggiato in super-block"
 
 #: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
-msgstr "È supportato solamente 1k blocchi/zone"
+msgstr "È supportato solamente 1k blocchi/zone"
 
 #: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
@@ -472,18 +481,19 @@ msgstr ""
 "\n"
 
 #: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
-#, fuzzy, c-format
+#, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
-msgstr "Inode %d contrassegnato non utilizzato, ma utilizzato per il file '"
+msgstr ""
+"Inode %d contrassegnato non utilizzato, ma utilizzato per il file '%s'\n"
 
 #: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Segno in uso"
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
-#, fuzzy, c-format
+#, c-format
 msgid "The file `%s' has mode %05o\n"
-msgstr "ha modalità %05o\n"
+msgstr "Il file `%s' ha modalità %05o\n"
 
 #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 #, c-format
@@ -492,12 +502,12 @@ msgstr "Attenzione: conteggio inode troppo grande.\n"
 
 #: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
-msgstr "l'inode di root non è una directory"
+msgstr "l'inode radice non è una directory"
 
 #: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
-#, fuzzy, c-format
+#, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr "Il blocco è stato utilizzato in precedenza. Ora nel file  `"
+msgstr "Il blocco è stato utilizzato in precedenza. Ora nel file `%s'"
 
 #: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
 #: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
@@ -506,51 +516,52 @@ msgid "Clear"
 msgstr "Cancella"
 
 #: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
-#, fuzzy, c-format
+#, c-format
 msgid "Block %d in file `%s' is marked not in use."
-msgstr "' è marcato come non in uso."
+msgstr "Il blocco %d nel file `%s' è marcato come non in uso."
 
 #: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Corretto"
 
 #: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
-#, fuzzy, c-format
+#, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
-msgstr "contiene un numero inode non corretto per il file '"
+msgstr ""
+"La directory '%s' contiene un numero inode non corretto per il file '%.*s'."
 
 #: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
-msgstr "Rimuovere"
+msgstr " Rimuovere"
 
 #: disk-utils/fsck.minix.c:956
-#, fuzzy, c-format
+#, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr ": directory danneggiata: '.' non è la prima\n"
+msgstr "`%s': directory danneggiata: '.' non è la prima\n"
 
 #: disk-utils/fsck.minix.c:964
-#, fuzzy, c-format
+#, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
-msgstr ": directory danneggiata: '..' non è la seconda\n"
+msgstr "`%s': directory danneggiata: '..' non è la seconda\n"
 
 #: disk-utils/fsck.minix.c:1023
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr ": directory danneggiata: '.' non è la prima\n"
+msgstr "%s: directory danneggiata: '.' non è la prima\n"
 
 #: disk-utils/fsck.minix.c:1032
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: '..' isn't second\n"
-msgstr ": directory danneggiata: '..' non è la seconda\n"
+msgstr "%s: directory danneggiata: '..' non è la seconda\n"
 
 #: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "errore interno"
 
 #: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: size < 32"
-msgstr ": directory danneggiata: dimensione < 32"
+msgstr "%s: directory danneggiata: dimensione < 32"
 
 #: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
@@ -559,7 +570,7 @@ msgstr "ricerca in bad_zone non riuscita"
 #: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
-msgstr "Modalità dell'inode %d non cancellata."
+msgstr "Modalità dell'inode %d non cancellata."
 
 #: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
@@ -574,7 +585,7 @@ msgstr "Inode %d utilizzato, inode contrassegnato non utilizzato in bitmap."
 #: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
-msgstr "Inode %d (modalità = %07o), i_nlinks=%d, conteggiati=%d."
+msgstr "Inode %d (modalità = %07o), i_nlinks=%d, conteggiati=%d."
 
 #: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
@@ -590,18 +601,18 @@ msgid "Unmark"
 msgstr "Non contrassegnata"
 
 #: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
-#, fuzzy, c-format
+#, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Zona %d: %s utilizzati , conteggiati=%d\n"
+msgstr "Zona %d: utilizzata, conteggiati=%d\n"
 
 #: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
-#, fuzzy, c-format
+#, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr "Zona %d: %s utilizzati , conteggiati=%d\n"
+msgstr "Zona %d: non in uso, conteggiati=%d\n"
 
 #: disk-utils/fsck.minix.c:1181
 msgid "Set"
-msgstr "Impostare"
+msgstr "Imposta"
 
 #: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
 #: disk-utils/mkfs.minix.c:633
@@ -624,7 +635,7 @@ msgstr "impossibile aprire '%s'"
 #: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
-msgstr "'%s' è corretto, non controllare.\n"
+msgstr "'%s' è corretto, non controllare.\n"
 
 #: disk-utils/fsck.minix.c:1305
 #, c-format
@@ -634,7 +645,7 @@ msgstr "Forzatura controllo filesystem su %s in corso.\n"
 #: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr "Il filesystem su %s è danneggiato, controllo necessario.\n"
+msgstr "Il filesystem su %s è danneggiato, controllo necessario.\n"
 
 #: disk-utils/fsck.minix.c:1333
 #, c-format
@@ -666,8 +677,8 @@ msgstr ""
 "\n"
 "%6d file regolari\n"
 "%6d directory\n"
-"%6d file di dispositivo di caratteri\n"
-"%6d file di dispositivo di blocchi\n"
+"%6d file di dispositivo a caratteri\n"
+"%6d file di dispositivo a blocchi\n"
 "%6d link\n"
 "%6d link simbolici\n"
 "------\n"
@@ -680,24 +691,24 @@ msgid ""
 "FILE SYSTEM HAS BEEN CHANGED\n"
 "----------------------------\n"
 msgstr ""
-"----------------------------\n"
-"IL FILE SYSTEM È STATO MODIFICATO\n"
-"----------------------------\n"
+"---------------------------------\n"
+"IL FILE SYSTEM È STATO MODIFICATO\n"
+"---------------------------------\n"
 
 #: disk-utils/isosize.c:129
-#, fuzzy, c-format
+#, c-format
 msgid "%s: failed to open: %s\n"
-msgstr "Impossibile aprire %s\n"
+msgstr "%s: impossibile aprire: %s\n"
 
 #: disk-utils/isosize.c:135
-#, fuzzy, c-format
+#, c-format
 msgid "%s: seek error on %s\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: errore di posizionamento su %s\n"
 
 #: disk-utils/isosize.c:141
-#, fuzzy, c-format
+#, c-format
 msgid "%s: read error on %s\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: errore di lettura su %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
@@ -707,12 +718,12 @@ msgstr ""
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr ""
+msgstr "%s: errore di comprensione dell'opzione\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr ""
+msgstr "Uso: %s [-x] [-d <num>] iso9660-image\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -720,52 +731,52 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
+"Uso: %s [-v] [-N n-di-inode] [-V nome-volume]\n"
+"        [-F nome-filessystem] dispositivo [numero-blocchi]\n"
 
 #: disk-utils/mkfs.bfs.c:135
-#, fuzzy
 msgid "volume name too long"
-msgstr "linea troppo lunga"
+msgstr "nome di volume troppo lungo"
 
 #: disk-utils/mkfs.bfs.c:142
-#, fuzzy
 msgid "fsname name too long"
-msgstr "Linea troppo lunga"
+msgstr "nome del filesystem troppo lungo"
 
 #: disk-utils/mkfs.bfs.c:167
-#, fuzzy, c-format
+#, c-format
 msgid "cannot stat device %s"
-msgstr "impossibile eseguire stat(%s)"
+msgstr "impossibile eseguire stat sul dispositivo %s"
 
 #: disk-utils/mkfs.bfs.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a block special device"
-msgstr "mount: %s non è un dispositivo di blocchi"
+msgstr "%s non è un dispositivo speciale a blocchi"
 
 #: disk-utils/mkfs.bfs.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open %s"
-msgstr "impossibile aprire %s\n"
+msgstr "impossibile aprire %s"
 
 #: disk-utils/mkfs.bfs.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get size of %s"
-msgstr "Impossibile ottenere la dimensione del disco"
+msgstr "impossibile ottenere la dimensione di %s"
 
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
 msgid "blocks argument too large, max is %lu"
-msgstr ""
+msgstr "argomento dei blocchi troppo largo, il massimo è %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
-msgstr ""
+msgstr "troppi inode - il massimo è 512"
 
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
-msgstr ""
+msgstr "spazio insufficiente, sono necessari almeno %lu blocchi"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -773,32 +784,32 @@ msgstr "Dispositivo: %s\n"
 #: disk-utils/mkfs.bfs.c:229
 #, c-format
 msgid "Volume: <%-6s>\n"
-msgstr ""
+msgstr "Volume: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
 msgid "FSname: <%-6s>\n"
-msgstr ""
+msgstr "Nome filesystem: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "BlockSize: %d\n"
-msgstr "bloccato"
+msgstr ""
 
 #: disk-utils/mkfs.bfs.c:233
 #, c-format
 msgid "Inodes: %d (in 1 block)\n"
-msgstr ""
+msgstr "Inode: %d (in 1 blocco)\n"
 
 #: disk-utils/mkfs.bfs.c:236
 #, c-format
 msgid "Inodes: %d (in %ld blocks)\n"
-msgstr ""
+msgstr "Inode: %d (in %ld blocchi)\n"
 
 #: disk-utils/mkfs.bfs.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "Blocks: %ld\n"
-msgstr "trackskew: %d\n"
+msgstr "Blocchi: %ld\n"
 
 #: disk-utils/mkfs.bfs.c:239
 #, c-format
@@ -806,53 +817,46 @@ msgid "Inode end: %d, Data end: %d\n"
 msgstr ""
 
 #: disk-utils/mkfs.bfs.c:244
-#, fuzzy
 msgid "error writing superblock"
-msgstr "impossibile scrivere in super-block"
+msgstr "errore durante la scrittura del superblocco"
 
 #: disk-utils/mkfs.bfs.c:264
-#, fuzzy
 msgid "error writing root inode"
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore durante la scrittura dell'inode radice"
 
 #: disk-utils/mkfs.bfs.c:269
-#, fuzzy
 msgid "error writing inode"
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore durante la scrittura dell'inode"
 
 #: disk-utils/mkfs.bfs.c:272
-#, fuzzy
 msgid "seek error"
-msgstr ", errore"
+msgstr "errore di posizionamento"
 
 #: disk-utils/mkfs.bfs.c:278
-#, fuzzy
 msgid "error writing . entry"
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore durante la scrittura di `.'"
 
 #: disk-utils/mkfs.bfs.c:282
-#, fuzzy
 msgid "error writing .. entry"
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore durante la scrittura di `..'"
 
 #: disk-utils/mkfs.bfs.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "error closing %s"
-msgstr "Errore durante la chiusura di %s\n"
+msgstr "errore durante la chiusura di %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
-msgstr ""
-" Utilizzo: mkfs [-V] [-t tipofs] [opzioni-fs] dispositivo [dimensione]\n"
+msgstr "Uso: mkfs [-V] [-t tipofs] [opzioni-fs] dispositivo [dimensione]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr "%s: memoria esaurita!\n"
+msgstr "%s: Memoria esaurita!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "versione mkfs %s (%s)\n"
@@ -886,7 +890,7 @@ msgstr ""
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
 msgid "filesystem too big.  Exiting.\n"
-msgstr ""
+msgstr "filesystem troppo grande. Uscita.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
@@ -895,7 +899,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -904,7 +907,7 @@ msgstr ""
 #: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
-msgstr ""
+msgstr "%6.2f%% (%+d byte)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:819
 #, c-format
@@ -914,58 +917,55 @@ msgid ""
 msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "Including: %s\n"
-msgstr "Numero non valido: %s\n"
+msgstr "Incluso: %s\n"
 
 #: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
-msgstr ""
+msgstr "Dati directory: %d byte\n"
 
 #: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
-msgstr ""
+msgstr "Tutto: %d kilobyte\n"
 
 #: disk-utils/mkfs.cramfs.c:879
-#, fuzzy, c-format
+#, c-format
 msgid "Super block: %d bytes\n"
-msgstr "spazio utilizzato = %d byte\n"
+msgstr "Superblocco: %d byte\n"
 
 #: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
-msgstr ""
+msgstr "CRC: %x\n"
 
 #: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
+"spazio insufficiente allocato per l'immagine ROM (%Ld allocati, %d usati)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
-msgstr ""
+msgstr "Scrittura dell'immagine ROM non riuscita (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
-#, fuzzy, c-format
+#, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "Attenzione: conteggio inode troppo grande.\n"
+msgstr "attenzione: nomi di file troncati a 255 byte.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 #, c-format
 msgid "warning: files were skipped due to errors.\n"
-msgstr ""
+msgstr "attenzione: alcuni file sono stati ignorati a causa di errori.\n"
 
 #: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
-msgstr ""
+msgstr "attenzione: dimensioni dei file troncate a %luMB (meno 1 byte).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
@@ -989,12 +989,12 @@ msgstr ""
 #: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr " Utilizzo: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
+msgstr " Uso: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
 
 #: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
-msgstr "%s è montata; qui non verrà creato un filesystem!"
+msgstr "%s è montata; qui non verrà creato un filesystem!"
 
 #: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
@@ -1025,7 +1025,6 @@ msgstr "impossibile scrivere inode"
 msgid "write failed in write_block"
 msgstr "scrittura in write_block non riuscita"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1061,7 +1060,7 @@ msgstr "ricerca non riuscita durante il controllo dei blocchi"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valori strani in do_check: probabilmente sono presenti dei bug\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "ricerca in check_blocks non riuscita"
 
@@ -1072,7 +1071,7 @@ msgstr "blocchi danneggiati prima dell'area dati: impossibile creare fs"
 #: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
-msgstr "blocchi danneggiati %d\n"
+msgstr "%d blocchi danneggiati\n"
 
 #: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 #, c-format
@@ -1096,116 +1095,116 @@ msgstr "impossibile aprire %s"
 #: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
-msgstr "impossibile avviare %s"
+msgstr "impossibile fare stat di %s"
 
 #: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "non si tenterà di creare un filesystem su '%s'"
+msgstr "non si tenterà di creare un filesystem su '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "dimensione pagina %d specificata dall'utente non corretta\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Utilizzo della dimensione pagina %d specificata dall'utente, al posto dei "
 "valori del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "Si presuppone che le pagine siano di dimensione %d (non %d)\n"
+msgstr "Si assume che le pagine siano di dimensione %d (non %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "L'etichetta è stata troncata.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "etichetta"
+msgstr "nessuna etichetta, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr " Utilizzo: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocchi]\n"
+msgstr ""
+"Uso: %s [-c] [-v0|-v1] [-pDIMPAGINA] [-L etichetta] /dev/nome [blocchi]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "troppe pagine danneggiate"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "una pagina danneggiata\n"
 
-#: disk-utils/mkswap.c:438
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:437
+#, c-format
 msgid "%lu bad pages\n"
-msgstr "%d pagine danneggiate\n"
+msgstr "%lu pagine danneggiate\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
-msgstr "%s: errore: non è possibile impostare swap in nessuna posizione?\n"
+msgstr "%s: errore: non è possibile impostare swap in nessuna posizione?\n"
 
-#: disk-utils/mkswap.c:592
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:591
+#, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
-"%s: errore: la dimensione %ld è maggiore rispetto a quella del dispositivo %"
-"d\n"
+"%s: errore: la dimensione %lu è maggiore di quella del dispositivo %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: errore: versione sconosciuta %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: errore: l'area di swap deve equivalere almeno a %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: attenzione: troncamento area swap a %ldkB\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: errore: non è possibile impostare swap in nessuna posizione?\n"
+msgstr ""
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "Non si cercherà di creare uno swapdevice su '%s'"
+msgstr "Non si cercherà di creare uno swapdevice su '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "errore irreversibile: impossibile leggere la prima pagina"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1219,125 +1218,84 @@ msgstr ""
 "Nessuno swap creato. Se si desidera creare uno swap v0 su quel dispositivo,\n"
 "utilizzare l'opzione -f per forzare l'operazione.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossibile impostare lo spazio-swap: non leggibile"
 
-#: disk-utils/mkswap.c:700
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:699
+#, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "Impostazione spazio di swap versione %d, dimensione = %ld byte\n"
+msgstr "Impostazione spazio di swap versione %d, dimensione = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "impossibile riavvolgere il dispositivo swap"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "impossibile scrivere sulla pagina di firma"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync non riuscito "
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Numero non valido: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Errore di sintassi: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Parametro non impostato: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, fuzzy, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "utilizzo: %s [ -p ] dev name\n"
-
-#: disk-utils/setfdprm.c:102
-#, fuzzy, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "       %s [ -c | -y | -n | -d ] dev\n"
-
-#: disk-utils/setfdprm.c:107
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "       %s [ -c | -y | -n ] dev\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilizzabile"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Spazio disponibile"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
-#, fuzzy
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
-msgstr "Linux ext2"
+msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
-#, fuzzy
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
-msgstr "Linux"
+msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
-#, fuzzy
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
-msgstr "Linux"
+msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
-#, fuzzy
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
-msgstr "Linux"
+msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
-msgstr "Il disco è stato cambiato.\n"
+msgstr "Il disco è stato cambiato.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Riavviare il sistema per assicurarsi che la tabella delle partizioni sia "
 "aggiornata correttamente.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1350,339 +1308,312 @@ msgstr ""
 "partizione DOS 6.x, consultare la pagina del manuale cfdisk\n"
 "per ulteriori informazioni.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERRORE IRREVERSIBILE"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Premere qualsiasi tasto per uscire da cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
-msgstr "Ricerca sull'unità disco impossibile"
+msgstr "Ricerca sull'unità disco impossibile"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
-msgstr "Impossibile leggere l'unità disco"
+msgstr "Impossibile leggere l'unità disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
-msgstr "Impossibile scrivere sull'unità disco"
+msgstr "Impossibile scrivere sull'unità disco"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Troppe partizioni"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "La partizione inizia prima del settore 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "La partizione termina prima del settore 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "La partizione inizia dopo la fine del disco"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "La partizione termina dopo la fine del disco"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "le partizioni logiche non sono nell'ordine del disco"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "sovrapposizione delle partizioni logiche"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "sovrapposizione delle partizioni logiche ampliate"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!!! Errore interno durante la creazione di un'unità logica con partizione "
+"!!!! Errore interno durante la creazione di un'unità logica con partizione "
 "non estesa !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
-"Impossibile creare un'unità logica in questo caso - si creerebbero due "
+"Impossibile creare un'unità logica in questo caso - si creerebbero due "
 "partizioni estese"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
-msgstr "Voce di menu troppo lunga. Il menu può apparire strano."
+msgstr "Voce di menu troppo lunga. Il menu può apparire strano."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "Menu senza direzione. È predefinita quella orizzontale."
+msgstr "Menu senza direzione. È predefinita quella orizzontale."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Tasto non valido"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Premere un tasto per continuare"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Creare una nuova partizione primaria"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logica"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Creare una nuova partizione logica"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Annulla"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Non creare una partizione"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Errore interno !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Dimensione (in MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Inizio"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Aggiungere la partizione all'inizio dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Aggiungere la partizione alla fine dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
-msgstr "Non c'è spazio per creare una partizione estesa"
+msgstr "Non c'è spazio per creare una partizione estesa"
 
-#: fdisk/cfdisk.c:1565
-#, fuzzy
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
-msgstr "nessuna tabella delle partizioni presente.\n"
+msgstr "Nessuna tabella delle partizioni.\n"
 
-#: fdisk/cfdisk.c:1569
-#, fuzzy
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
-msgstr "Firma danneggiata sulla tabella delle partizioni"
+msgstr "Nessuna tavola delle partizioni. Si inizia con una tavola vuota."
 
-#: fdisk/cfdisk.c:1579
-#, fuzzy
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
-msgstr "Stampare la tabella delle partizioni"
+msgstr "Segnatura danneggiata nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:1583
-#, fuzzy
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
-msgstr "nessuna tabella delle partizioni presente.\n"
+msgstr "Tipo di tabella delle partizioni sconosciuto"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr ""
+msgstr "Si vuole iniziare con una tabella vuota [y/N]?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
-"Si è specificato un numero di cilindri superiore a quelli contenuti su disco"
+"Si è specificato un numero di cilindri superiore a quelli contenuti su disco"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
-msgstr "Impossibile aprire l'unità disco"
+msgstr "Impossibile aprire l'unità disco"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aperto in sola lettura - scrittura non autorizzata"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Impossibile ottenere la dimensione del disco"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partizione primaria danneggiata"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partizione logica danneggiata"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Attenzione!!  I dati sul disco potrebbero venire eliminati!"
+msgstr "Attenzione!! I dati sul disco potrebbero venire eliminati!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Scrivere la tabella delle partizioni su disco? (si o no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Scrittura tabella delle partizioni su disco non effettuata"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "si"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Inserire `si' (senza accento) o `no'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Scrittura tabella delle partizioni su disco in corso..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Eseguita l'operazione di scrittura tabella delle partizioni su disco"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
-"Eseguita l'operazione di scrittura tabella delle partizioni, ma non è "
-"riuscita la rilettura della tabella. Riavviare per aggiornare la tabella."
+"Tabella scritta, ma la rilettura è fallita. Riavviare per aggiornare la "
+"tabella."
 
-#: fdisk/cfdisk.c:1916
-#, fuzzy
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Non è possibile avviare in modo preciso una partizione primaria. DOS MBR non "
-"può avviarla."
+"Nessuna partizione primaria è impostata come avviabile. DOS MBR non può\n"
+"avviarla."
 
-#: fdisk/cfdisk.c:1918
-#, fuzzy
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Non è possibile avviare in modo preciso una partizione primaria. DOS MBR non "
-"può avviarla."
+"Più di una partizione primaria è impostata come avviabile. DOS MBR non può\n"
+"avviarla."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Inserire il nome del file o premere RETURN (INVIO) per visualizzare sullo "
 "schermo:"
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Impossibile aprire il file '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
-msgstr "Unità disco: %s\n"
+msgstr "Unità disco: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Settore 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Settore %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Nessuno   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primario"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logico"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Avvio"
 
-#: fdisk/cfdisk.c:2077
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2075
+#, c-format
 msgid "(%02X)"
-msgstr "Unk(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
-#, fuzzy
+#: fdisk/cfdisk.c:2077
 msgid "None"
-msgstr "Fine"
+msgstr "Nessuno"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabella delle partizioni per %s\n"
 
-#: fdisk/cfdisk.c:2116
-#, fuzzy
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
-msgstr "           Primo    Ultimo\n"
+msgstr ""
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1691,7 +1622,7 @@ msgstr ""
 " # Tipo     settore   settore   offset  lunghezza   tipo di filesystem  "
 "(ID)   flag\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1700,493 +1631,483 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
-#, fuzzy
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
-msgstr "         ---Avvio---      ----Chiusura----    Numero avvio di\n"
+msgstr ""
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr ""
 " # Flag testina sett. cil.   ID  testina sett. cil.    settore  settori\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Grezzo"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Stampare la tabella utilizzando il formato dati grezzi"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Settori"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Stampare la tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabella"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Stampare la tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Non stampare la tabella"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Schermata Guida per cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
-"Questo è cfdisk, un programma per la partizione dei dischi basato su curses"
+"Questo è cfdisk, un programma per la partizione dei dischi basato su curses"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 "consente di creare, cancellare e modificare le partizioni sul disco fisso"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
-msgstr "unità disco."
+msgstr "unità disco."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Comando     significato"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr " b          Cambia flag avviabile per la partizione corrente"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr " d          Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr " g          cambio cilindri, testine, parametri settori-per-traccia"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 "            ATTENZIONE: questa opzione dovrebbe essere utilizzata solo da "
 "persone"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
-msgstr "            esperte."
+msgstr "            esperti."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr " h          Stampare questa schermata"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 " m          Massimizzare l'utilizzo del disco della partizione corrente"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
-msgstr "            Nota: questo può rendere la partizione incompatibile con"
+msgstr "            Nota: questo può rendere la partizione incompatibile con"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "            DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr " n          Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr " p          Stampa della tabella delle partizioni su schermo o su file"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "            Vi sono diversi altri formati per la partizione"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "            tra i quali scegliere:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
-"               r - dati grezzi (esattamente ciò che verrebbe scritto sul "
+"               r - dati grezzi (esattamente ciò che verrebbe scritto sul "
 "disco)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "               s - Tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "               t - Tabella in formato grezzo"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Esce dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr " t          Cambia il tipo di filesystem"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
-" u          Modifica l'unità di visualizzazione della dimensione della "
+" u          Modifica l'unità di visualizzazione della dimensione della "
 "partizione"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "            Ruota attraverso MB, settori e cilindri"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 " W          Scrittura della tabella di partizione sul disco (si deve "
 "inserire la W maiuscola)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
-"            Dato che in questo modo è possibile eliminare dati sul disco, si "
+"            Dato che in questo modo è possibile eliminare dati sul disco, si "
 "deve"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "            confermare o negare la scrittura inserendo `sì' o"
+msgstr "            confermare o negare la scrittura inserendo 'sì' o"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
-msgstr "             `no'"
+msgstr "             'no'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Freccia Su      sposta il cursore alla partizione precedente"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Freccia Giù   sposta il cursore alla partizione successiva"
+msgstr "Freccia Giù   sposta il cursore alla partizione successiva"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ridisegna lo schermo"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Stampa questa schermata"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Nota: è possibile immettere tutti i comandi in maiuscolo o minuscolo"
+msgstr "Nota: è possibile immettere tutti i comandi in maiuscolo o minuscolo"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "lettere maiuscole/minuscole (fatta eccezione per Writes)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cilindri"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Modifica la geometria dei cilindri"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Testine"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Modifica la geometria delle testine"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Modifica la geometria dei settori"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Modifica della geometria eseguita"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Immettere il numero di cilindri: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Valore cilindri non valido"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Immettere il numero delle testine: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Valore testine non valido"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Immettere il numero dei settori per traccia: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Valore settori non valido"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Immettere il tipo di filesystem: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Impossibile cambiare il tipo FS in vuoto"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Impossibile cambiare il tipo FS in espanso"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
-msgstr "NC"
+msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Sconosciuto (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
-msgstr "Unità disco: %s"
+msgstr "Unità disco: %s"
 
-#: fdisk/cfdisk.c:2650
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2648
+#, c-format
 msgid "Size: %lld bytes, %lld MB"
-msgstr "Dimensione: %lld byte"
+msgstr "Dimensioni: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2653
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2651
+#, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
-msgstr "Dimensione: %lld byte"
+msgstr "Dimensioni: %lld byte, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2657
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2655
+#, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
-msgstr "Testine: %d   settori per traccia: %d   cilindri: %d"
+msgstr "Testine: %d   Settori per traccia: %d   Cilindri: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
-msgstr "Tipo di partiz."
+msgstr "Tipo part."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Tipo FS"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etichetta]"
 
-#: fdisk/cfdisk.c:2667
-#, fuzzy
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
-msgstr "  Settori"
+msgstr "    Settori"
 
-#: fdisk/cfdisk.c:2669
-#, fuzzy
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
-msgstr "Cilindri"
+msgstr "  Cilindri"
 
-#: fdisk/cfdisk.c:2671
-#, fuzzy
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
-msgstr "Dimensione (MB)"
+msgstr "  Dim. (MB)"
 
-#: fdisk/cfdisk.c:2673
-#, fuzzy
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
-msgstr "Dimensione (GB)"
+msgstr "  Dim. (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Avviabile"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr " Cambia flag avviabile per la partizione corrente "
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Elimina"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Modifica della geometria del disco (solo per esperti)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Guida"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
-msgstr "Stampa della schermata della guida"
+msgstr "Mostra della schermata della guida"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Massimi."
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
-"Massimizzare l'utilizzo del disco della partizione corrente (solo per "
-"esperti)"
+"Massimizza l'utilizzo del disco della partizione corrente (solo per esperti)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nuova"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Stampa"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Stampa della tabella delle partizioni su schermo o su file"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Esci"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
-msgstr "Esce dal programma senza scrivere nella tabella delle partizioni"
+msgstr "Esci dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Modificare il tipo di filesystem (DOS, Linux, OS/2 e così via)"
+msgstr "Modifica il tipo di filesystem (DOS, Linux, OS/2, ecc.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
-msgstr "Unità"
+msgstr "Unità"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
-"Cambia l'unità di visualizzazione della dimensione della partizione (MB, "
+"Cambia l'unità di visualizzazione della dimensione della partizione (MB, "
 "sett., cil.)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Scrivi"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
-"Scrivere la tabella delle partizioni sul disco (i dati potrebbero venir "
-"eliminati)"
+"Scrivi la tabella delle partizioni sul disco (i dati potrebbero venir persi)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Impossibile rendere questa partizione avviabile"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Impossibile cancellare una partizione vuota"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Impossibile massimizzare questa partizione"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
-msgstr "Questa partizione è utilizzabile"
+msgstr "Questa partizione è utilizzabile"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
-msgstr "Questa partizione è già in uso"
+msgstr "Questa partizione è già in uso"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Impossibile modificare il tipo di una partizione vuota"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Nessun'altra partizione"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Comando non valido"
 
-#: fdisk/cfdisk.c:2892
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2890
+#, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2206,18 +2127,18 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Utilizzo:\n"
+"Uso:\n"
 "Stampa versione:\n"
 "        %s -v\n"
 "Stampa tabella delle partizioni:\n"
 "        %s -P {r|s|t} [opzioni] dispositivo\n"
-"Utilizzo interattivo:\n"
+"Uso interattivo:\n"
 "        %s [opzioni] dispositivo\n"
 "\n"
 "Opzioni:\n"
-"-a: Utilizzo della freccia al posto dell'evidenziazione;\n"
-"-z: Inizio con una tabella delle partizioni vuota, anziché lettura di pt dal "
-"disco;\n"
+"-a: Usa freccia al posto dell'evidenziazione;\n"
+"-z: Inizia con una tabella delle partizioni vuota, anziché leggere la \n"
+"    partizione dal disco;\n"
 "-c C -h H -s S: Sostituisce l'idea del kernel riguardo al numero di "
 "cilindri,\n"
 "                al numero di testine e di settori/traccia.\n"
@@ -2240,12 +2161,12 @@ msgid ""
 msgstr ""
 "\n"
 "\tEsiste un'etichetta AIX valida su questo disco.\n"
-"\tSfortunatamente, in questo momento Linux non è in grado di gestire questi\n"
-"\tdischi.  Ciò nonostante seguono alcuni\n"
+"\tSfortunatamente, in questo momento Linux non è in grado di gestire questi\n"
+"\tdischi.  Ciò nonostante seguono alcuni\n"
 "\tconsigli:\n"
-"\t1. fdisk elimierà il suo contenuto alla scrittura.\n"
+"\t1. fdisk elimierà il suo contenuto alla scrittura.\n"
 "\t2. Assicurarsi che questo disco NON sia ancora\n"
-"\t   una parte vitale del gruppo di volume (altrimenti è possibile\n"
+"\t   una parte vitale del gruppo di volume (altrimenti è possibile\n"
 "\t   che si cancellino anche gli altri dischi, se non soggetti a "
 "mirroring.)\n"
 "\t3. Prima di eliminare questo volume fisico assicurarsi\n"
@@ -2261,9 +2182,9 @@ msgstr ""
 "\n"
 "Etichetta BSD per dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Azione comando"
 
@@ -2273,7 +2194,7 @@ msgstr "   d   eliminanazione di una partizione BSD"
 
 #: fdisk/fdiskbsdlabel.c:131
 msgid "   e   edit drive data"
-msgstr "   e   modifica dei dati dell'unità"
+msgstr "   e   modifica dei dati dell'unità"
 
 #: fdisk/fdiskbsdlabel.c:132
 msgid "   i   install bootstrap"
@@ -2283,10 +2204,9 @@ msgstr "   i   installazione di bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   elenco dei tipi di filesystem conosciuti"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   stampa di questo menu"
 
@@ -2298,14 +2218,14 @@ msgstr "   n   aggiunta di una nuova partizione BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   stampa della tabella delle partizioni BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   uscita senza salvataggio delle modifiche"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   ritorno al menu principale"
 
@@ -2318,9 +2238,8 @@ msgid "   t   change a partition's filesystem id"
 msgstr "   t   modifica dell'id del filesystem di una partizione"
 
 #: fdisk/fdiskbsdlabel.c:141
-#, fuzzy
 msgid "   u   change units (cylinders/sectors)"
-msgstr "   c   modifica del numero di cilindri"
+msgstr "   c   cambia unità (cilindri/settori)"
 
 #: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
@@ -2331,14 +2250,14 @@ msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   collegamento della partizione BSD a una non-BSD"
 
 #: fdisk/fdiskbsdlabel.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s has invalid starting sector 0.\n"
-msgstr "La partizione %s%d ha settore di inizio 0: dato non valido.\n"
+msgstr "La partizione %s ha settore di inizio 0 non valido.\n"
 
 #: fdisk/fdiskbsdlabel.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Lettura del disklabel di %s%d al settore %d.\n"
+msgstr "Lettura del disklabel di %s al settore %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
@@ -2349,13 +2268,13 @@ msgstr "Non esiste partizione *BSD su %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Comando disklabel BSD (m per richiamare la guida): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primo %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Ultimo %s o +size o +sizeM o +sizeK "
@@ -2400,8 +2319,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2435,7 +2352,7 @@ msgstr "rpm: %d\n"
 #: fdisk/fdiskbsdlabel.c:339
 #, c-format
 msgid "interleave: %d\n"
-msgstr " interleave: %d\n"
+msgstr "interleave: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:340
 #, c-format
@@ -2460,7 +2377,7 @@ msgstr "ricerca traccia-a-traccia: %ld\t# millisecondi\n"
 #: fdisk/fdiskbsdlabel.c:346
 #, c-format
 msgid "drivedata: "
-msgstr "datiunità:"
+msgstr "datiunità:"
 
 #: fdisk/fdiskbsdlabel.c:355
 #, c-format
@@ -2472,9 +2389,9 @@ msgstr ""
 "%d partizioni:\n"
 
 #: fdisk/fdiskbsdlabel.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "#        size   offset    fstype   [fsize bsize   cpg]\n"
+msgstr "#       inizio     fine      size     fstype   [fsize bsize   cpg]\n"
 
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
@@ -2502,8 +2419,8 @@ msgstr "settori/traccia"
 msgid "tracks/cylinder"
 msgstr "tracce/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cilindri"
 
@@ -2560,20 +2477,20 @@ msgstr "Bootstrap installato su %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partizione (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
-msgstr "È stato creato il numero massimo di partizioni\n"
+msgstr "È stato creato il numero massimo di partizioni\n"
 
 #: fdisk/fdiskbsdlabel.c:630
 #, c-format
 msgid "This partition already exists.\n"
-msgstr "Questa partizione esiste già.\n"
+msgstr "Questa partizione esiste già.\n"
 
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Attenzione: troppe partizioni (%d, il massimo è %d).\n"
+msgstr "Attenzione: troppe partizioni (%d, il massimo è %d).\n"
 
 #: fdisk/fdiskbsdlabel.c:804
 #, c-format
@@ -2584,8 +2501,7 @@ msgstr ""
 "\n"
 "Sincronizzazione dei dischi.\n"
 
-#: fdisk/fdisk.c:188
-#, fuzzy
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2596,18 +2512,17 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
-"Utilizzo: fdisk [-b SSZ] [-u] DISK     Modifica la tabella delle partizioni\n"
-"       fdisk -l [-b SSZ] [-u] DISK  Elenca la(e) tabella(e) delle "
-"partizioni\n"
-"       fdisk -s PARTITION           Indica la(e) dimensione(i) della "
-"partizione in blocchi\n"
-"       fdisk -v                     Indica la versione di fdisk\n"
-"In questo caso DISK è simile a /dev/hdb o /dev/sda\n"
-"e PARTITION assomiglia a /dev/hda7\n"
-"-u: indica Inizio e Fine con unità di misura settore (invece di cilindro)\n"
-"-b 2048: (per alcune unità MO) utilizzare i settori a 2048 byte\n"
+"Uso:  fdisk [-b SSZ] [-u] DISCO     Modifica la tabella delle partizioni\n"
+"      fdisk -l [-b SSZ] [-u] DISCO  Elenca la tabella delle partizioni\n"
+"      fdisk -s PARTIZIONE           Mostra la dimensione della partizione\n"
+"                                    in blocchi\n"
+"      fdisk -v                      Mostra la versione di fdisk\n"
+"In questo caso DISCO è qualcosa come /dev/hdb o /dev/sda\n"
+"e PARTIZIONE è qualcosa come /dev/hda7\n"
+"-u: indica Inizio e Fine in numero di settori (invece che in cilindri)\n"
+"-b 2048: (per alcune unità MO) usa settori a 2048 byte\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2616,221 +2531,205 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"Utilizzo: fdisk [-l] [-b SSZ] [-u] dispositivo\n"
+"Uso: fdisk [-l] [-b SSZ] [-u] dispositivo\n"
 "Per es.: fdisk /dev/hda  (per il primo disco IDE)\n"
 "  o: fdisk /dev/sdc  (per il terzo disco SCSI)\n"
-"  o: fdisk /dev/eda  (per la prima unità PS/2 ESDI)\n"
+"  o: fdisk /dev/eda  (per la prima unità PS/2 ESDI)\n"
 "  o: fdisk /dev/rd/c0d0  o: fdisk /dev/ida/c0d0  (per i dispositivi RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Impossibile leggere %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ricerca impossibile su %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Impossibile scrivere su %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl non riuscito su %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Impossibile allocare altra memoria\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Errore irreversibile\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   attivazione/disattivazione di un flag di sola lettura"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   modifica di bsd disklabel"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   attivazione/disattivazione del flag montabile"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   cancellazione di una partizione"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   elenco dei tipi di partizione conosciuti"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   aggiunta di una nuova partizione"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   creazione di una nuova tabella delle partizioni DOS vuota"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   stampa della tabella delle partizioni"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   creazione di una nuova disklabel Sun vuota"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
-msgstr "   t   modifica dell'id di sistema di una partizione"
+msgstr "   t   modifica l'id di sistema di una partizione"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
-msgstr "   u   modifica delle unità di visualizzazione/di immissione"
+msgstr "   u   modifica delle unità di visualizzazione/di immissione"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
-msgstr "   v   verifica della tabella delle partizioni"
+msgstr "   v   verifica la tabella delle partizioni"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
-msgstr "   w   scrittura della tabella su disco e uscita"
+msgstr "   w   scrivi la tabella su disco ed esci"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr " x   ulteriori funzioni (solo per esperti)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
-msgstr "   a   selezione della partizione che è possibile avviare"
+msgstr "   a   selezione della partizione che è possibile avviare"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   modifica della voce bootfile"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   selezione della partizione swap sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a  Cambia bootable flag"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   cambia il flag compatibile con il dos"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifica del numero di cilindri alternativi"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   modifica del numero di cilindri"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   stampa dei dati grezzi nella tabella delle partizioni"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifica del numero dei settori supplementari per cilindro"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   modifica del numero di testine"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   modifica del fattore di interleave"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
-msgstr "   o   modifica della velocità di rotazione (rpm)"
+msgstr "   o   modifica della velocità di rotazione (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifica del numero di settori/traccia"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifica del numero di cilindri fisici"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   spostamento dell'inizio di dati in una partizione"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   elenco delle partizioni estese"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
-#, fuzzy
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
-msgstr "   g   creazione di una tabella delle partizioni IRIX"
+msgstr "   g   crea una tabella delle partizioni IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
-#, fuzzy
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
-msgstr "   p   stampa della tabella delle partizioni"
+msgstr "   f   aggiusta l'ordine delle partizioni"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Si devono impostare"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "testine"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "settori"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 "%s%s.\n"
-"È possibile effettuare questa operazione dal menu delle funzioni "
+"È possibile effettuare questa operazione dal menu delle funzioni "
 "supplementari.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2842,33 +2741,33 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Offset errato nella partizione estesa primaria\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 "Attenzione: puntatore di collegamento supplementare nella tabella delle "
 "partizioni %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Attenzione: i dati supplementari nella tabella delle partizioni %d vengono "
 "ignorati\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2877,56 +2776,56 @@ msgid ""
 "\n"
 msgstr ""
 "Creazione di una nuova disklabel DOS. Le modifiche rimarranno memorizzate\n"
-"solamente fino a quando si decide di scriverle. Dopodiché, ovviamente, il\n"
-"contenuto precedente non potrà essere recuperato.\n"
+"solamente fino a quando si decide di scriverle. Dopodiché, ovviamente, il\n"
+"contenuto precedente non potrà essere recuperato.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
-msgstr "Nota: la dimensione del settore è %d (non %d)\n"
+msgstr "Nota: la dimensione del settore è %d (non %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Impossibile scrivere la tabella delle partizioni.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
-#, fuzzy, c-format
+#: fdisk/fdisk.c:964
+#, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
-"Il dispositivo non contiene né una tabella delle partizioni DOS, né una "
-"disklabel Sun o SGI valide\n"
+"Il dispositivo non contiene né una tabella delle partizioni DOS valida, né "
+"una disklabel Sun, SGI od OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Errore interno\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr "La partizione estesa supplementare viene ignorata %d\n"
+msgstr "Partizione estesa supplementare ignorata %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 "Attenzione: il flag 0x%04x non valido della tabella delle partizioni %d "
-"verrà corretto con w(rite)\n"
+"verrà corretto con w(rite)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2935,83 +2834,83 @@ msgstr ""
 "\n"
 "ricevuto EOF tre volte - uscita in corso..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Codice esadecimale (digitare L per elencare i codici): "
 
-#: fdisk/fdisk.c:1105
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1107
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, predefinito %d): "
+msgstr "%s (%u-%u, predefinito %u): "
 
-#: fdisk/fdisk.c:1172
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1174
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Utilizzo del valore predefinito %d\n"
+msgstr "Utilizzo del valore predefinito %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valore fuori intervallo.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Numero della partizione"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Attenzione: la partizione %d ha tipo vuoto\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
+#, c-format
 msgid "Selected partition %d\n"
-msgstr "La partizione estesa supplementare viene ignorata %d\n"
+msgstr "Partizione selezionata %d\n"
 
-#: fdisk/fdisk.c:1222
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1224
+#, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nessuna partizione definita\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
-msgstr ""
+msgstr "Tutte le partizioni primarie sono state già definite!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "settore"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr "Modifica delle unità di visualizzazione/immissione su %s\n"
+msgstr "Modifica delle unità di visualizzazione/immissione su %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr "ATTENZIONE: la partizione %d è una partizione estesa\n"
+msgstr "ATTENZIONE: la partizione %d è una partizione estesa\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Impostato il flag compatibile con DOS\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
-msgstr "Il flag compatibile con DOS non è impostato\n"
+msgstr "Il flag compatibile con DOS non è impostato\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partizione %d non esiste ancora!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3021,19 +2920,19 @@ msgid ""
 msgstr ""
 "Tipo 0 significa spazio disponibile per diversi sistemi\n"
 "(ma non per Linux). Avere partizioni di\n"
-"tipo 0 probabilmente non è consigliabile. È possibile eliminare\n"
+"tipo 0 probabilmente non è consigliabile. È possibile eliminare\n"
 "una partizione utilizzando il comando `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
-"Non è possibile trasformare una partizione in una estesa o viceversa\n"
+"Non è possibile trasformare una partizione in una estesa o viceversa\n"
 "Prima bisogna eliminarla.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3041,10 +2940,10 @@ msgid ""
 "\n"
 msgstr ""
 "Poniamo di lasciare la partizione 3 come disco intero (5),\n"
-"poiché SunOS/Solaris lo prevede e ciò è gradito anche a Linux.\n"
+"poiché SunOS/Solaris lo prevede e ciò è gradito anche a Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3052,124 +2951,128 @@ msgid ""
 "\n"
 msgstr ""
 "Poniamo di lasciare la partizione 9 come intestazione di volume (0),\n"
-"e la partizione 11 come volume intero (6) poiché IRIX lo prevede.\n"
+"e la partizione 11 come volume intero (6) poiché IRIX lo prevede.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Modificato il tipo di sistema della partizione %d in %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "La partizione %d ha diversi elementi iniziali fisici/logici (non Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "    phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logico=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partizione %d ha diversi elementi finali fisici/logici:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partizione %i non inizia al limite del cilindro:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "dovrebbe essere (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1518
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "La partizione %d non termina al limite del cilindro.\n"
+msgstr "La partizione %i non termina al limite del cilindro.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "dovrebbe essere (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
+"\n"
+"Disco %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1535
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1537
+#, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 "\n"
-"Disco %s: %d testine, %d settori, %d cilindri\n"
+"Disco %s: %ld.%ld GB, %lld byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1539
+#, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
-msgstr ""
-"\n"
-"Disco %s: %d testine, %d settori, %d cilindri\n"
-"\n"
+msgstr "%d testine, %d settori/tracce, %d cilindri"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
-msgstr ""
+msgstr ", totale %llu settori"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
+"Unità = %s di %d * %d = %d byte\n"
+"\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
-msgstr ""
+msgstr "Niente da fare. L'ordine è già corretto.\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
 "Probably you selected the wrong device.\n"
 "\n"
 msgstr ""
+"Questo non sembra una tavola delle partizioni.\n"
+"Probabilmente è stato scelto il dispositivo sbagliato.\n"
+"\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Avvio    Inizio    Fine   Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1759
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1761
+#, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
-msgstr "le partizioni logiche non sono nell'ordine del disco"
+msgstr ""
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3180,83 +3083,83 @@ msgstr ""
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr " Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Attenzione: la partizione %d contiene il settore 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Partizione %d: testina %d più grande del massimo %d\n"
+msgstr "Partizione %d: testina %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
-msgstr "Partizione %d: settore %d più grande del massimo %d\n"
+msgstr "Partizione %d: settore %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
-msgstr "Partizione %d: cilindro %d più grande del massimo %d\n"
+msgstr "Partizione %d: cilindro %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partizione %d: dissenso dei settori precedenti %d con il totale %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Attenzione: la partizione %d si sovrappone alla partizione %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Attenzione: la partizione %d è vuota\n"
+msgstr "Attenzione: la partizione %d è vuota\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
-msgstr "La partizione logica %d non è interamente nella partizione %d\n"
+msgstr "La partizione logica %d non è interamente nella partizione %d\n"
 
-#: fdisk/fdisk.c:1900
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1902
+#, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
-msgstr "Numero %d totale dei settori allocati superiore al massimo %d\n"
+msgstr "Numero totale dei settori allocati %d superiore al massimo %lld\n"
 
-#: fdisk/fdisk.c:1903
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1905
+#, c-format
 msgid "%lld unallocated sectors\n"
-msgstr "%d settori non allocati\n"
+msgstr "%lld settori non allocati\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
-"La partizione %d è già definita.  Cancellarla prima di riaggiungerla.\n"
+"La partizione %d è già definita.  Cancellarla prima di riaggiungerla.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
-msgstr "Il settore %d è già allocato\n"
+msgstr "Il settore %d è già allocato\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Non ci sono settori liberi disponibili\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3265,24 +3168,24 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Si devono eliminare alcune partizioni e aggiungere anzitutto una partizione "
 "estesa\n"
 
-#: fdisk/fdisk.c:2093
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2095
+#, c-format
 msgid "All logical partitions are in use\n"
-msgstr "le partizioni logiche non sono nell'ordine del disco"
+msgstr "Tutte le partizioni logiche sono usate\n"
 
-#: fdisk/fdisk.c:2094
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2096
+#, c-format
 msgid "Adding a primary partition\n"
-msgstr "Partizione primaria danneggiata"
+msgstr "Aggiunta di una partizione primaria\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3293,34 +3196,34 @@ msgstr ""
 "   %s\n"
 "   p   partizione primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logica (5 od oltre)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr " e   estesa"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Numero di partizioni non valido per il tipo `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
-"La tabella delle partizioni è stata alterata!\n"
+"La tabella delle partizioni è stata alterata!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chiamata di ioctl() per rileggere la tabella delle partizioni.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3328,8 +3231,13 @@ msgid ""
 "The kernel still uses the old table.\n"
 "The new table will be used at the next reboot.\n"
 msgstr ""
+"\n"
+"ATTENZIONE: Rilettura della tabella delle partizioni fallita con errore %d: %"
+"s.\n"
+"Il kernel usa ancora la tabella precedente.\n"
+"La nuova tabella sarà usata al prossimo riavvio.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3342,78 +3250,80 @@ msgstr ""
 "consultare la pagina del manuale fdisk per ulteriori\n"
 "informazioni.\n"
 
-#: fdisk/fdisk.c:2197
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2199
+#, c-format
 msgid ""
 "\n"
 "Error closing file\n"
-msgstr "Errore durante la chiusura di %s\n"
+msgstr ""
+"\n"
+"Errore durante la chiusura del file\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Sincronizzazione dei dischi in corso.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partizione %d non ha area dati\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nuovo inizio dati"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Comando per esperti (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Numero di cilindri"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Numero di testine"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Numero di settori"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
-"Attenzione: impostare l'offset di settore per assicurare compatibilità con "
+"Attenzione: impostare l'offset di settore per assicurare compatibilità con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Il disco %s non contiene una tabella delle partizioni valida\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2458
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2460
+#, c-format
 msgid "%c: unknown command\n"
-msgstr "%s: comando sconosciuto: %s\n"
+msgstr "%c: comando sconosciuto\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Questo kernel trova la dimensione del settore in maniera indipendente - - "
 "opzione b ignorata\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3422,35 +3332,34 @@ msgstr ""
 "Attenzione: l'opzione -b (mpostazione della dimensione del settore) si "
 "dovrebbe utilizzare con un dispositivo specificato\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Comando (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 "\n"
-"Il file d'avvio corrente è: %s\n"
+"Il file d'avvio corrente è: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Immettere il nome del nuovo file d'avvio:"
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "File d'avvio immutato\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3506,37 +3415,32 @@ msgid "SGI xfs"
 msgstr "SGI xfs"
 
 #: fdisk/fdisksgilabel.c:91
-#, fuzzy
 msgid "SGI xfslog"
-msgstr "SGI xfs"
+msgstr "SGI xfslog"
 
 #: fdisk/fdisksgilabel.c:92
-#, fuzzy
 msgid "SGI xlv"
-msgstr "SGI xlvol"
+msgstr "SGI xlv"
 
 #: fdisk/fdisksgilabel.c:93
-#, fuzzy
 msgid "SGI xvm"
-msgstr "SGI xlvol"
+msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativo"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
-#, fuzzy
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
-msgstr "Linux"
+msgstr "Linux LVM"
 
 #: fdisk/fdisksgilabel.c:97
-#, fuzzy
 msgid "Linux RAID"
-msgstr "Linux"
+msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:163
 #, c-format
@@ -3544,8 +3448,8 @@ msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
-"Secondo la ditta MIPS Computer Systems, Inc l'etichetta non deve contenere "
-"più di512 byte\n"
+"Secondo MIPS Computer Systems, Inc l'etichetta non deve contenere più di 512 "
+"byte\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
@@ -3553,7 +3457,7 @@ msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Rilevato un disklabel sgi con checksum errato.\n"
 
 #: fdisk/fdisksgilabel.c:200
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors\n"
@@ -3568,11 +3472,11 @@ msgstr ""
 "%d cilindri, %d cilindri fisici\n"
 "%d sett/cil supplementari, interleave %d:1\n"
 "%s\n"
-"Unità = %s di %d * 512 byte\n"
+"Unità = %s di %d * %d byte\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
@@ -3581,17 +3485,17 @@ msgid ""
 msgstr ""
 "\n"
 "Disco %s (disk label SGI): %d testine, %d settori, %d cilindri\n"
-"Unità = %s di %d * 512 byte\n"
+"Unità = %s di %d * %d byte\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:220
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "----- partitions -----\n"
 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
 "----- partizioni -----\n"
-"%*s  Info      Inizio       Fine   Settori  Id  Sistema\n"
+"Pt# %*s  Info     Inizio      Fine  Settori  Id  Sistema\n"
 
 #: fdisk/fdisksgilabel.c:242
 #, fuzzy, c-format
@@ -3609,7 +3513,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s settore%5u dimensione%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3651,7 +3554,7 @@ msgstr ""
 "\n"
 "\tSi tenga conto del fatto che non viene verificata l'esistenza del file di "
 "avvio.\n"
-"\tL'impostazione predefinita di SGI è \"/unix\" e per il backup \"/unix.save"
+"\tL'impostazione predefinita di SGI è \"/unix\" e per il backup \"/unix.save"
 "\".\n"
 
 #: fdisk/fdisksgilabel.c:348
@@ -3666,9 +3569,9 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:438
 #, c-format
 msgid "More than one entire disk entry present.\n"
-msgstr "Presente più di una voce disco intero.\n"
+msgstr "Presente più di una voce disco intero.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nessuna partizione definita\n"
@@ -3693,8 +3596,8 @@ msgid ""
 "The entire disk partition is only %d diskblock large,\n"
 "but the disk is %d diskblocks long.\n"
 msgstr ""
-"La partizione del disco intero è solamente di %d blocchi,\n"
-"ma il disco è di %d blocchi.\n"
+"La partizione del disco intero è solamente di %d blocchi,\n"
+"ma il disco è di %d blocchi.\n"
 
 #: fdisk/fdisksgilabel.c:465
 #, c-format
@@ -3717,9 +3620,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Le partizioni %d e %d si sovrappongono di %d settori.\n"
 
 #: fdisk/fdisksgilabel.c:496 fdisk/fdisksgilabel.c:514
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Intervallo di %8d settori non utilizzato - settori %8d-%d\n"
+msgstr "Intervallo di %8u settori non utilizzato - settori %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:525
 #, c-format
@@ -3737,7 +3640,7 @@ msgid ""
 "The swap partition does not exist.\n"
 msgstr ""
 "\n"
-"La partizione swap non esiste.\n"
+"La partizione di swap non esiste.\n"
 
 #: fdisk/fdisksgilabel.c:532
 #, c-format
@@ -3746,18 +3649,17 @@ msgid ""
 "The swap partition has no swap type.\n"
 msgstr ""
 "\n"
-"La partizione swap non ha tipo swap.\n"
+"La partizione di swap non ha tipo swap.\n"
 
 #: fdisk/fdisksgilabel.c:535
 #, c-format
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr "\tSi è selezionato un nome file di avvio non comune.\n"
+msgstr "\tSi è selezionato un nome file di avvio non comune.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "È possibile modificare solamente il tag delle partizioni non vuote.\n"
+msgstr "È possibile modificare solamente il tag delle partizioni non vuote.\n"
 
 #: fdisk/fdisksgilabel.c:550
 msgid ""
@@ -3768,22 +3670,21 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 "Si raccomanda che la partizione in offset 0\n"
-"sia di tipo \"SGI volhdr\", il sistema IRIX si baserà su di essa per\n"
+"sia di tipo \"SGI volhdr\", il sistema IRIX si baserà su di essa per\n"
 "recuperare dalla directory gli strumenti standalone come sash e fx.\n"
-"Solamente la sezione dell'intero disco \"SGI volume\" può violarla.\n"
-"Digitare YES (sì) se si è certi di voler codificare questa partizione in "
+"Solamente la sezione dell'intero disco \"SGI volume\" può violarla.\n"
+"Digitare YES (sì) se si è certi di voler codificare questa partizione in "
 "modo differente.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr ""
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr ""
-"Si è a conoscenza del fatto che sul disco esiste una sovrapposizione di "
+"Si è a conoscenza del fatto che sul disco esiste una sovrapposizione di "
 "partizioni?\n"
 
 #: fdisk/fdisksgilabel.c:637
@@ -3796,7 +3697,7 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:642
 #, c-format
 msgid "The entire disk is already covered with partitions.\n"
-msgstr "L'intero disco è già coperto da partizioni.\n"
+msgstr "L'intero disco è già coperto da partizioni.\n"
 
 #: fdisk/fdisksgilabel.c:646
 #, c-format
@@ -3818,7 +3719,7 @@ msgstr ""
 #, c-format
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
-"Si avrà una sovrapposizione di partizioni sul disco. Risolvere anzitutto "
+"Si avrà una sovrapposizione di partizioni sul disco. Risolvere anzitutto "
 "questo problema.\n"
 
 #: fdisk/fdisksgilabel.c:676
@@ -3827,16 +3728,16 @@ msgid " Last %s"
 msgstr " Ultimo %s"
 
 #: fdisk/fdisksgilabel.c:706
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
 "content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Creazione di una nuova disklabel SGI. Le modifiche rimarranno memorizzate\n"
-"solamente fino a quando si decide di scriverle. Dopodiché, ovviamente, il\n"
-"contenuto precedente sarà definitivamente perso.\n"
+"Creazione di una nuova disklabel SGI. Le modifiche rimarranno in memoria\n"
+"fino a quando si decide di scriverle. Dopodiché, ovviamente, il contenuto\n"
+"precedente sarà definitivamente perso.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:728
@@ -3857,44 +3758,43 @@ msgstr "Tentativo di mantenere i parametri della partizione %d in corso.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tINIZIO=%d\tLUNGHEZZA=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Vuoto"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disco intero"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Autorilevamento raid di Linux"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3907,12 +3807,12 @@ msgstr ""
 "per es. testine, settori, cilindri e partizioni\n"
 "o forzare un'etichetta nuova (comando s nel menu principale)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "L'autoconfigurazione ha trovato un %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3920,116 +3820,116 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Creazione di una nuova disklabel DOS. Le modifiche rimarranno memorizzate\n"
-"solamente fino a quando si decide di scriverle. Dopodiché, chiaramente, il\n"
-"contenuto precedente non sarà recuperabile.\n"
+"Creazione di una nuova disklabel sun. Le modifiche rimarranno memorizzate\n"
+"solamente fino a quando si decide di scriverle. Dopodiché, chiaramente, il\n"
+"contenuto precedente non sarà recuperabile.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
-"Tipo di unità\n"
+"Tipo di unità\n"
 "   ?   auto configure\n"
 "   0   custom (con le impostazioni predefinite rilevate dell'hardware)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Selezione tipo (? per auto, 0 per custom): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Autoconfigurazione non riuscita.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Settori/traccia"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cilindri fisici"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
-msgstr "Velocità di rotazione (rpm)"
+msgstr "Velocità di rotazione (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Fattore di interleave"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Settori supplementari per cilindro"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
-msgstr "È possibile modificare tutti i parametri disco dal menu x"
+msgstr "È possibile modificare tutti i parametri disco dal menu x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "floppy da 3,5\""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partizione %d non finisce al limite del cilindro\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partizione %d si sovrappone ad altre nei settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervallo inutilizzato - settori 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervallo inutilizzato - settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
-"Altre partizioni coprono già il disco intero.\n"
+"Altre partizioni coprono già il disco intero.\n"
 "Eliminarne alcune/rimpicciolirle prima di riprovare.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
 "%d %s covers some other partition. Your entry has been changed\n"
 "to %d %s\n"
 msgstr ""
-"Non si è coperto l'intero disco con la terza partizione, ma il valore\n"
-"%d %s copre alcune altre partizioni. La voce immessa è stata cambiata\n"
+"Non si è coperto l'intero disco con la terza partizione, ma il valore\n"
+"%d %s copre alcune altre partizioni. La voce immessa è stata cambiata\n"
 "in %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
-"Se si vuole mantenere la compatibilità con SunOS/Solaris, prendere\n"
+"Se si vuole mantenere la compatibilità con SunOS/Solaris, prendere\n"
 "in considerazione di lasciare questa partizione come disco intero (5), "
 "partendo da 0, con %u settori\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4042,10 +3942,10 @@ msgstr ""
 "posizione dello swap Linux\n"
 "potrebbe provocare l'eliminazione della tabelle delle partizioni e del "
 "bootblock.\n"
-"Digitare YES  (sì) se si è certi di volere che quella partizione\n"
+"Digitare YES  (sì) se si è certi di volere che quella partizione\n"
 "venga codificata con 82 (swap Linux ): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4061,10 +3961,10 @@ msgstr ""
 "%d cilindri, %d cilindri alternativi, %d cilindri fisici\n"
 "%d sett./cil. supplementari, interleave %d:1\n"
 "%s\n"
-"Unità = %s di %d * 512 byte\n"
+"Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4074,19 +3974,19 @@ msgid ""
 msgstr ""
 "\n"
 "Disco %s (etichetta disco Sun): %d testine, %d settori, %d cilindri\n"
-"Unità = %s di %d * 512 byte\n"
+"Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Inizio       Fine    Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Numero di cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Numero dei cilindri fisici"
 
@@ -4110,52 +4010,41 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Esteso"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX avviabile"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-#, fuzzy
 msgid "W95 FAT32"
-msgstr "Win95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-#, fuzzy
 msgid "W95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-#, fuzzy
 msgid "W95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-#, fuzzy
 msgid "W95 Ext'd (LBA)"
-msgstr "Win95 Ext'd (LBA)"
+msgstr "W95 Esteso (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -4183,22 +4072,19 @@ msgstr "HPFS/NTFS nascosto"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
-msgstr ""
+msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-#, fuzzy
 msgid "Hidden W95 FAT32"
-msgstr "Win95 FAT32 nascosto"
+msgstr "W95 FAT32 nascosto"
 
 #: fdisk/i386_sys_types.c:29
-#, fuzzy
 msgid "Hidden W95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA) nascosto"
+msgstr "W95 FAT32 (LBA) nascosto"
 
 #: fdisk/i386_sys_types.c:30
-#, fuzzy
 msgid "Hidden W95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA) nascosto"
+msgstr "W95 FAT16 (LBA) nascosto"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4206,7 +4092,7 @@ msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
 msgid "Plan 9"
-msgstr ""
+msgstr "Plan 9"
 
 #: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
@@ -4244,12 +4130,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4270,8 +4154,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4281,7 +4163,6 @@ msgstr " SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD o SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4302,16 +4183,13 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Vecchio Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / vecchio Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
-#, fuzzy
 msgid "Linux swap / Solaris"
-msgstr "Linux swap"
+msgstr "Linux swap / Solaris"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
@@ -4326,9 +4204,8 @@ msgid "NTFS volume set"
 msgstr "set volume NTFS"
 
 #: fdisk/i386_sys_types.c:62
-#, fuzzy
 msgid "Linux plaintext"
-msgstr "Linux ext2"
+msgstr "Linux plaintext"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4338,22 +4215,18 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
-#, fuzzy
 msgid "BSD/OS"
-msgstr "BSD/386"
+msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "Ibernazione IBM Thinkpad"
 
 #: fdisk/i386_sys_types.c:68
 msgid "FreeBSD"
-msgstr ""
+msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4364,16 +4237,15 @@ msgstr "NeXTSTEP"
 
 #: fdisk/i386_sys_types.c:71
 msgid "Darwin UFS"
-msgstr ""
+msgstr "Darwin UFS"
 
 #: fdisk/i386_sys_types.c:72
-#, fuzzy
 msgid "NetBSD"
-msgstr "OpenBSD"
+msgstr "NetBSD"
 
 #: fdisk/i386_sys_types.c:73
 msgid "Darwin boot"
-msgstr ""
+msgstr "Darwin boot"
 
 #: fdisk/i386_sys_types.c:74
 msgid "BSDI fs"
@@ -4385,15 +4257,15 @@ msgstr "BSDI swap"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Boot Wizard hidden"
-msgstr ""
+msgstr "Boot Wizard hidden"
 
 #: fdisk/i386_sys_types.c:77
 msgid "Solaris boot"
-msgstr ""
+msgstr "Solaris boot"
 
 #: fdisk/i386_sys_types.c:78
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #: fdisk/i386_sys_types.c:79
 msgid "DRDOS/sec (FAT-12)"
@@ -4413,194 +4285,178 @@ msgstr "Syrinx"
 
 #: fdisk/i386_sys_types.c:83
 msgid "Non-FS data"
-msgstr ""
+msgstr "Non-FS data"
 
 #: fdisk/i386_sys_types.c:84
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
-msgstr ""
+msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 #, fuzzy
 msgid "BootIt"
 msgstr "Avvio"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "accesso DOS"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
 
 #: fdisk/i386_sys_types.c:94
 msgid "EFI GPT"
-msgstr ""
+msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
-msgstr ""
+msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
-msgstr ""
+msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secondario"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "errore di ricerca su %s - impossibile ricercare a %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr "errore di ricerca: si voleva 0x%08x%08x, si è ottenuto 0x%08x%08x\n"
+msgstr "errore di ricerca: si voleva 0x%08x%08x, si è ottenuto 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "memoria insufficiente - termina\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "errore in lettura su %s - impossibile leggere il settore %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERRORE: il settore %lu non ha una firma msdos\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "errore di scrittura su %s - impossibile scrivere il settore %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "impossibile aprire il file di salvataggio settore partizione (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "errore di scrittura su %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "impossibile eseguire stat del file di ripristino partizione (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "il file di ripristino partizione ha una dimensione errata - il ripristino "
 "non viene effettuato\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "memoria insufficiente?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "impossibile aprire il file di ripristino partizione (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "errore durante la lettura di %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "impossibile aprire il dispositivo %s per scrivere\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "errore durante la scrittura del settore %lu su %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: impossibile ottenere la geometria\n"
 
-#: fdisk/sfdisk.c:470
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:468
+#, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr "Disco %s: impossibile ottenere la geometria\n"
+msgstr "Disco %s: impossibile ottenere la dimensione\n"
 
-#: fdisk/sfdisk.c:503
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:501
+#, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Attenzione: inizio=%d - sembra una partizione piuttosto che\n"
+"Attenzione: inizio=%lu - sembra una partizione piuttosto che\n"
 "l'intero disco. Utilizzare fdisk su di esso probabilmente non ha senso.\n"
 "[Utilizzare l'opzione --force se lo si desidera davvero]\n"
 
-#: fdisk/sfdisk.c:510
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:508
+#, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d testine\n"
+msgstr "Attenzione: HDIO_GETGEO dice che vi sono %lu testine\n"
 
-#: fdisk/sfdisk.c:513
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:511
+#, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d testine\n"
+msgstr "Attenzione: HDIO_GETGEO dice che vi sono %lu settori\n"
 
-#: fdisk/sfdisk.c:517
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:515
+#, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d cilindri\n"
+msgstr "Attenzione: BLKGETSIZE/HDIO_GETGEO dice che vi sono %lu cilindri\n"
 
-#: fdisk/sfdisk.c:522
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:520
+#, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Attenzione: numero improbabile di settori (%d) - solitamente sono al massimo "
+"Attenzione: numero improbabile di settori (%lu) - di solito sono al massimo "
 "63\n"
-"Questo creerà problemi con tutto il software che utilizza l'indirizzamento C/"
-"H/S.\n"
+"Questo creerà problemi con i software che utilizza l'indirizzamento C/H/S.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4609,33 +4465,33 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindri, %lu testine, %lu settori/traccia\n"
 
-#: fdisk/sfdisk.c:608
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:606
+#, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
-"%s della partizione %s ha un valore impossibile per la testina: %d "
-"(dovrebbeessere compreso nell'intervallo 0-%d)\n"
+"%s della partizione %s ha un valore impossibile per la testina: %lu "
+"(dovrebbe essere in 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:611
+#, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
-"%s della partizione %s ha un valore impossibile per il settore: %d "
-"(dovrebbeessere compreso nell'intervallo 1-%d)\n"
+"%s della partizione %s ha un valore impossibile per il settore: %lu "
+"(dovrebbe essere in 1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:616
+#, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
-"%s della partizione %s ha un valore impossibile per i cilindri: %d (dovrebbe "
-"essere compreso nell'intervallo 0-%d)\n"
+"%s della partizione %s ha un valore impossibile per i cilindri: %lu "
+"(dovrebbe essere in 0-%lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4644,405 +4500,408 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Rilettura della tabella delle partizioni in corso...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
-"Il comando per la rilettura della tabella delle partizioni non è riuscito\n"
+"Il comando per la rilettura della tabella delle partizioni non è riuscito\n"
 "Riavviare adesso il sistema prima di utilizzare mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Errore durante la chiusura di %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: nessuna partizione di questo tipo\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "formato non riconosciuto - utilizzo dei settori in corso\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabella delle partizioni di %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato non implementato - utilizzo di %s in corso\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unità = cilindri di %lu byte, blocchi di 1024 byte, conteggiando da %d\n"
+"Unità = cilindri di %lu byte, blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 "   Inizio Boot Dispositivo     Fine   #cilin.   #blocchi   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unità = settori di 512 byte, conteggiando da %d\n"
+"Unità = settori di 512 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Boot Dispositivo    Inizio      Fine  #settori Id  Sistema\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unità = blocchi di 1024 byte, conteggiando da %d\n"
+"Unità = blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Boot Dispositivo   Inizio       Fine  #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:958
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:956
+#, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unità = megabyte da 1048576 byte, blocchi da 1024 byte, conteggiando da %d\n"
+"Unità = mebibyte da 1048576 byte, blocchi da 1024 byte, contando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Inizio Boot Dispositivo   Fine    MB   #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tinizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tendenza: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
-msgstr "Non si è trovata alcuna partizione\n"
+msgstr "Non si è trovata alcuna partizione\n"
 
-#: fdisk/sfdisk.c:1144
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1142
+#, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
 "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 "For this listing I'll assume that geometry.\n"
 msgstr ""
-"Attenzione: la prima partizione sembra sia stata creata\n"
+"Attenzione: la tabella delle partizioni sembra sia stata creata\n"
 "  per C/H/S=*/%ld/%ld (al posto di %ld/%ld/%ld).\n"
-"Per questo elenco viene presunta tale geometria.\n"
+"In questo elenco verrà assunta tale geometria.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "nessuna tabella delle partizioni presente.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "strano, sono definite solo %d partizioni.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
-"Attenzione: la partizione %s ha dimensione 0 ma non è contrassegnata come "
+"Attenzione: la partizione %s ha dimensione 0 ma non è contrassegnata come "
 "vuota\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "Attenzione: la partizione %s ha dimensione 0 ed è avviabile\n"
+msgstr "Attenzione: la partizione %s ha dimensione 0 ed è avviabile\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Attenzione: la partizione %s ha dimensione 0 e inizio non nullo\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Attenzione: la partizione %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
-msgstr "non è contenuta nella partizione %s\n"
+msgstr "non è contenuta nella partizione %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Attenzione: le partizioni %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "e %s si sovrappongono\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
+"Attenzione: la partizione %s contiene parte della tabella delle partizioni\n"
+"(settore %lu), e la distruggerà quando viene riempita.\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Attenzione: la partizione %s inizia al settore 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Attenzione: la partizione %s si estende dopo la fine del disco\n"
 
-#: fdisk/sfdisk.c:1276
-#, fuzzy
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
-msgstr "Tra le partizioni primarie, al massimo una può essere estesa\n"
+msgstr ""
+"Tra le partizioni primarie, al massimo una può essere estesa\n"
+"  (anche se questo non è un problema per Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non termina al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Attenzione: più di una partizione primaria è contrassegnata come avviabile "
+"Attenzione: più di una partizione primaria è contrassegnata come avviabile "
 "(attiva)\n"
-"Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
+"Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"Attenzione: solitamente è possibile eseguire l'avvio solamente da partizioni "
+"Attenzione: solitamente è possibile eseguire l'avvio solamente da partizioni "
 "primarie\n"
 "LILO non prende in considerazione il flag `bootable' (flag 'avviabile').\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Attenzione: nessuna partizione primaria è contrassegnata come avviabile "
+"Attenzione: nessuna partizione primaria è contrassegnata come avviabile "
 "(attiva)\n"
-"Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
+"Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
-#: fdisk/sfdisk.c:1345
-#, fuzzy
+#: fdisk/sfdisk.c:1343
 msgid "start"
-msgstr "stato"
+msgstr "inizio"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partizione %s: inizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
-#, fuzzy
+#: fdisk/sfdisk.c:1352
 msgid "end"
-msgstr "invio"
+msgstr "fine"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 " partizione %s: fine: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione %s termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1385
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1383
+#, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
-msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
+msgstr ""
 
-#: fdisk/sfdisk.c:1391
-#, fuzzy
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
-msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
+msgstr ""
+"Attenzione: la partizione estesa non inizia al limite di un cilindro.\n"
+"DOS e Linux interpreteranno i contenuti in modo diverso.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "troppe partizioni - sto ignorando quei numeri passati (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "struttura delle partizioni?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "rilevato l'amministratore del disco - impossibile da gestire\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "trovata firma DM6 - termina\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "strano..., una partizione estesa di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "strano..., una partizione BSD di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1624
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1622
+#, c-format
 msgid " %s: unrecognized partition table type\n"
-msgstr " %s: partizione non riconosciuta\n"
+msgstr " %s: tipo di tabella delle partizioni non riconosciuto\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flag -n dato: nessuna modifica\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Salvataggio dei vecchi settori non riuscito - interruzione in corso\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "linea di input lunga o incompleta - uscita in corso\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "errore di input: `=' previsto dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "errore di input: carattere non previsto %c dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input non riconosciuto: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "numero troppo grande\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "segni strani dopo il numero\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
-msgstr "non c'è spazio per il descrittore di partizione\n"
+msgstr "non c'è spazio per il descrittore di partizione\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "impossibile costituire una partizione estesa adiacente\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "troppi campi di input\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
-msgstr "Non c'è spazio per altri\n"
+msgstr "Non c'è spazio per altri\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Tipo non valido\n"
 
-#: fdisk/sfdisk.c:2121
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2119
+#, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "Attenzione: superiore alla dimensione massima consentita (%lu)\n"
+msgstr ""
+"Attenzione: la dimensione indicata (%lu) è superiore alla dimensione massima "
+"consentita (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Attenzione: partizione vuota\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Attenzione: inizio partizione non valido (%lu troppo anticipato)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "flag avviabile non riconosciuto - scegliere - o *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "Specificazione c,h,s parziale?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "partizione estesa in posizione non prevista\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "input non valido\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "troppe partizioni\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5052,233 +4911,227 @@ msgstr ""
 "predefinito.\n"
 "<inizio> <dimensione> <tipo [E,S,L,X,esadecimale]> <avviabile [-,*]> "
 "<cilindro,testina,settore> <cilindro,testina,settore>\n"
-"Solitamente è necessario specificare solamente <inizio> e <dimensione> ( e "
+"Solitamente è necessario specificare solamente <inizio> e <dimensione> ( e "
 "forse <tipo>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versione"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "Utilizzo: %s [opzioni] dispositivo...\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: qualcosa come /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "opzioni utili:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]: elenco dimensioni di una partizione"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [o --id]:        stampa o modifica dell'Id della partizione"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:      elenco delle partizioni di ciascun dispositivo"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [o --dump]:      idem, ma in un formato adatto per un successivo input"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]: numero dei cilindri ecc. partendo da 1 invece che da "
 "0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
-"    -uS, -uB, -uC, -uM:  accetta/riporta in unità di settori/blocchi/"
+"    -uS, -uB, -uC, -uM:  accetta/riporta in unità di settori/blocchi/"
 "cilindri/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]:elenca i tipi di partizione conosciuti"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
-"    -D [o --DOS]:       per la compatibilità con DOS: spreca un po' di spazio"
+"    -D [o --DOS]:       per la compatibilità con DOS: spreca un po' di spazio"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:   fa rileggere al kernel la tabella delle partizioni"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                modifica solamente la partizione con numero #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 non scrive realmente sul disco"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O file :            salva sul file i settori che verranno sovrascritti"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ripristina questi settori nuovamente"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:   stampa versione"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:     stampa questo messaggio"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "opzioni pericolose:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]: stampa l'idea del kernel riguardo alla geometria"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
-"    -g [o --show-geometry]: stampa l'idea del kernel riguardo alla geometria"
+"    -G [o --show-pt-geometry]: stampa la geometria stimata in base alla\n"
+"                               tavola delle partizioni"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 "    -x [o --show-extended]: elenca anche le partizioni estese in output\n"
-"                             o prevede i rispettivi descrittori in input"
+"                            o prevede i rispettivi descrittori in input"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
-msgstr ""
-"    -L  [o --Linux]:      non reclamare per cose che risultano irrilevanti "
-"per Linux"
+msgstr "    -L  [o --Linux]:      non segnala le cose irrilevanti per Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:      elimina i messaggi di avvertimento"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
-msgstr "    È possibile non usare la geometria rilevata utilizzando:"
+msgstr "    È possibile non usare la geometria rilevata utilizzando:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [o --cylindres #]:imposta il numero di cilindri da utilizzare"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [o --heads #]:    imposta il numero di testine da utilizzare"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [o --sectors #]:  imposta il numero di settori da utilizzare"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
-msgstr "È possibile disattivare tutte le verifiche di coerenza con:"
+msgstr "È possibile disattivare tutte le verifiche di coerenza con:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
-msgstr "    -f  [o --force]:      fa ciò che dico, anche se è stupido"
+msgstr "    -f  [o --force]:      fa ciò che dico, anche se è stupido"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
-msgstr "Utilizzo:"
+msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s device\t\t elenca le partizioni attive sul dispositivo\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s device n1 n2 ... attiva le partizioni n1 ..., disattiva il resto\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An device\t attiva la partizione n, disattiva le altre\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "nessun comando?\n"
 
-#: fdisk/sfdisk.c:2639
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2635
+#, c-format
 msgid "total: %llu blocks\n"
-msgstr "totale: %d blocchi\n"
+msgstr "totale: %llu blocchi\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "utilizzo: sfdisk --print-id numero partizione dispositivo\n"
+msgstr "uso: sfdisk --print-id numero partizione dispositivo\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr " utilizzo: sfdisk --change-id numero partizione dispositivo Id\n"
+msgstr " uso: sfdisk --change-id numero partizione dispositivo Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "utilizzo: sfdisk --id numero partizione dispositivo [Id]\n"
+msgstr "uso: sfdisk --id numero partizione dispositivo [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
-"è possibile specificare solamente un dispositivo(eccetto con -l o -s)\n"
+"è possibile specificare solamente un dispositivo(eccetto con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2715
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2711
+#, c-format
 msgid "cannot open %s read-write\n"
-msgstr "impossibile aprire %s\n"
+msgstr "impossibile aprire %s in lettura e scrittura\n"
 
-#: fdisk/sfdisk.c:2717
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2713
+#, c-format
 msgid "cannot open %s for reading\n"
-msgstr "impossibile aprire %s in lettura"
+msgstr "impossibile aprire %s in lettura\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
+#, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
-msgstr "%s: %d cilindri, %d testine, %d settori/traccia\n"
+msgstr "%s: %ld cilindri, %ld testine, %ld settori/traccie\n"
 
-#: fdisk/sfdisk.c:2807
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2803
+#, c-format
 msgid "Cannot get size of %s\n"
-msgstr "Impossibile ottenere la dimensione del disco"
+msgstr "impossibile ottenere la dimensione di %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte attivo non valido: 0x%x al posto di 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5286,47 +5139,46 @@ msgstr ""
 "Fine\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
-"Ci sono %d partizioni primarie attive. Questo è irrelevante per LILO,\n"
-"ma MBR DOS  avvierà solamente un disco con 1 partizione attiva.\n"
+"Ci sono %d partizioni primarie attive. Questo è irrelevante per LILO,\n"
+"ma MBR DOS  avvierà solamente un disco con 1 partizione attiva.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr "la partizione %s ha id %x e non è nascosta\n"
+msgstr "la partizione %s ha id %x e non è nascosta\n"
 
-#: fdisk/sfdisk.c:2983
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2979
+#, c-format
 msgid "Bad Id %lx\n"
-msgstr "Id non valido %x\n"
+msgstr "Id non valido %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
-msgstr "Questo disco è attualmente in uso.\n"
+msgstr "Questo disco è attualmente in uso.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Errore irreversibile: impossibile trovare %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
-msgstr "Attenzione: %s non è un dispositivo di blocchi\n"
+msgstr "Attenzione: %s non è un dispositivo a blocchi\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "Verifica in corso che in questo momento nessuno stia utilizzando questo "
 "disco...\n"
 
-#: fdisk/sfdisk.c:3026
-#, fuzzy
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5334,58 +5186,58 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Questo disco è attualmente in uso - effettuare una ripartizione non è "
-"probabilmente una buona idea. Eseguire l'umount di tutti i file system, lo "
-"swapoff di tutte le partizioni swap su questo disco. Utilizzare il flag--no-"
-"reread per eliminare questo controllo.\n"
+"Questo disco è attualmente in uso: ripartirlo è probabilmente una cattiva "
+"idea.\n"
+"Smontare tutti i file system e arrestare le partizioni swap su questo "
+"disco.\n"
+"Usare l'opzione --no-reread per eliminare questo controllo.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:3034
-#, fuzzy
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
-msgstr "OK"
+msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vecchia situazione:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
-msgstr "La partizione %d non esiste, non è possibile modificarla\n"
+msgstr "La partizione %d non esiste, non è possibile modificarla\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nuova situazione:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 "Queste partizioni non mi piacciono - nessuna modifica\n"
-"(se questo è quanto si desidera, utilizzare l'opzione --force.)\n"
+"(se questo è quanto si desidera, utilizzare l'opzione --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Questo non mi piace - probabilmente si dovrebbe rispondere no\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Soddisfatti di questo? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Scrivere questo su disco? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5394,31 +5246,31 @@ msgstr ""
 "\n"
 "sfdisk: fine prematura dell'input\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Uscita in corso - nessuna modifica\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Scegliere un'opzione per la risposta tra y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
-"La nuova tabella delle partizioni è stata scritta con successo\n"
+"La nuova tabella delle partizioni è stata scritta con successo\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Se è stata creata o modificata una partizione DOS, /dev/foo7, per esempio, "
+"Se è stata creata o modificata una partizione DOS, /dev/foo7, per esempio, "
 "utilizzare dd(1)\n"
 " per azzerare i primi 512 byte: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Consultare fdisk(8).)\n"
@@ -5437,7 +5289,7 @@ msgstr "shell sconosciuta dopo parametro -s o --shell"
 
 #: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr "Utilizzo: getopt optstring parametri\n"
+msgstr "Uso: getopt optstring parametri\n"
 
 #: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
@@ -5495,9 +5347,8 @@ msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Prova della versione getopt(1)\n"
 
 #: getopt/getopt.c:337
-#, fuzzy
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -Q, --quiet-output           Nessun output normale\n"
+msgstr ""
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
@@ -5508,142 +5359,142 @@ msgid "missing optstring argument"
 msgstr "argomento optstring mancante"
 
 #: getopt/getopt.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "getopt (enhanced) 1.1.3\n"
-msgstr "getopt (avanzato) 1.0.3\n"
+msgstr "getopt (avanzato) 1.1.3\n"
 
 #: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "errore interno, contattare l'autore."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "avviato da MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
-msgstr "Ruffian BCD clock\n"
+msgstr ""
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "porta clock regolata su 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
-msgstr "funky TOY!\n"
+msgstr ""
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: %s atomico non è riuscito per 1000 iterazioni!"
+msgstr "%s: %s atomico non è riuscito per 1000 iterazioni!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Impossibile aprire /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr ""
-"Non sono riuscito ad ottenere l'autorizzazione perché non ho provato.\n"
+"Non sono riuscito ad ottenere l'autorizzazione perché non ho provato.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s non riesce a ottenere l'accesso alla porta I/O:  chiamata iopl(3)non "
 "riuscita.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Probabilmente sono necessari privilegi di root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Si presuppone che il clock hardware sia mantenuto nell'orario %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "locale"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: attenzione: terza linea non riconosciuta nel file adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Previsto: `UTC' o `LOCAL' o niente.)\n"
 
-#: hwclock/hwclock.c:313
-#, fuzzy, c-format
+#: hwclock/hwclock.c:312
+#, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr "Ultima regolazione della deriva effettuata %d secondi dopo il 1969\n"
+msgstr "Ultima regolazione della deriva effettuata %ld secondi dopo il 1969\n"
 
-#: hwclock/hwclock.c:315
-#, fuzzy, c-format
+#: hwclock/hwclock.c:314
+#, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr "Ultima calibrazione effettuata %d secondi dopo il 1969\n"
+msgstr "Ultima calibrazione effettuata %ld secondi dopo il 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr "Il clock hardware è sull'orario %s\n"
+msgstr "Il clock hardware è sull'orario %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Attesa del segnale dal clock...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...ricevuto segnale dal clock\n"
 
-#: hwclock/hwclock.c:400
-#, fuzzy, c-format
+#: hwclock/hwclock.c:399
+#, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr " Valori non validi nel clock hardware: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr " Valori non validi nel clock hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
-#, fuzzy, c-format
+#: hwclock/hwclock.c:407
+#, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
-" Orario clock hardware : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d secondi dal 1969\n"
+"Orario clock hardware : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld secondi dal 1969\n"
 
-#: hwclock/hwclock.c:436
-#, fuzzy, c-format
+#: hwclock/hwclock.c:435
+#, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr " Orario letto dal clock hardware: %02d:%02d:%02d\n"
+msgstr "Orario letto dal clock hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
-#, fuzzy, c-format
+#: hwclock/hwclock.c:462
+#, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
-" Impostazione del clock hardware a %.2d:%.2d:%.2d = %d secondi dal 1969\n"
+"Impostazione del clock hardware a %.2d:%.2d:%.2d = %ld secondi dal 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
-msgstr "Nessun cambio del clock - si tratta solamente di una verifica.\n"
+msgstr "Clock non cambiato - solamente verificato.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5652,56 +5503,56 @@ msgstr ""
 "Il tempo trascorso dall'orario di riferimento e' stato di %.6f secondi.\n"
 "Accumulare ulteriore ritardo per raggiungere il secondo pieno successivo.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
 "I registri del clock hardware contengono valori che non sono validi (per es. "
-"50esimo giorno del mese) oppure oltre l'intervallo che è possibile gestire "
+"50esimo giorno del mese) oppure oltre l'intervallo che è possibile gestire "
 "(per es. anno 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f secondi\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Opzione --date non specificata.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
-msgstr ""
+msgstr "--date argomento troppo lungo\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
-"Il valore dell'opzione --date non è una data valida.\n"
+"Il valore dell'opzione --date non è una data valida.\n"
 "In particolare, contiene virgolette.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Esecuzione comando date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Impossibile eseguire il programma 'date' nella shell /bin/sh. popen() fallito"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "risposta dal comando date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5713,11 +5564,11 @@ msgstr ""
 "Il comando date emesso da %s riporta risultati imprevisti.\n"
 "Il comando era:\n"
 "  %s\n"
-"La risposta è stata:\n"
+"La risposta è stata:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
-#, fuzzy, c-format
+#: hwclock/hwclock.c:636
+#, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
 "the converted time value was expected.\n"
@@ -5726,86 +5577,84 @@ msgid ""
 "The response was:\n"
 " %s\n"
 msgstr ""
-"Il comando dato emesso da %s riporta qualcosa d'altro rispetto ad un numero "
+"Il comando date emesso da %s riporta qualcosa d'altro rispetto ad un numero "
 "intero laddove era previsto il valore dell'orario convertito.\n"
 "Il comando era:\n"
 "  %s\n"
-"La risposta è stata:\n"
-" %s\n"
+"La risposta è stata:\n"
+"  %s\n"
 
-#: hwclock/hwclock.c:648
-#, fuzzy, c-format
+#: hwclock/hwclock.c:647
+#, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
-msgstr "la stringa della data %s equivale a %d secondi dal 1969.\n"
+msgstr "la stringa della data %s equivale a %ld secondi dal 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
-"Il clock hardware non contiene un orario valido, perciò non è possibile "
+"Il clock hardware non contiene un orario valido, perciò non è possibile "
 "impostare l'ora del sistema a partire da esso.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr " Chiamata settimeofday in corso:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
-#, fuzzy, c-format
+#: hwclock/hwclock.c:704
+#, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
-msgstr "\ttz.tz_minuteswest = %ld\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
-"Il clock di sistema non viene impostato perché sta funzionando in modalità "
+"Il clock di sistema non viene impostato perché sta funzionando in modalità "
 "test.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Bisogna essere superuser per impostare il clock del sistema\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr " settimeofday() non riuscito"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
-"Non viene effettuata la regolazione del fattore di deriva poiché in "
+"Non viene effettuata la regolazione del fattore di deriva poiché in "
 "precedenza il clock hardwareconteneva elementi insoliti.\n"
 
-#: hwclock/hwclock.c:755
-#, fuzzy, c-format
+#: hwclock/hwclock.c:754
+#, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"Non viene effettuata la regolazione del fattore di deriva poiché è trascorso "
-"meno di un giornodall'ultima calibrazione.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
-"Non viene effettuata la regolazione del fattore di deriva poiché è trascorso "
+"Non viene effettuata la regolazione del fattore di deriva poiché è trascorso "
 "meno di un giornodall'ultima calibrazione.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5816,23 +5665,23 @@ msgstr ""
 "nonostante il fattoredi deriva fosse di %f secondi/giorno.\n"
 "Regolazione del fattore di deriva a %f secondi/giorno\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "Il tempo trascorso dall'ultima regolazione è di %d secondi\n"
+msgstr "Il tempo trascorso dall'ultima regolazione è di %d secondi\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
-"È necessario inserire %d secondi e riportare l'ora indietro di %.6f secondi\n"
+"È necessario inserire %d secondi e riportare l'ora indietro di %.6f secondi\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr "Il file adjtime non viene aggiornato a causa della modalità test.\n"
+msgstr "Il file adjtime non viene aggiornato a causa della modalità test.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5841,42 +5690,42 @@ msgstr ""
 "Si sarebbe scritto quanto segue in %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Parametri di regolazione della deriva non aggiornati.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
-"Il clock hardware non contiene un'ora valida, perciò non è possibile "
+"Il clock hardware non contiene un'ora valida, perciò non è possibile "
 "regolarlo.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
-"La regolazione necessaria equivale a meno di un secondo, perciò il clock non "
+"La regolazione necessaria equivale a meno di un secondo, perciò il clock non "
 "viene impostato.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
-msgstr "Utilizzo di %s in corso.\n"
+msgstr "Utilizzo di %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Impossibile trovare un'interfaccia clock utilizzabile.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Impossibile impostare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5886,22 +5735,22 @@ msgid ""
 msgstr ""
 "Il kernel mantiene un valore epoch per il clock hardware solo su di una "
 "macchinaAlpha.\n"
-"Questa copia di hwclock è stata realizzata per una macchina diversa da "
+"Questa copia di hwclock è stata realizzata per una macchina diversa da "
 "Alpha\n"
-"(e quindi, presumibilmente, non può essere eseguita su un Alpha in questo "
+"(e quindi, presumibilmente, non può essere eseguita su un Alpha in questo "
 "momento). Nessuna azione intrapresa.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Impossibile ottenere il valore epoch dal kernel.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Il kernel pressuppone un valore epoch di %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5910,19 +5759,24 @@ msgstr ""
 "Per impostare il valore epoch si deve utilizzare l'opzione 'epoch' per "
 "indicare su quale valore impostarlo.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 "Non viene impostato il valore epoch a %d - si tratta solamente di una "
 "verifica.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Impossibile impostare il valore epoch nel kernel.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s da %s\n"
+
+#: hwclock/hwclock.c:1196
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5955,7 +5809,7 @@ msgid ""
 msgstr ""
 "hwclock - ricerca e impostazione del clock di sistema (RTC)\n"
 "\n"
-"Utilizzo: hwclock [funzione] [opzioni...]\n"
+"Uso: hwclock [funzione] [opzioni...]\n"
 "\n"
 "Funzioni:\n"
 "  --help        mostra questa guida\n"
@@ -5965,23 +5819,23 @@ msgstr ""
 "  --systohc     imposta il clock hardware sull'ora del sistema attuale\n"
 "  --adjust      regola l'rtc tenendo conto della deriva sistematica "
 "dall'ultima \n"
-"                volta in cui il clock è stato impostato o regolato\n"
+"                volta in cui il clock è stato impostato o regolato\n"
 "  --getepoch    stampa il valore epoch del clock hardware del kernel\n"
 "  --setepoch    imposta il valore epoch del clock hardware del kernel sul \n"
 "                valore dato con --epoch\n"
 "  --version     stampa la versione di hwclock su stdout\n"
 "\n"
 "Opzioni: \n"
-"  --utc         il clock hardware è mantenuto su di un orario universale "
+"  --utc         il clock hardware è mantenuto su di un orario universale "
 "coordinato\n"
-"  --localtime   il clock hardware è mantenuto sull'ora locale\n"
+"  --localtime   il clock hardware è mantenuto sull'ora locale\n"
 "  --directisa   accesso diretto al bus ISA invece di %s\n"
-"  --badyear     ignora l'anno rtc perché il bios è danneggiato\n"
+"  --badyear     ignora l'anno rtc perché il bios è danneggiato\n"
 "  --date        specifica l'ora sulla quale impostare il clock hardware \n"
-"  --epoch=anno  specifica l'anno che è l'inizio per il \n"
+"  --epoch=anno  specifica l'anno che è l'inizio per il \n"
 "                valore epoch del clock hardware\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5991,22 +5845,22 @@ msgstr ""
 "                indicano al hwclock il tipo di alpha utilizzato (consultare "
 "hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
-"%s non considera argomenti che non siano opzioni. È stato fornito %d.\n"
+"%s non considera argomenti che non siano opzioni. È stato fornito %d.\n"
 
-#: hwclock/hwclock.c:1404
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1403
+#, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
-"Sono state specificate opzioni di funzione multipla.\n"
-"È possibile eseguire una sola funzione per volta.\n"
+"Sono state specificate multiple funzioni.\n"
+"È possibile eseguire una sola funzione per volta.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6015,58 +5869,60 @@ msgstr ""
 "%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
 "specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1418
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1417
+#, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
-"%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
-"specificate entrambe.\n"
+"%s: Le opzioni --adjust e -noadjfile si escludono vicendevolmente. Sono "
+"state specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
-msgstr ""
+msgstr "%s: Con --noadjfile, occorre specificare o --utc o --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "Impossibile utilizzare l'ora impostata. Impossibile impostare il clock.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr "Spiacente, solamente il superuser può modificare il clock hardware.\n"
+msgstr ""
+"Spiacente, solamente il superutente può modificare il clock hardware.\n"
 
-#: hwclock/hwclock.c:1460
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1459
+#, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr "Spiacente, solamente il superuser può modificare il clock hardware.\n"
+msgstr ""
+"Spiacente, solamente il superutente può modificare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
-"Solamente il supeuser può modificare l'epoch del clock hardware nel kernel.\n"
+"Solamente il supeutente può modificare l'epoca del clock hardware nel "
+"kernel.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1489
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1488
+#, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
-" Impossibile accedere al clock hardware attraverso qualsiasi metodo "
-"conosciuto.  Utilizzare l'opzione --debug per visionare i dettagli della "
-"nostra ricerca di un metodo d'accesso.\n"
+"Usare l'opzione --debug per vedere i dettagli della ricerca di un metodo di "
+"accesso.\n"
 
 #: hwclock/kd.c:55
 #, c-format
@@ -6087,20 +5943,17 @@ msgid "KDGHWCLK ioctl to read time failed in loop"
 msgstr " Lettura dell'orario con KDGHWCLK ioctl non riuscita nel loop"
 
 #: hwclock/kd.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "ioctl() failed to read time from %s"
-msgstr " ioctl() non è riuscito a leggere l'orario da  /dev/tty1"
+msgstr " ioctl() non è riuscito a leggere l'orario da %s"
 
 #: hwclock/kd.c:141
-#, fuzzy
 msgid "ioctl KDSHWCLK failed"
-msgstr " KDGHWCLK ioctl non riuscito"
+msgstr "ioctl KDGHWCLK non riuscito"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
-#, fuzzy
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr "Impossibile aprire /dev/tty1"
+msgstr "Impossibile aprire /dev/tty1 o /dev/vc/1"
 
 #: hwclock/kd.c:181
 msgid "KDGHWCLK ioctl failed"
@@ -6132,14 +5985,14 @@ msgid "read() to %s to wait for clock tick failed"
 msgstr " read() su %s per l'attesa del segnale dal clock fallita"
 
 #: hwclock/rtc.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick failed"
-msgstr " read() su %s per l'attesa del segnale dal clock fallita"
+msgstr "select() su %s per l'attesa del segnale dal clock fallita"
 
 #: hwclock/rtc.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick timed out\n"
-msgstr " read() su %s per l'attesa del segnale dal clock fallita"
+msgstr "select() su %s per l'attesa del segnale dal clock scaduta\n"
 
 #: hwclock/rtc.c:268
 #, c-format
@@ -6152,23 +6005,23 @@ msgstr ""
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"Non riuscita inaspettatamente l'attivazione degli interrupt d'aggiornametno "
-"attraverso ioctl() su %s "
+"ioctl() su %s per attivare gli interrupt di aggiornamento non riuscita "
+"inaspettatamente"
 
 #: hwclock/rtc.c:330
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr "Non riusciuta l'impostazione dell'ora attraverso ioctl() su %s.\n"
+msgstr "ioctl() su %s per impostare l'ora non riuscita.\n"
 
 #: hwclock/rtc.c:336
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr " ioctl(%s) ha funzionato.\n"
+msgstr "ioctl(%s) ha funzionato.\n"
 
 #: hwclock/rtc.c:365
 #, c-format
 msgid "Open of %s failed"
-msgstr "Non riuscita l'apertura di %s"
+msgstr "Apertura di %s non riuscita"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
@@ -6189,20 +6042,17 @@ msgstr "Impossibile aprire %s"
 #: hwclock/rtc.c:395
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr " Non riuscito ioctl(RTC_EPOCH_READ) su %s"
+msgstr " ioctl(RTC_EPOCH_READ) su %s non riuscita"
 
 #: hwclock/rtc.c:401
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "lettura di epoch %ld da %s con RTC_EPOCH_READ ioctl.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr "Il valore epoch non può essere inferiore a 1900. Si è richiesto %ld\n"
+msgstr "Il valore epoch non può essere inferiore a 1900. Si è richiesto %ld\n"
 
 #: hwclock/rtc.c:439
 #, c-format
@@ -6225,7 +6075,6 @@ msgstr "Non riuscito ioctl(RTC_EPOCH_SET) su %s"
 msgid "calling open_tty\n"
 msgstr "chiamata a open_tty in corso\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "chiamata a termio_init in corso\n"
@@ -6234,7 +6083,6 @@ msgstr "chiamata a termio_init in corso\n"
 msgid "writing init string\n"
 msgstr "scrittura init string in corso\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "prima di autobaud\n"
@@ -6248,7 +6096,6 @@ msgstr "in attesa di cr-lf\n"
 msgid "read %c\n"
 msgstr "lettura di %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "lettura del nome di login\n"
@@ -6282,11 +6129,11 @@ msgstr "entered parse_speeds\n"
 #: login-utils/agetty.c:545
 #, c-format
 msgid "bad speed: %s"
-msgstr "velocità non valida: %s"
+msgstr "velocità non valida: %s"
 
 #: login-utils/agetty.c:547
 msgid "too many alternate speeds"
-msgstr "troppe velocità alternative"
+msgstr "troppe velocità alternative"
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
@@ -6300,9 +6147,8 @@ msgstr "/dev: chdir() non riuscito: %m"
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr "/dev/%s: non è un dispositivo di caratteri"
+msgstr "/dev/%s: non è un dispositivo di caratteri"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6315,14 +6161,12 @@ msgstr "/dev/%s: impossibile l'apertura come input standard: %m"
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
-msgstr "%s: non è aperto per lettura/scrittura"
+msgstr "%s: non è aperto per lettura/scrittura"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duping\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6360,54 +6204,49 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"Utilizzo: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"Uso: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
 "login_host] baud_rate,... linea [tipo terminale]\n"
 "o\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "baud_rate linea,... [tipo terminale]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
-msgstr "login: poca memoria, è possibile che il login non riesca\n"
+msgstr "login: poca memoria, è possibile che il login non riesca\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "malloc per ttyclass non possibile"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "malloc per grplist impossibile"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr "Login a %s da %s negato in base all'impostazione predefinita.\n"
+msgstr "Login a %s da %s negato per impostazione predefinita.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login a %s da %s negato.\n"
 
 #: login-utils/chfn.c:128 login-utils/chsh.c:113
-#, c-format
+#, fuzzy, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: non si esiste (come utente %d).\n"
 
 #: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: utente \"%s\" non esiste.\n"
+msgstr "%s: l'utente \"%s\" non esiste.\n"
 
 #: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
-"%s: è possibile modificare solo le voci locali; utilizzare invece yp%s.\n"
+"%s: è possibile modificare solo le voci locali; utilizzare invece yp%s.\n"
 
 #: login-utils/chfn.c:151 login-utils/chsh.c:136
 msgid "Unknown user context"
@@ -6421,7 +6260,7 @@ msgstr ""
 #: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: impossibile impostare il contesto predefinito per /etc/passwd"
 
 #: login-utils/chfn.c:173
 #, c-format
@@ -6434,8 +6273,8 @@ msgstr "Modifica delle informazioni finger per %s in corso.\n"
 msgid "Password error."
 msgstr "Errore password."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Password: "
@@ -6452,7 +6291,7 @@ msgstr "Le informazioni finger non sono state modificate.\n"
 #: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Utilizzo: %s [ -f nome intero ] [ -o ufficio ]"
+msgstr "Uso: %s [ -f nome intero ] [ -o ufficio ]"
 
 #: login-utils/chfn.c:320
 #, c-format
@@ -6480,12 +6319,12 @@ msgstr ""
 #: login-utils/chfn.c:425
 #, c-format
 msgid "field is too long.\n"
-msgstr "il campo è troppo lungo.\n"
+msgstr "il campo è troppo lungo.\n"
 
 #: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr "'%c' non è consentito.\n"
+msgstr "'%c' non è consentito.\n"
 
 #: login-utils/chfn.c:438
 #, c-format
@@ -6509,9 +6348,9 @@ msgid "malloc failed"
 msgstr "malloc non riuscita"
 
 #: login-utils/chsh.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: \"%s\" non è elencato in /etc/shells.\n"
+msgstr "%s: %s non è autorizzato a cambiare la shelldi %s\n"
 
 #: login-utils/chsh.c:157
 #, c-format
@@ -6523,7 +6362,7 @@ msgstr ""
 #: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr "%s: la shell non è in /etc/shells, modifica shell negata\n"
+msgstr "%s: la shell non è in /etc/shells, modifica della shell negata\n"
 
 #: login-utils/chsh.c:170
 #, c-format
@@ -6550,11 +6389,13 @@ msgid "Shell changed.\n"
 msgstr "Shell modificata.\n"
 
 #: login-utils/chsh.c:293
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
-msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
+msgstr ""
+"Uso: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ nomeutente ]\n"
 
 #: login-utils/chsh.c:336
 #, c-format
@@ -6574,7 +6415,7 @@ msgstr "%s: \"%s\" non eseguibile.\n"
 #: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s: '%c' non è consentito.\n"
+msgstr "%s: '%c' non è consentito.\n"
 
 #: login-utils/chsh.c:355
 #, c-format
@@ -6584,22 +6425,22 @@ msgstr "%s: Non sono ammessi i caratteri di controllo.\n"
 #: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr "Attenzione: \"%s\" non è elencato in /etc/shells\n"
+msgstr "Attenzione: \"%s\" non è elencato in /etc/shells\n"
 
 #: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr "%s: \"%s\" non è elencato in /etc/shells.\n"
+msgstr "%s: \"%s\" non è elencato in /etc/shells.\n"
 
 #: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr "%s: utilizzo opzione -l per consultare l'elenco\n"
+msgstr "%s: usare l'opzione -l per vedere l'elenco\n"
 
 #: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr "Attenzione: \"%s\" non è elencato in /etc/shells.\n"
+msgstr "Attenzione: \"%s\" non è elencato in /etc/shells.\n"
 
 #: login-utils/chsh.c:373
 #, c-format
@@ -6611,48 +6452,20 @@ msgstr "Utilizzare %s -l per consultare l'elenco.\n"
 msgid "No known shells.\n"
 msgstr "Nessuna shell conosciuta.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr " impossibile aprire /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "impossibile leggere dati random da /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "impossibile aprire %s in lettura"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "impossibile eseguire stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s non ha i filemode corretti"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "impossibile leggere i dati da %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr "Impossibile leggere %s, uscita in corso."
+msgstr "Impossibile leggere %s, uscita."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr " utilizzo: ultimo [-#] [-f file] [-t tty] [-h hostname] [utente ...]\n"
+msgstr "uso: last [-#] [-f file] [-t tty] [-h hostname] [utente ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  tuttora collegato"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6661,15 +6474,15 @@ msgstr ""
 "\n"
 "wtmp inizia %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: errore di malloc.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6678,51 +6491,45 @@ msgstr ""
 "\n"
 "interrotto %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
-#, fuzzy, c-format
+#: login-utils/login.c:196
+#, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "mount: impossibile aprire %s: %s"
+msgstr "FATALE: impossibile riaprire la tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
-msgstr ""
+msgstr "FATALE: tty non valida"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h solamente per super-user.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
-msgstr "utilizzo: login [-fp] [nomeutente]\n"
+msgstr "uso: login [-fp] [nomeutente]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "logine: errore PAM, interruzione in corso: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Impossibile inizializzare PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "FALLITA LOGIN %d DA %s PER %s, %s"
+msgstr "FALLITO IL LOGIN %d DA %s PER %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6731,161 +6538,146 @@ msgstr ""
 "Login non corretto\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TROPPI TENTATIVI DI LOGIN (%d) DA %s PER %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FALLITA SESSIONE DI LOGIN DA %s PER %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 "\n"
-"Login  non corretto\n"
+"Login non corretto\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr ""
+msgstr "Nome utente NULL in %s:%d. Interrotto."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr ""
+msgstr "Nome utente \"%s\" non valido in %s:%d. Interrotto."
 
-#: login-utils/login.c:667
-#, fuzzy, c-format
+#: login-utils/login.c:604
+#, c-format
 msgid "login: Out of memory\n"
-msgstr "%s: memoria esaurita!\n"
+msgstr "login: memoria esaurita\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Nome utente non valido"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login rifiutato su questo terminale.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO DA %s SU TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO SU TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login non corretto\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Troppi utenti già collegati.\n"
-"Riprovare successivamente.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Ci sono troppi processi in esecuzione.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr " CONNESSIONE DI ACCESSO REMOTO A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN DI ROOT A %s DA %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN DI ROOT A %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN A %s ATTRAVERSO %s DA %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1100
-#, fuzzy, c-format
+#: login-utils/login.c:1009
+#, c-format
 msgid "You have new mail.\n"
-msgstr "C'è %sposta.\n"
+msgstr "C'è nuova posta.\n"
 
-#: login-utils/login.c:1102
-#, fuzzy, c-format
+#: login-utils/login.c:1011
+#, c-format
 msgid "You have mail.\n"
-msgstr "C'è %sposta.\n"
+msgstr "C'è posta.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
-msgstr "login: errore in esecuzione forking: %s"
+msgstr "login: errore in esecuzione del fork: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
-msgstr ""
+msgstr "TIOCSCTTY non riuscito: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() non riuscito"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Nessuna directory %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Connessione con home = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: nessuna memoria per lo script shell.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: exec dello script shell impossibile: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: nessuna shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6894,65 +6686,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
-msgstr "il nome di login è troppo lungo.\n"
+msgstr "il nome di login è troppo lungo.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NOME troppo lungo"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "I nomi di login non possono iniziare con'-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "troppi linefeed vuoti.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "Linefeed ECCESSIVI"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login scaduto dopo %d secondi\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Ultimo login: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "da %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "su %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ERRORE DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ERRORE DI LOGIN SU %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ERRORI DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ERRORI DI LOGIN SU %s, %s"
@@ -6960,181 +6752,46 @@ msgstr "%d ERRORI DI LOGIN SU %s, %s"
 #: login-utils/mesg.c:89
 #, c-format
 msgid "is y\n"
-msgstr "è s\n"
+msgstr "è s\n"
 
 #: login-utils/mesg.c:92
 #, c-format
 msgid "is n\n"
-msgstr "è n\n"
+msgstr "è n\n"
 
 #: login-utils/mesg.c:112
 #, c-format
 msgid "usage: mesg [y | n]\n"
-msgstr "utilizzo: mesg [s | n]\n"
+msgstr "uso: mesg [s | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: chi sei?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: nessun gruppo di questo genere."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: autorizzazione negata"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Nessuna shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Impossibile riutilizzare la vecchia password.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"Non utilizzare come password qualcosa che assomigli al proprio nome utente!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr ""
-"Non utilizzare come password qualcosa che assomigli al proprio vero nome!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Utilizzo: passwd [nome utente [password]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Solo root può utilizzare le forme a uno e due argomenti\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Utilizzo: passwd [-foqsvV] [utente [password]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Exec %s impossibile: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Impossibile trovare il nome di login"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Solo root può modificare la password per gli altri.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Troppi argomenti.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Impossibile trovare il nome utente.`%s' è davvero un utente?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Posso modificare solo le password locali. Utilizzare invece yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID e nome utente non combaciano, impostore!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Modifica password per %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Immettere vecchia password: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Password non valida, impostore."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Immettere la nuova password: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Password non modificata."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Ridigitare la nuova password: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Ortografia sbagliata. La password non è stata modificata."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "password modificata, utente %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "PASSWORD ROOT MODIFICATA"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "password modificata da root, utente %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "chiamata di setpwnam per impostare la password.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Password *NON* modificata. Riprovare successivamente.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Password modificata.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Utilizzo: spegnimento [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+msgstr "Uso: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
@@ -7143,12 +6800,12 @@ msgstr "Processo di spegnimento interrotto"
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr "%s: solamente root può spegnere un sistema.\n"
+msgstr "%s: solamente root può spegnere un sistema.\n"
 
 #: login-utils/shutdown.c:256
 #, c-format
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Verrà effettuato domani, non è possibile attendere fino ad allora?\n"
+msgstr "Verrà effettuato domani, non è possibile attendere fino ad allora?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
@@ -7161,30 +6818,29 @@ msgstr " timeout = %d, quiet = %d, reboot = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr "Il sistema verrà spento entro 5 minuti"
+msgstr "Il sistema verrà spento entro 5 minuti"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr "È perciò proibito effettuare il login."
+msgstr "È perciò proibito effettuare il login."
 
 #: login-utils/shutdown.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "rebooted by %s: %s"
-msgstr "%s attraverso %s: %s"
+msgstr "riavviato da %s: %s"
 
 #: login-utils/shutdown.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "halted by %s: %s"
-msgstr "%s attraverso %s: %s"
+msgstr "fermato da %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
 "\n"
-"perché sono ancora attivo dopo il riavvio?"
+"Perché sono ancora attivo dopo il riavvio?"
 
 #: login-utils/shutdown.c:431
 msgid ""
@@ -7192,12 +6848,12 @@ msgid ""
 "Now you can turn off the power..."
 msgstr ""
 "\n"
-"Ora è possibile togliere l'alimentazione elettrica..."
+"È ora possibile togliere l'alimentazione elettrica..."
 
 #: login-utils/shutdown.c:447
 #, c-format
 msgid "Calling kernel power-off facility...\n"
-msgstr "Chiamata della funzionalità di spegnimento del kernel...\n"
+msgstr "Chiamata della funzionalità di spegnimento del kernel...\n"
 
 #: login-utils/shutdown.c:450
 #, c-format
@@ -7214,36 +6870,35 @@ msgstr "Esecuzione del programma \"%s\" in corso...\n"
 msgid "Error executing\t%s\n"
 msgstr "Errore durante l'esecuzione di\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
-#, fuzzy, c-format
+#, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "URGENTE: messaggio broadcast da %s:"
+msgstr "URGENTE: messaggio broadcast da %s:"
 
 #: login-utils/shutdown.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr "Il sistema si spegnerà tra %d ora/e%s %d minuti"
+msgstr "Il sistema si spegnerà tra %d ore e %d minuti"
 
 #: login-utils/shutdown.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr "Il sistema si spegnerà tra %d ora/e%s %d minuti"
+msgstr "Il sistema si spegnerà tra 1 ora e %d minuti"
 
 #: login-utils/shutdown.c:500
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in %d minutes\n"
-msgstr "Il sistema si spegnerà in %d minuti%s\n"
+msgstr "Il sistema si spegnerà in %d minuti\n"
 
 #: login-utils/shutdown.c:503
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in 1 minute\n"
-msgstr "Il sistema si spegnerà in %d minuti%s\n"
+msgstr "Il sistema si spegnerà in 1 minuto\n"
 
 #: login-utils/shutdown.c:505
 #, c-format
 msgid "System going down IMMEDIATELY!\n"
-msgstr "Il sistema si spegnerà IMMEDIATAMENTE!\n"
+msgstr "Il sistema si spegnerà IMMEDIATAMENTE!\n"
 
 #: login-utils/shutdown.c:510
 #, c-format
@@ -7252,65 +6907,61 @@ msgstr "\t... %s ...\n"
 
 #: login-utils/shutdown.c:567
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr "Esecuzione del fork per swapoff impossibile.Pazienza!"
+msgstr "Impossibile fare un fork per swapoff. Pazienza!"
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr "Exec swapoff impossibile, sperando che umount ce la faccia."
+msgstr "Impossibile eseguire swapoff, si spera che umount ce la faccia."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr "impossibile eseguire il fork per umount, provare manualmente."
+msgstr "Impossibile fare un fork per umount, si prova manualmente."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "Exec %s impossibile, tentativo di utilizzo di umount.\n"
+msgstr "Impossibile eseguire %s, si prova ad usare umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr "Exec umount impossibile, termina utilizzo di umount."
+msgstr "Impossibile eseguire umount, termina utilizzo di umount."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
 msgstr "Smontaggio in corso di qualsiasi filesystem rimanente..."
 
 #: login-utils/shutdown.c:659
-#, fuzzy, c-format
+#, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr "spegnimento: impossibile eseguire umount di %s\n"
+msgstr "shutdown: Impossibile smontare %s: %s\n"
 
 #: login-utils/simpleinit.c:132
 msgid "Booting to single user mode.\n"
-msgstr "Avvio in modalità singolo utente.\n"
+msgstr "Avvio in modalità singolo utente.\n"
 
 #: login-utils/simpleinit.c:136
 msgid "exec of single user shell failed\n"
-msgstr " exec di una shell per singolo utente non riuscita\n"
+msgstr "esecuzione di una shell per singolo utente non riuscita\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
 msgstr "fork di una shell per singolo utente non riuscito\n"
 
 #: login-utils/simpleinit.c:208
-#, fuzzy
 msgid "error opening fifo\n"
-msgstr "Errore durante lo spegnimento\t%s\n"
+msgstr "errore durante l'apertura del fifo\n"
 
 #: login-utils/simpleinit.c:212
 msgid "error setting close-on-exec on /dev/initctl"
 msgstr ""
 
 #: login-utils/simpleinit.c:259
-#, fuzzy
 msgid "error running finalprog\n"
-msgstr "Errore durante lo spegnimento\t%s\n"
+msgstr ""
 
-#. Error
 #: login-utils/simpleinit.c:263
-#, fuzzy
 msgid "error forking finalprog\n"
-msgstr "Errore durante lo spegnimento\t%s\n"
+msgstr ""
 
 #: login-utils/simpleinit.c:345
 msgid ""
@@ -7318,28 +6969,25 @@ msgid ""
 "Wrong password.\n"
 msgstr ""
 "\n"
-"password errata.\n"
+"Password errata.\n"
 
 #: login-utils/simpleinit.c:418
-#, fuzzy
 msgid "lstat of path failed\n"
-msgstr " settimeofday() non riuscito"
+msgstr ""
 
 #: login-utils/simpleinit.c:426
-#, fuzzy
 msgid "stat of path failed\n"
-msgstr " settimeofday() non riuscito"
+msgstr "stat del percorso non riuscito\n"
 
 #: login-utils/simpleinit.c:434
-#, fuzzy
 msgid "open of directory failed\n"
-msgstr "apertura file rc non riuscita\n"
+msgstr "apertura della directory non riuscita\n"
 
 #: login-utils/simpleinit.c:508
 msgid "fork failed\n"
 msgstr "fork non riuscito\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "exec fallita\n"
 
@@ -7352,13 +7000,13 @@ msgid "no TERM or cannot stat tty\n"
 msgstr "TERM non definito o impossibile eseguire stat sul tty\n"
 
 #: login-utils/simpleinit.c:936
-#, fuzzy, c-format
+#, c-format
 msgid "error stopping service: \"%s\""
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore fermando il servizio \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr "troppi iov's (modificare codice in wall/ttymsg.c)"
+msgstr "troppi iov (modificare codice in wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 #, c-format
@@ -7381,19 +7029,19 @@ msgid "%s: BAD ERROR"
 msgstr "%s: BRUTTO ERRORE"
 
 #: login-utils/vipw.c:143
-#, fuzzy, c-format
+#, c-format
 msgid "%s: the password file is busy.\n"
-msgstr "%s: il file %s è occupato.\n"
+msgstr "%s: il file delle password è occupato.\n"
 
 #: login-utils/vipw.c:146
-#, fuzzy, c-format
+#, c-format
 msgid "%s: the group file is busy.\n"
-msgstr "%s: il file %s è occupato.\n"
+msgstr "%s: il file di gruppo è occupato.\n"
 
 #: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr "%s: il file %s è occupato (%s presente)\n"
+msgstr "%s: il file %s è occupato (%s presente)\n"
 
 #: login-utils/vipw.c:168
 #, c-format
@@ -7401,14 +7049,14 @@ msgid "%s: can't link %s: %s\n"
 msgstr "%s: impossibile collegare %s: %s\n"
 
 #: login-utils/vipw.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't get context for %s"
-msgstr "Impossibile ottenere il timeout per %s: %s\n"
+msgstr "%s: impossibile ottenere il contesto per %s"
 
 #: login-utils/vipw.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't set context for %s"
-msgstr "Impossibile ottenere il timeout per %s: %s\n"
+msgstr "%s: impossibile impostare il contesto per %s"
 
 #: login-utils/vipw.c:217
 #, c-format
@@ -7432,25 +7080,26 @@ msgstr "%s: %s immutato\n"
 msgid "%s: no changes made\n"
 msgstr "%s: nessuna modifica effettuata\n"
 
+# FIXME: shadow: invariato? ombra?
 #: login-utils/vipw.c:352
 #, c-format
 msgid "You are using shadow groups on this system.\n"
-msgstr ""
+msgstr "Gruppi shadow sono usati su questo sistema.\n"
 
 #: login-utils/vipw.c:353
 #, c-format
 msgid "You are using shadow passwords on this system.\n"
-msgstr ""
+msgstr "Password shadow sono usate su questo sistema.\n"
 
 #: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
-msgstr ""
+msgstr "Volete modificare %s adesso [y/n]?"
 
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "utilizzo: %s [file]\n"
+msgstr "uso: %s [file]\n"
 
 #: login-utils/wall.c:159
 #, c-format
@@ -7463,9 +7112,9 @@ msgid "Broadcast Message from %s@%s"
 msgstr "Messaggio broadcast da %s@%s"
 
 #: login-utils/wall.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr "%s: impossibile leggere %s.\n"
+msgstr ""
 
 #: login-utils/wall.c:209
 #, c-format
@@ -7475,7 +7124,7 @@ msgstr "%s: impossibile leggere %s.\n"
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: impossibile eseguire lo stat del file temporaneo.\n"
+msgstr "%s: impossibile fare stat del file temporaneo.\n"
 
 #: login-utils/wall.c:241
 #, c-format
@@ -7484,35 +7133,28 @@ msgstr "%s: impossibile leggere il file temporaneo.\n"
 
 #: misc-utils/cal.c:327
 msgid "illegal month value: use 1-12"
-msgstr "valore mese non valido: utilizzarne uno da 1 a 12"
+msgstr "valore del mese non valido: usare 1-12"
 
 #: misc-utils/cal.c:331
 msgid "illegal year value: use 1-9999"
-msgstr "valore anno non valido: utilizzarne uno da 1 da 9999"
-
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
+msgstr "valore dell'anno non valido: usare 1-9999"
+
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
 msgstr ""
 
 #: misc-utils/cal.c:780
-#, fuzzy, c-format
+#, c-format
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr "utilizzo: cal [-mjyV] [[mese] anno]\n"
+msgstr "uso: cal [-13smjyV] [[mese] anno]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr " utilizzo: %s [+formato] [giorno mese anno]\n"
+msgstr " uso: %s [+formato] [giorno mese anno]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Giorno di S.Tiberio"
 
@@ -7534,12 +7176,12 @@ msgstr "%s: segnale sconosciuto %s; segnali validi:\n"
 #: misc-utils/kill.c:354
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "utilizzo: %s [ -s signal | -p ] [ -a ] pid ...\n"
+msgstr "uso: %s [ -s segnale | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:355
 #, c-format
 msgid "       %s -l [ signal ]\n"
-msgstr "       %s -l [ signal ]\n"
+msgstr "       %s -l [ segnale ]\n"
 
 #: misc-utils/logger.c:141
 #, c-format
@@ -7549,25 +7191,24 @@ msgstr "logger: %s: %s.\n"
 #: misc-utils/logger.c:248
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr "logger: nome funzionalità sconosciuto: %s.\n"
+msgstr "logger: nome funzionalità sconosciuto: %s.\n"
 
 #: misc-utils/logger.c:260
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr "logger: nome priorità sconosciuto: %s.\n"
+msgstr "logger: nome priorità sconosciuto: %s.\n"
 
 #: misc-utils/logger.c:287
 #, c-format
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
-"utilizzo: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] "
-"[ messaggio .. ]\n"
+"uso: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ messaggio .. ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr " utilizzo: look [-dfa] [-t char] stringa [file]\n"
+msgstr " uso: look [-dfa] [-t char] stringa [file]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
@@ -7592,7 +7233,7 @@ msgstr "namei: impossibile eseguire chdir su %s - %s (%d)\n"
 #: misc-utils/namei.c:126
 #, c-format
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "utilizzo: namei [-mx] nome percorso [nome percorso ...]\n"
+msgstr "uso: namei [-mx] nome percorso [nome percorso ...]\n"
 
 #: misc-utils/namei.c:151
 #, c-format
@@ -7605,9 +7246,9 @@ msgid "namei: could not stat root!\n"
 msgstr "namei: impossibile eseguire stat della directory root!\n"
 
 #: misc-utils/namei.c:172
-#, fuzzy, c-format
+#, c-format
 msgid "namei: buf overflow\n"
-msgstr "  Overflow\n"
+msgstr "namei: buf overflow\n"
 
 #: misc-utils/namei.c:218
 #, c-format
@@ -7630,44 +7271,47 @@ msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei: tipo file sconosciuto 0%06o su file %s\n"
 
 #: misc-utils/rename.c:38
-#, fuzzy, c-format
+#, c-format
 msgid "%s: out of memory\n"
-msgstr "%s: memoria esaurita!\n"
+msgstr "%s: memoria esaurita\n"
 
 #: misc-utils/rename.c:56
-#, fuzzy, c-format
+#, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "impossibile rinominare %s in %s: %s\n"
+msgstr "%s: impossibile rinominare %s in %s: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
 "Use `%s [options] %s' if you really want to use it.\n"
 "Script not started.\n"
 msgstr ""
+"Attenzione: `%s' è un link.\n"
+"Usare `%s [opzioni] %s' se volete veramente usarlo.\n"
+"Script non avviato.\n"
 
-#: misc-utils/script.c:169
-#, fuzzy, c-format
+#: misc-utils/script.c:168
+#, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr " utilizzo: script [-a] [file]\n"
+msgstr "uso: script [-a] [-f] [-q] [-t] [file]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr "Script iniziato, il file è %s\n"
+msgstr "Script iniziato, il file è %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniziato su %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7676,257 +7320,256 @@ msgstr ""
 "\n"
 "Script effettuato su %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr "Script effettuato, il file è %s\n"
+msgstr "Script effettuato, il file è %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty non riuscita\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
-msgstr "esauriti tutti i pty disponibili\n"
+msgstr "Esauriti tutti i pty disponibili\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
-msgstr "%s: argomento errato, utilizzo\n"
+msgstr "%s: argomento errato, uso\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_name ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgstr "  [ -dump   [1-NUM_CONSOLE] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLE] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilename ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
-msgstr " impossibile (dis)impostare la modalità risparmio energetico\n"
+msgstr " impossibile (dis)impostare la modalità risparmio energetico\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "errore klogctl : %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Errore durante la lettura di %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Errore in scrittura screendump\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "impossibile leggere %s  e impossibile eseguire ioctl sul dump\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr "%s: $TERM non è definito.\n"
+msgstr "%s: $TERM non è definito.\n"
 
 #: misc-utils/whereis.c:157
 #, c-format
@@ -7941,12 +7584,12 @@ msgstr "write: impossibile trovare il nome di tty\n"
 #: misc-utils/write.c:110
 #, c-format
 msgid "write: you have write permission turned off.\n"
-msgstr "write: l'autorizzazione per la scrittura è disattivata.\n"
+msgstr "write: l'autorizzazione per la scrittura è disattivata.\n"
 
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr "write: %s non è collegato a %s.\n"
+msgstr "write: %s non è collegato a %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
@@ -7956,12 +7599,12 @@ msgstr "write: %s ha i messaggi disattivati su %s\n"
 #: misc-utils/write.c:146
 #, c-format
 msgid "usage: write user [tty]\n"
-msgstr "utilizzo: write user [tty]\n"
+msgstr "uso: write utente [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
-msgstr "write: %s non è collegato\n"
+msgstr "write: %s non è collegato\n"
 
 #: misc-utils/write.c:243
 #, c-format
@@ -7971,12 +7614,12 @@ msgstr "write: %s ha i messaggi disattivati\n"
 #: misc-utils/write.c:247
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
-msgstr "write: %s è collegato più di una volta; scrittura su %s in corso\n"
+msgstr "write: %s è collegato più di una volta; scrittura su %s in corso\n"
 
 #: misc-utils/write.c:313
-#, fuzzy, c-format
+#, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr "Messaggio da %s@%s su %s a %s ..."
+msgstr "Messaggio da %s@%s (come %s) su %s a %s ..."
 
 #: misc-utils/write.c:316
 #, c-format
@@ -7998,40 +7641,32 @@ msgstr "attenzione: impossibile aprire %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
-"impossibile creare un file di blocco %s: %s (utilizzare il flag -n per "
-"tralasciare)"
+"impossibile creare un file di lock %s: %s (usare il flag -n per cambiare)"
 
 #: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
-"impossibile collegare il file di blocco %s: %s  (utilizzare il flag -n per "
-"tralasciare)"
+"impossibile collegare il file di lock %s: %s  (usare il flag -n per cambiare)"
 
 #: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr ""
-"impossibile aprire il file di blocco %s: %s (utilizzare flag -n per "
-"tralasciare)"
+msgstr "impossibile aprire il file di lock %s: %s (usare flag -n per cambiare)"
 
 #: mount/fstab.c:526
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr "Impossibile bloccare il file di blocco %s: %s\n"
+msgstr "Impossibile fare il lock del file di lock %s: %s\n"
 
 #: mount/fstab.c:538
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr "Impossibile bloccare il file di blocco %s: %s"
+msgstr "impossibile fare il lock del file di lock %s: %s"
 
 #: mount/fstab.c:540
 msgid "timed out"
@@ -8044,7 +7679,7 @@ msgid ""
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 "Impossibile creare il collegamento %s\n"
-"Forse c'è un vecchio file di blocco?\n"
+"Forse c'è un vecchio file di lock?\n"
 
 #: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
@@ -8059,7 +7694,7 @@ msgstr "errore durante la scrittura di %s: %s"
 #: mount/fstab.c:643
 #, c-format
 msgid "error changing mode of %s: %s\n"
-msgstr "errore durante il cambiamento della modalità di %s: %s\n"
+msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
 #: mount/fstab.c:661
 #, c-format
@@ -8074,7 +7709,7 @@ msgstr "loop: impossibile aprire il device %s: %s\n"
 #: mount/lomount.c:89
 #, c-format
 msgid ", offset %lld"
-msgstr ""
+msgstr ", offset %lld"
 
 #: mount/lomount.c:92
 #, c-format
@@ -8084,17 +7719,17 @@ msgstr ""
 #: mount/lomount.c:100
 #, c-format
 msgid ", encryption %s (type %d)"
-msgstr ""
+msgstr ", cifratura %s (tipo %d)"
 
 #: mount/lomount.c:114
 #, c-format
 msgid ", offset %d"
-msgstr ""
+msgstr ", offset %d"
 
 #: mount/lomount.c:117
-#, fuzzy, c-format
+#, c-format
 msgid ", encryption type %d\n"
-msgstr "Tipo di criptazione non supportata %s\n"
+msgstr ", tipo di cifratura %d\n"
 
 #: mount/lomount.c:126
 #, c-format
@@ -8102,29 +7737,30 @@ msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
 
 #: mount/lomount.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any device /dev/loop#"
-msgstr "mount: impossibile trovare un qualsiasi device /dev/loop#"
+msgstr "%s: impossibile trovare alcun device /dev/loop#"
 
 #: mount/lomount.c:181
 #, c-format
 msgid "%s: no permission to look at /dev/loop#"
 msgstr ""
 
+# FIXME: loop device
 #: mount/lomount.c:184
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: impossibile trovare qualsiasi loop device e, in base a %s,\n"
-"       questo kernel non è a conoscenza del loop device\n"
-"       (se è questo il caso, ricompilare o `insmod loop.o'.)"
+"%s: impossibile trovare qualsiasi loop device. Forse questo kernel\n"
+"       non è a conoscenza del loop device (se è questo il caso,\n"
+"       occorre ricompilare o eseguire 'modprobe loop'.)"
 
 #: mount/lomount.c:189
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
-msgstr "mount: impossibile trovare un qualsiasi loop device libero"
+msgstr "%s: impossibile trovare un qualsiasi loop device libero"
 
 #: mount/lomount.c:287
 #, c-format
@@ -8132,14 +7768,14 @@ msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
 #: mount/lomount.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
-msgstr "set_loop(%s,%s,%d): riuscito\n"
+msgstr "set_loop(%s,%s,%llu): riuscito\n"
 
 #: mount/lomount.c:351
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: impossibile cancellare il device %s: %s\n"
+msgstr "loop: impossibile eliminare il device %s: %s\n"
 
 #: mount/lomount.c:361
 #, c-format
@@ -8149,10 +7785,10 @@ msgstr "del_loop(%s): riuscito\n"
 #: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "Questo montaggio è stato compilato senza supporto loop. Ricompilare.\n"
+msgstr "Questo mount è stato compilato senza supporto per loop. Ricompilare.\n"
 
 #: mount/lomount.c:406
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage:\n"
 "  %s loop_device                                       # give info\n"
@@ -8160,10 +7796,6 @@ msgid ""
 "  %s -f                                                # find unused\n"
 "  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
 msgstr ""
-"utilizzo:\n"
-"  %s loop_device                                      # da informazioni\n"
-"  %s -d loop_device                                   # elimina\n"
-"  %s [ -e encryption ] [ -o offset ] loop_device file # imposta\n"
 
 #: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
@@ -8174,59 +7806,57 @@ msgstr "memoria insufficiente"
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
-"Nessun supporto loop disponibile al momento della compilazione. "
-"Ricompilare.\n"
 
 #: mount/mntent.c:166
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr ""
-"[mntent]: attenzione: non c'e' un 'codice di interruzione linea' alla fine "
-"di %s\n"
+msgstr "[mntent]: attenzione: non c'è un'andata a capo alla fine di %s\n"
 
 #: mount/mntent.c:217
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr "[mntent]: la linea %d in %s non è valida%s\n"
+msgstr "[mntent]: riga %d in %s non valida%s\n"
 
 #: mount/mntent.c:220
 msgid "; rest of file ignored"
 msgstr "; ignorato resto del file"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "%s: errore: non è possibile impostare swap in nessuna posizione?\n"
+msgstr "%s: errore: l'etichetta %s appare sia su %s che su %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: considerare il montaggio di %s con %s\n"
+msgstr "mount: %s verrà montato in base all'UUID\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: considerare il montaggio di %s con %s\n"
+msgstr "mount: %s verrà montato in base all'etichetta\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
+msgstr ""
+"%s: impossibile aprire %s, la conversione di UUID e ETICHETTA non può\n"
+"    essere effettuata.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: UUID non valido"
+msgstr "%s: UUID non valido"
 
 #: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount: in base a mtab, %s è già montato su %s"
+msgstr "mount: secondo mtab, %s è già montato su %s"
 
 #: mount/mount.c:387
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount: in base a mtab, %s è montato su %s"
+msgstr "mount: secondo mtab, %s è montato su %s"
 
 #: mount/mount.c:407
 #, c-format
@@ -8241,7 +7871,7 @@ msgstr "mount: errore durante la scrittura di %s: %s"
 #: mount/mount.c:432
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr "mount: errore durante il cambio di modalità di %s: %s"
+msgstr "mount: errore durante il cambio di modalità di %s: %s"
 
 #: mount/mount.c:483
 #, c-format
@@ -8255,7 +7885,7 @@ msgstr "mount non riuscito"
 #: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: solamente root può montare %s su %s"
+msgstr "mount: solamente root può montare %s su %s"
 
 #: mount/mount.c:600
 msgid "mount: loop device specified twice"
@@ -8292,259 +7922,243 @@ msgstr "mount: impossibile aprire %s: %s"
 
 #: mount/mount.c:693
 msgid "mount: argument to -p or --pass-fd must be a number"
-msgstr ""
+msgstr "mount: l'argomento di -p o --pass-fd deve essere un numero"
 
 #: mount/mount.c:706
-#, fuzzy, c-format
+#, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr "mount: impossibile aprire %s in scrittura: %s"
+msgstr "mount: impossibile aprire %s per impostare la velocità"
 
 #: mount/mount.c:709
-#, fuzzy, c-format
+#, c-format
 msgid "mount: cannot set speed: %s"
-msgstr "mount: impossibile aprire %s: %s"
+msgstr "mount: impossibile impostare la velocità: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: impossibile effettuare il fork: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: questa versione è stata compilata senza supporto per il tipo `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
-"mount: impossibile determinare il tipo di filesystem, e non è stato "
+"mount: impossibile determinare il tipo di filesystem, e non è stato "
 "specificato nessuno"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: mount non riuscito"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr "mount: il mount point di %s non è una directory"
+msgstr "mount: il mount point di %s non è una directory"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: autorizzazione negata"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: bisogna essere superuser per utilizzare mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
-msgstr "mount: %s è occupato"
+msgstr "mount: %s è occupato"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
-msgstr "mount: proc già montato"
+msgstr "mount: proc già montato"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
-msgstr "mount: %s già montato o %s occupato"
+msgstr "mount: %s già montato o %s occupato"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: il mount point %s non esiste"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount: il mount point %s è un link simbolico a nulla"
+msgstr "mount: il mount point %s è un link simbolico a nulla"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: il device speciale %s non esiste"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 "mount: il device speciale %s non esiste\n"
-"       (un prefisso di percorso non è una directory)\n"
+"       (un prefisso di percorso non è una directory)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
-msgstr "mount: %s non ancora montato, oppure l'opzione non è valida"
+msgstr "mount: %s non ancora montato, oppure l'opzione non è valida"
 
-#: mount/mount.c:966
-#, fuzzy, c-format
+#: mount/mount.c:959
+#, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 "mount: tipo fs errato, opzione non valida, superblocco su %s danneggiato,\n"
-"       o troppi file system montati"
+"       codepage mancante o altro errore"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"       In alcuni casi si possono trovare informazioni utili in syslog. "
+"Provare\n"
+"       ad esempio 'dmesg | tail'\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "mount table piena"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: impossibile leggere il superblocco"
 
-#: mount/mount.c:1011
-#, fuzzy, c-format
+#: mount/mount.c:1004
+#, c-format
 msgid "mount: %s: unknown device"
-msgstr "umount: %s: dispositivo di blocchi non valido"
+msgstr "umount: %s: dispositivo sconosciuto"
 
-#: mount/mount.c:1016
-#, fuzzy, c-format
+#: mount/mount.c:1009
+#, c-format
 msgid "mount: unknown filesystem type '%s'"
-msgstr "   l   elenco dei tipi di filesystem conosciuti"
+msgstr "mount: tipo di filesystem '%s' sconosciuto"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probabilmente si intende %s"
 
-#: mount/mount.c:1030
-#, fuzzy
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
-msgstr "mount: forse si intendeva iso9660 ?"
+msgstr "mount: forse si intendeva 'iso9660'?"
 
-#: mount/mount.c:1032
-#, fuzzy
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
-msgstr "mount: forse si intendeva iso9660 ?"
+msgstr "mount: forse si intendeva 'vfat'?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
-"mount: %s ha un numero device errato o il fs di tipo %s non è supportato"
+"mount: %s ha un numero device errato o il tipo di fs %s non è supportato"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s non è un dispositivo di blocchi e lo stat non è riuscito?"
+msgstr "mount: %s non è un dispositivo a blocchi e stat non è riuscito?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
-"mount: il kernel non riconosce %s come un dispositivo di blocchi\n"
+"mount: il kernel non riconosce %s come un dispositivo a blocchi\n"
 "       (forse `insmod driver'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount: %s  non è un dispositivo di blocchi (magari tentare `-o loop'?)"
+msgstr "mount: %s  non è un dispositivo a blocchi (forse provare `-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
-msgstr "mount: %s non è un dispositivo di blocchi"
+msgstr "mount: %s non è un dispositivo a blocchi"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
-msgstr "mount: %s non un dispositivo di blocchi valido"
+msgstr "mount: %s non è un dispositivo a blocchi valido"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
-msgstr " dispositivo di blocchi"
+msgstr "dispositivo a blocchi"
 
-#: mount/mount.c:1057
-#, fuzzy, c-format
+#: mount/mount.c:1050
+#, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "umount: impossibile rimontare %s di sola lettura\n"
+msgstr "mount: impossibile montare %s%s in sola lettura"
 
-#: mount/mount.c:1061
-#, fuzzy, c-format
+#: mount/mount.c:1054
+#, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount: %s%s è protetto da scrittura, montaggio in sola lettura in corso"
+"mount: %s%s è protetto da scrittura, ma l'opzione '-w' è stata indicata"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
-msgstr ""
-"mount: %s%s è protetto da scrittura, montaggio in sola lettura in corso"
+msgstr "mount: %s%s è protetto da scrittura, viene montato in sola lettura"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
-"mount: non è stato dato il tipo - Si presume nfs perché ci sono i due punti\n"
+"mount: non è stato dato il tipo - Si presume nfs perché ci sono i due punti\n"
 
-#: mount/mount.c:1183
-#, fuzzy, c-format
+#: mount/mount.c:1176
+#, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
-msgstr "mount: non è stato dato il tipo - Si presume smbfs perché xxx\n"
+msgstr "mount: non è stato dato il tipo - Si assume smbfs per il prefisso //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: esecuzione in background di \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: termina \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
-msgstr "mount: %s già montato su %s\n"
+msgstr "mount: %s già montato su %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8570,52 +8184,52 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
-msgstr "mount: è possibile solo per root"
+msgstr "mount: è possibile solo per root"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: nessun %s trovato - creazione in corso..\n"
+msgstr "mount: nessun %s trovato - creazione in corso...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
-msgstr "mount: non si è trovata tale partizione"
+msgstr "mount: non si è trovata tale partizione"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: mount di %s in corso\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
-msgstr ""
+msgstr "non è stato montato niente"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: impossibile trovare %s in %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: impossibile trovare %s in %s o %s"
 
 #: mount/mount_guess_fstype.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "mount: error while guessing filesystem type\n"
-msgstr "mount: si deve specificare il tipo di filesystem"
+msgstr "mount: errore tentando di indovinare il tipo di filesystem\n"
 
 #: mount/mount_guess_fstype.c:541
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount: non si è specificato un tipo di filesystem per %s\n"
+msgstr "mount: non si è specificato un tipo di filesystem per %s\n"
 
 #: mount/mount_guess_fstype.c:544
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr "      Proverò tutti i tipi citati in %s o %s\n"
+msgstr "      Proverò tutti i tipi citati in %s o %s\n"
 
 #: mount/mount_guess_fstype.c:547
 #, c-format
@@ -8625,105 +8239,105 @@ msgstr "      e sembra che questo sia swapspace\n"
 #: mount/mount_guess_fstype.c:549
 #, c-format
 msgid "       I will try type %s\n"
-msgstr "      Proverò il tipo %s\n"
+msgstr "      Proverò il tipo %s\n"
 
 #: mount/mount_guess_fstype.c:637
 #, c-format
 msgid "Trying %s\n"
 msgstr "Prova di %s in corso\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argomento host:dir eccessivamente lungo\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: attenzione:nomi host multipli non supportati\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr "mount: la directory da montare non è nell'host: formato dir\n"
+msgstr "mount: la directory da montare non è nell'host: formato dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: impossibile ottenere l'indirizzo di %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ottenuto hp->h_length non valido\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argomento dell'opzione eccessivamente lungo\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr "Attenzione: opzione proto= non riconosciuta.\n"
+msgstr "Attenzione: Opzione proto= non riconosciuta.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
-msgstr "Attenzione: l'opzione namlen non è supportata.\n"
+msgstr "Attenzione: L'opzione namlen non è gestita.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "parametro di nfs mount sconosciuto: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
-msgstr "Attenzione: l'opzione nolock non è supportata.\n"
+msgstr "Attenzione: l'opzione nolock non è gestita.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "opzione di nfs mount sconosciuta: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ottenuto un hp->h_length non valido?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS attraverso TCP non supportato.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
-msgstr "utilizzato il portmapper(mappatore porte) per trovare la porta NFS\n"
+msgstr "utilizzato il portmapper per trovare la porta NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "utilizzo della porta %d per il demone nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valore riportato di stato nfs sconosciuto: %d"
@@ -8732,7 +8346,7 @@ msgstr "valore riportato di stato nfs sconosciuto: %d"
 msgid "bug in xstrndup call"
 msgstr "bug in chiamata xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8740,223 +8354,216 @@ msgid ""
 "       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
-"utilizzo: %s [-hV]\n"
-"       %s -a [-v]\n"
-"       %s [-v] [-p priority] special ...\n"
-"       %s [-s]\n"
+"Uso: %s [-hV]\n"
+"     %s -a [-e] [-v]\n"
+"     %s [-v] [-p priorità] speciale|LABEL=volume_name ...\n"
+"     %s [-s]\n"
 
-#: mount/swapon.c:67
-#, fuzzy, c-format
+#: mount/swapon.c:66
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
-"utilizzo: %s [-hV]\n"
-"       %s -a [-v]\n"
-"       %s [-v] [-p priority] special ...\n"
-"       %s [-s]\n"
+"Uso: %s [-hV]\n"
+"     %s -a [-v]\n"
+"     %s [-v] speciale ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s su %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: impossibile trovare \"_stext\" in %s\n"
+msgstr "%s: impossibile trovare il dispositivo per %s\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: impossibile effettuare stat di %s: %s\n"
+msgstr "%s: impossibile effettuare stat di %s: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr ""
-"swapon: attenzione: %s ha le autorizzazioni non sicure %04o, 0600 è "
-"suggerito\n"
+msgstr "%s: attenzione: %s ha permessi %04o non sicuri, si suggerisce %04o\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: sto ignorando il file %s - sembra avere dei buchi.\n"
+msgstr "%s: file %s ignorato - sembra avere dei buchi.\n"
 
-#: mount/swapon.c:276
-#, fuzzy, c-format
+#: mount/swapon.c:275
+#, c-format
 msgid "Not superuser.\n"
-msgstr "Non impostato\n"
+msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: impossibile aprire %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilato senza supporto per -f\n"
 
-#: mount/umount.c:141
-#, fuzzy, c-format
+#: mount/umount.c:139
+#, c-format
 msgid "umount: cannot fork: %s"
-msgstr "mount: impossibile effettuare il fork: %s"
+msgstr "mount: impossibile fare il fork: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, directory: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: impossibile ottenere l'indirizzo di %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: ottenuto hostp->h_length non valido\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo di blocchi non valido"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: non montato"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: impossibile scrivere superblock"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: device occupato"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: non trovato"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bisogna essere superuser per eseguire umount"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: i dispositivi di blocchi non sono permessi su fs"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nessun umount2, tentativo di umount in corso...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
-"impossibile eseguire umount di %s - al suo posto è in corso un tentativo con "
+"impossibile eseguire umount di %s - al suo posto è in corso un tentativo con "
 "%s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s occupato - rimontato sola lettura\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "eseguito umount di %s\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: impossibile trovare l'elenco dei filesystem da smontare"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, fuzzy, c-format
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Utilizzo: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Uso: umount [-hV]\n"
+"     umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"     umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
-#, fuzzy
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
-msgstr "Impossibile aprire %s\n"
+msgstr "Impossibile smontare \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentativo di eseguire umount di %s in corso\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Impossibile trovare %s in mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr "umount: %s non è montato (secondo mtab)"
+msgstr "umount: %s non è montato (secondo mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembra che %s sia stato montato diverse volte"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount: %s non si trova in fstab (e non si è root)"
+msgstr "umount: %s non si trova in fstab (e non si è root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount non coerente con fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
-msgstr "umount: solamente %s può smontare %s da %s"
+msgstr "umount: solo %s può smontare %s da %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
-msgstr " umount: è possibile solo per root"
+msgstr " umount: solo root può farlo"
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr "Bisogna essere root per impostare modalità Ctrl-Alt-Del.\n"
+msgstr "Bisogna essere root per impostare modalità Ctrl-Alt-Del.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 #, c-format
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Utilizzo: ctrlaltdel hard|soft\n"
+msgstr "Uso: ctrlaltdel hard|soft\n"
 
 #: sys-utils/cytune.c:115
 #, c-format
@@ -8966,7 +8573,7 @@ msgid ""
 msgstr ""
 "Il file %s, per il valore limite %lu, il numero massimo di caratteri in fifo "
 "era %d,\n"
-"e la velocità massima di trasferimento di caratteri/secondo era di %f\n"
+"e la velocità massima di trasferimento di caratteri/secondo era di %f\n"
 
 #: sys-utils/cytune.c:126
 #, c-format
@@ -8977,7 +8584,7 @@ msgid ""
 msgstr ""
 "Il file %s, per il valore limite %lu e il valore di timeout %lu, il numero "
 "massimo di caratteri in fifo era %d,\n"
-"e la velocità massima di trasferimento di caratteri/secondo era di %f\n"
+"e la velocità massima di trasferimento di caratteri/secondo era di %f\n"
 
 #: sys-utils/cytune.c:190
 #, c-format
@@ -9010,8 +8617,9 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
-"Utilizzo: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T "
-"value]) [-g|-G] file [file...]\n"
+"Uso: %s [-q [-i intervallo]] ([-s valore]|[-S valore]) ([-t valore]|[-T "
+"valore]\n"
+"        [-g|-G] file [file...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
 #: sys-utils/cytune.c:340
@@ -9040,14 +8648,14 @@ msgid "Can't get timeout for %s: %s\n"
 msgstr "Impossibile ottenere il timeout per %s: %s\n"
 
 #: sys-utils/cytune.c:307
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr "%s: %ld %s limite e %ld %s timeout\n"
+msgstr "%s: %ld soglia corrente e %ld timeout corrente\n"
 
 #: sys-utils/cytune.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr "%s: %ld %s limite e %ld %s timeout\n"
+msgstr "%s: %ld soglia predefinita e %ld timeout predefinito\n"
 
 #: sys-utils/cytune.c:328
 msgid "Can't set signal handler"
@@ -9063,11 +8671,10 @@ msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Impossibile eseguire CYGETMON su %s: %s\n"
 
 #: sys-utils/cytune.c:419
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
-"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 
 #: sys-utils/cytune.c:425
 #, c-format
@@ -9089,41 +8696,42 @@ msgstr "   %f int/sec; %f rec (car/sec)\n"
 #: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr " Utilizzo: %s [-c] [-n level] [-s bufsize]\n"
+msgstr " Uso: %s [-c] [-n livello] [-s bufsize]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: segnale sconosciuto %s\n"
+msgstr "flock: opzione sconosciuta, interruzione.\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Uso: flock [--shared | --timeout=secondi] nomefile comando {arg arg...}\n"
 
 #: sys-utils/ipcrm.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "invalid id: %s\n"
-msgstr "Numero non valido: %s\n"
+msgstr "id non valido: %s\n"
 
 #: sys-utils/ipcrm.c:84
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "impossibile aprire %s %s\n"
+msgstr "impossibile rimuovere l'id %s %s\n"
 
 #: sys-utils/ipcrm.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
-msgstr "utilizzo: %s [shm | msg | sem] id\n"
+msgstr "uso deprecato: %s {shm | msg | sem} id ...\n"
 
 #: sys-utils/ipcrm.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "unknown resource type: %s\n"
-msgstr "parametro di nfs mount sconosciuto: %s=%d\n"
+msgstr "tipo di risorsa sconosciuto: %s\n"
 
 #: sys-utils/ipcrm.c:130
-#, fuzzy, c-format
+#, c-format
 msgid "resource(s) deleted\n"
 msgstr "risorsa eliminata\n"
 
@@ -9133,67 +8741,65 @@ msgid ""
 "usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
+"uso: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"        [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
 #: sys-utils/ipcrm.c:181
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr ""
+msgstr "%s: opzione illegale -- %c\n"
 
 #: sys-utils/ipcrm.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "%s: illegal key (%s)\n"
-msgstr "Tasto non valido"
+msgstr "%s: chiave illegale (%s)\n"
 
 #: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
-#, fuzzy
 msgid "permission denied for key"
-msgstr "mount: autorizzazione negata"
+msgstr "autorizzazione negata per la chiave"
 
 #: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
 msgid "already removed key"
-msgstr ""
+msgstr "chiave giù rimossa"
 
 #: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
-#, fuzzy
 msgid "invalid key"
-msgstr "Numero non valido: %s\n"
+msgstr "chiave non valida"
 
 #: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
 msgid "unknown error in key"
-msgstr ""
+msgstr "errore sconosciuto nella chiave"
 
 #: sys-utils/ipcrm.c:241
-#, fuzzy
 msgid "permission denied for id"
-msgstr "mount: autorizzazione negata"
+msgstr "autorizzazione negata per id"
 
 #: sys-utils/ipcrm.c:246
-#, fuzzy
 msgid "invalid id"
-msgstr "Numero non valido: %s\n"
+msgstr "id non valido"
 
 #: sys-utils/ipcrm.c:251
 msgid "already removed id"
-msgstr ""
+msgstr "id già rimosso"
 
 #: sys-utils/ipcrm.c:256
 msgid "unknown error in id"
-msgstr ""
+msgstr "errore sconosciuti in id"
 
 #: sys-utils/ipcrm.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s (%s)\n"
-msgstr "%s su %s\n"
+msgstr "%s: %s (%s)\n"
 
 #: sys-utils/ipcrm.c:267
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unknown argument: %s\n"
-msgstr "%s: segnale sconosciuto %s\n"
+msgstr "%s: argomento sconosciuto: %s\n"
 
 #: sys-utils/ipcs.c:121
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr "utilizzo : %s -asmq -tclup \n"
+msgstr "uso : %s -asmq -tclup \n"
 
 #: sys-utils/ipcs.c:122
 #, c-format
@@ -9206,10 +8812,12 @@ msgid "\t%s -h for help.\n"
 msgstr "\t%s -h per richiamare la guida.\n"
 
 #: sys-utils/ipcs.c:129
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s fornisce informazioni sulle funzionalità ipc per"
+msgstr ""
+"%s fornisce informazioni sulle funzionalità ipc a cui avete accesso in "
+"lettura.\n"
 
 #: sys-utils/ipcs.c:131
 #, c-format
@@ -9261,34 +8869,32 @@ msgstr "-i id [-s -q -m] : dettagli sulla risorsa identificata da id\n"
 #: sys-utils/ipcs.c:267
 #, c-format
 msgid "kernel not configured for shared memory\n"
-msgstr "il kernel non è configurato per la condivisione della memoria\n"
+msgstr "il kernel non è configurato per la condivisione della memoria\n"
 
 #: sys-utils/ipcs.c:273
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Limiti della memoria condivisa --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "max number of segments = %lu\n"
-msgstr "numero massimo di segmenti = %d\n"
+msgstr "numero massimo di segmenti = %lu\n"
 
 #: sys-utils/ipcs.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "max seg size (kbytes) = %lu\n"
-msgstr "dimensione max seg (kbyte) = %d\n"
+msgstr "dimensione max seg (kbyte) = %lu\n"
 
 #: sys-utils/ipcs.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "max total shared memory (pages) = %lu\n"
-msgstr "valore massimo totale di memoria condivisa (kbyte) = %d\n"
+msgstr "valore massimo totale di memoria condivisa (kbyte) = %lu\n"
 
 #: sys-utils/ipcs.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "min seg size (bytes) = %lu\n"
-msgstr "dimensione min seg (byte) = %d\n"
+msgstr "dimensione min seg (byte) = %lu\n"
 
 #: sys-utils/ipcs.c:289
 #, c-format
@@ -9326,9 +8932,9 @@ msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Segmento Mem. Condiv. Creatori/Propr.--------\n"
 
 #: sys-utils/ipcs.c:300 sys-utils/ipcs.c:420 sys-utils/ipcs.c:519
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
 #: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427
@@ -9362,9 +8968,9 @@ msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Mem. Condiv.  Conn./Sconn./Cambio  Volte --------\n"
 
 #: sys-utils/ipcs.c:306
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-20s %-20s %-20s\n"
-msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
+msgstr "%-10s %-10s %-20s %-20s %-20s\n"
 
 #: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
 #: sys-utils/ipcs.c:427 sys-utils/ipcs.c:436 sys-utils/ipcs.c:526
@@ -9390,9 +8996,9 @@ msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "------ Mem.  Condiv. Creatore/Last-op--------\n"
 
 #: sys-utils/ipcs.c:313 sys-utils/ipcs.c:531
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:314
 msgid "cpid"
@@ -9408,9 +9014,9 @@ msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segm. Memoria Condivisa --------\n"
 
 #: sys-utils/ipcs.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
 
 #: sys-utils/ipcs.c:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538
 msgid "key"
@@ -9509,9 +9115,9 @@ msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "------ Mem. Condivisa Operazione/Modif. Volte --------\n"
 
 #: sys-utils/ipcs.c:426
-#, fuzzy, c-format
+#, c-format
 msgid "%-8s %-10s %-26.24s %-26.24s\n"
-msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
+msgstr "%-8s %-10s %-26.24s %-26.24s\n"
 
 #: sys-utils/ipcs.c:427
 msgid "last-op"
@@ -9527,18 +9133,18 @@ msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Matrici semafori --------\n"
 
 #: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:437
 msgid "nsems"
 msgstr "nsems"
 
 #: sys-utils/ipcs.c:496
-#, fuzzy, c-format
+#, c-format
 msgid "kernel not configured for message queues\n"
-msgstr "kernel non configurato per i semafori\n"
+msgstr "kernel non configurato per le code di messaggi\n"
 
 #: sys-utils/ipcs.c:504
 #, c-format
@@ -9596,9 +9202,9 @@ msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Code messaggi  Inv./Ric./Modif. Volte--------\n"
 
 #: sys-utils/ipcs.c:525
-#, fuzzy, c-format
+#, c-format
 msgid "%-8s %-10s %-20s %-20s %-20s\n"
-msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
+msgstr "%-8s %-10s %-20s %-20s %-20s\n"
 
 #: sys-utils/ipcs.c:526
 msgid "send"
@@ -9631,9 +9237,9 @@ msgid "------ Message Queues --------\n"
 msgstr "------ Code messaggi  --------\n"
 
 #: sys-utils/ipcs.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
 
 #: sys-utils/ipcs.c:539
 msgid "used-bytes"
@@ -9663,24 +9269,24 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "byte=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
+msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
-#, fuzzy, c-format
+#, c-format
 msgid "att_time=%-26.24s\n"
-msgstr "att_time=%s"
+msgstr "att_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:617
-#, fuzzy, c-format
+#, c-format
 msgid "det_time=%-26.24s\n"
-msgstr "det_time=%s"
+msgstr "det_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650
-#, fuzzy, c-format
+#, c-format
 msgid "change_time=%-26.24s\n"
-msgstr "change_time=%s"
+msgstr "change_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:634
 #, c-format
@@ -9697,19 +9303,19 @@ msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:637
-#, fuzzy, c-format
+#, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
+msgstr "cbyte=%ld\tqbyte=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 
 #: sys-utils/ipcs.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "send_time=%-26.24s\n"
-msgstr "det_time=%s"
+msgstr "send_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:648
 #, c-format
 msgid "rcv_time=%-26.24s\n"
-msgstr ""
+msgstr "rcv_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:668
 #, c-format
@@ -9728,22 +9334,22 @@ msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 #: sys-utils/ipcs.c:671
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
-msgstr "modalità=%#o, access_perms=%#o\n"
+msgstr "modalità=%#o, access_perms=%#o\n"
 
 #: sys-utils/ipcs.c:673
-#, fuzzy, c-format
+#, c-format
 msgid "nsems = %ld\n"
-msgstr "nsems = %d\n"
+msgstr "nsems = %ld\n"
 
 #: sys-utils/ipcs.c:674
-#, fuzzy, c-format
+#, c-format
 msgid "otime = %-26.24s\n"
-msgstr "otime = %s"
+msgstr "otime = %-26.24s\n"
 
 #: sys-utils/ipcs.c:676
-#, fuzzy, c-format
+#, c-format
 msgid "ctime = %-26.24s\n"
-msgstr "ctime = %s"
+msgstr "ctime = %-26.24s\n"
 
 #: sys-utils/ipcs.c:679
 msgid "semnum"
@@ -9766,10 +9372,8 @@ msgid "pid"
 msgstr "pid"
 
 #: sys-utils/rdev.c:69
-#, fuzzy
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"utilizzo: rdev [ -rsv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
+msgstr "uso: rdev [ -rv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
 
 #: sys-utils/rdev.c:70
 msgid ""
@@ -9814,7 +9418,7 @@ msgstr " vidmode ...                     come rdev -v"
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
-"Nota: le modalità a video sono: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+"Nota: le modalità a video sono: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
 "2=key2,..."
 
 #: sys-utils/rdev.c:80
@@ -9824,12 +9428,12 @@ msgstr ""
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
-msgstr ""
+msgstr "virgola mancante"
 
 #: sys-utils/readprofile.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "out of memory"
-msgstr "memoria insufficiente?\n"
+msgstr "memoria esaurita"
 
 #: sys-utils/readprofile.c:118
 #, fuzzy, c-format
@@ -9848,20 +9452,24 @@ msgid ""
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s: Utilizzo: \"%s [opzioni]\n"
-"\t -m <mapfile>  (predefinito = \"%s\")\n"
-"\t -p <nome file> (predefinito = \"%s\")\n"
-"\t -i            stampa solamente le informazioni relative alla fase di "
+"%s: Uso: \"%s [opzioni]\n"
+"\t -m <mapfile>  (predefinito = \"%s\" e\n"
+"                                      \"%s\")\n"
+"\t -p <profilo>  (predefinito = \"%s\")\n"
+"         -M <mult>     FIXME\n"
+"\t -i            stampa solamente le informazioni sulla fase di "
 "campionamento\n"
 "\t -v            stampa i dati in elenco\n"
-"\t -a            stampa tutti i simboli, anche se il conteggio è 0\n"
-"\t -r            reimposta tutti i counter (solamente utente root)\n"
+"\t -a            stampa tutti i simboli, anche se il conteggio è 0\n"
+"         -b            FIXME\n"
+"\t -r            reimposta tutti i contatori (solamente utente root)\n"
+"         -n            FIXME\n"
 "\t -V            stampa versione ed esci\n"
 
 #: sys-utils/readprofile.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "%s version %s\n"
-msgstr "%s Versione %s\n"
+msgstr "%s versione %s\n"
 
 #: sys-utils/readprofile.c:284
 #, c-format
@@ -9892,7 +9500,7 @@ msgstr "totale"
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
-"utilizzo: renice priorità [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+"uso: renice priorità [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] utenti ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
@@ -9910,17 +9518,17 @@ msgstr "getpriority"
 
 #: sys-utils/renice.c:128
 msgid "setpriority"
-msgstr " setpriority"
+msgstr "setpriority"
 
 #: sys-utils/renice.c:139
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
-msgstr "%d: vecchia priorità %d, nuova priorità %d\n"
+msgstr "%d: vecchia priorità %d, nuova priorità %d\n"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "utilizzo: %s programma [arg ...]\n"
+msgstr "uso: %s programma [arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9929,9 +9537,9 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"Utilizzo: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
-"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
-"          -T [on|off] ]\n"
+"Uso: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+"        -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"        -T [on|off] ]\n"
 
 #: sys-utils/tunelp.c:91
 msgid "malloc error"
@@ -9945,12 +9553,12 @@ msgstr "%s: valore non valido\n"
 #: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
-msgstr "%s: %s no è un lp device.\n"
+msgstr "%s: %s no è un lp device.\n"
 
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
-msgstr "lo stato di %s è %d"
+msgstr "lo stato di %s è %d"
 
 #: sys-utils/tunelp.c:264
 #, c-format
@@ -9994,12 +9602,12 @@ msgstr "%s utilizzo del polling in corso\n"
 #: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr "col: argomento -l invalido per %s.\n"
+msgstr "col: argomento -l non valido per %s.\n"
 
 #: text-utils/col.c:535
-#, fuzzy, c-format
+#, c-format
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "utilizzo: col [-bfx] [-l nline]\n"
+msgstr "uso: col [-bfpx] [-l nline]\n"
 
 #: text-utils/col.c:541
 #, c-format
@@ -10017,12 +9625,12 @@ msgstr "dopo la prima linea"
 
 #: text-utils/col.c:549
 msgid "-- line already flushed"
-msgstr "-- linea già svuotata"
+msgstr "-- linea già svuotata"
 
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "utilizzo: %s [ - ] [ -2 ] [ file ... ]\n"
+msgstr "uso: %s [ - ] [ -2 ] [ file ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
@@ -10031,7 +9639,7 @@ msgstr "linea troppo lunga"
 #: text-utils/column.c:374
 #, c-format
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "utilizzo: column [-tx] [-c columns] [file ...]\n"
+msgstr "uso: column [-tx] [-c colonne] [file ...]\n"
 
 #: text-utils/hexsyntax.c:82
 #, c-format
@@ -10044,23 +9652,22 @@ msgid "hexdump: bad skip value.\n"
 msgstr "hexdump: valore skip non valido.\n"
 
 #: text-utils/hexsyntax.c:131
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
-"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 
-#: text-utils/more.c:261
-#, fuzzy, c-format
+#: text-utils/more.c:216
+#, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr " usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "Uso: %s [-dflpcsu] [+linenum | +/modello] nome1 nome2 ...\n"
 
-#: text-utils/more.c:484
-#, fuzzy, c-format
+#: text-utils/more.c:439
+#, c-format
 msgid "%s: unknown option \"-%c\"\n"
-msgstr "%s: segnale sconosciuto %s\n"
+msgstr "%s: opzione sconosciuta \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10071,8 +9678,7 @@ msgstr ""
 "*** %s: directory ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10080,50 +9686,48 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"******** %s: non è un file di testo********\n"
+"******** %s: non è un file di testo********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
-msgstr "[Utilizzare q o Q per uscire]"
+msgstr "[Usare q o Q per uscire]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Ancora--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(File successivo: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Premere spazio per continuare, 'q' per uscire.]"
 
-#: text-utils/more.c:1160
-#, fuzzy, c-format
+#: text-utils/more.c:1115
+#, c-format
 msgid "...back %d pages"
 msgstr "...indietro %d pagine"
 
-#: text-utils/more.c:1162
-#, fuzzy
+#: text-utils/more.c:1117
 msgid "...back 1 page"
-msgstr "...indietro %d pagine"
+msgstr "...indietro 1 pagina"
 
-#: text-utils/more.c:1205
-#, fuzzy
+#: text-utils/more.c:1160
 msgid "...skipping one line"
-msgstr "...sto saltando %d righe"
+msgstr "...sto saltando una riga"
 
-#: text-utils/more.c:1207
-#, fuzzy, c-format
+#: text-utils/more.c:1162
+#, c-format
 msgid "...skipping %d lines"
 msgstr "...sto saltando %d righe"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10133,7 +9737,7 @@ msgstr ""
 "***Indietro***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10141,7 +9745,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10164,34 +9768,34 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Premere 'h' per visualizzare le istruzioni.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
-msgstr "\"%s\" linea %d"
+msgstr "\"%s\" riga %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
-msgstr "[Non un file] linea %d"
+msgstr "[Non un file] riga %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Overflow\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...ignora\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Errore nell'espressione regolare"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10199,15 +9803,15 @@ msgstr ""
 "\n"
 "Pattern non trovato\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Pattern non trovato"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "impossibile effettuare fork\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10215,33 +9819,31 @@ msgstr ""
 "\n"
 "...sto ignorando"
 
-#: text-utils/more.c:1678
-#, fuzzy
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
-msgstr "...Sto ignorando"
+msgstr ""
 
-#: text-utils/more.c:1680
-#, fuzzy
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
-msgstr "ritorna al file"
+msgstr ""
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
-msgstr "Linea troppo lunga"
+msgstr "Riga troppo lunga"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Nessun comando precedente da sostituire"
 
 #: text-utils/odsyntax.c:130
 #, c-format
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr "od: od(1) è stata sostituito da hexdump(1).\n"
+msgstr "od: od(1) è stata sostituito da hexdump(1).\n"
 
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr "od: la compatibilità hexdump(1) non supporta l'opzione -%c %s\n"
+msgstr "od: la compatibilità hexdump(1) non supporta l'opzione -%c %s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
@@ -10283,101 +9885,90 @@ msgstr "hexdump: formato non valido {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: carattere di conversione non valido %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
+"%s: Uso: %s [-numero] [-p stringa] [-cefnrs] [+riga] [+/modello/] [file]\n"
 
-#: text-utils/pg.c:266
-#, fuzzy, c-format
+#: text-utils/pg.c:246
+#, c-format
 msgid "%s: option requires an argument -- %s\n"
-msgstr "l'opzione `%s' richiede un argomento\n"
+msgstr "%s: l'opzione richiede un argomento -- %s\n"
 
-#: text-utils/pg.c:274
-#, fuzzy, c-format
+#: text-utils/pg.c:254
+#, c-format
 msgid "%s: illegal option -- %s\n"
-msgstr "Tasto non valido"
+msgstr "%s: opzione illecita -- %s\n"
 
-#: text-utils/pg.c:391
-#, fuzzy
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
-msgstr "...ignora\n"
+msgstr ""
 
-#: text-utils/pg.c:393
-#, fuzzy
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
-msgstr "...ignora\n"
+msgstr ""
 
-#: text-utils/pg.c:415
-#, fuzzy
+#: text-utils/pg.c:395
 msgid "No next file"
-msgstr "(File successivo: %s)"
+msgstr "Nessun file successivo"
 
-#: text-utils/pg.c:419
-#, fuzzy
+#: text-utils/pg.c:399
 msgid "No previous file"
-msgstr "Nessuna partizione definita\n"
+msgstr "Nessun file precedente"
 
-#: text-utils/pg.c:949
-#, fuzzy, c-format
+#: text-utils/pg.c:929
+#, c-format
 msgid "%s: Read error from %s file\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: Errore di lettura dal file %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
-msgstr ""
+msgstr "%s: EOF non previsto nel file %s\n"
 
-#: text-utils/pg.c:958
-#, fuzzy, c-format
+#: text-utils/pg.c:938
+#, c-format
 msgid "%s: Unknown error in %s file\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: Errore sconosciuto nel file %s\n"
 
-#: text-utils/pg.c:1053
-#, fuzzy, c-format
+#: text-utils/pg.c:1033
+#, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr "%s: impossibile leggere il file temporaneo.\n"
+msgstr "%s: Impossibile creare il file temporaneo\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
-#, fuzzy
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
-msgstr ", errore"
+msgstr ""
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
-msgstr ""
+msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
-msgstr ""
+msgstr "Nessuna stringa di ricerca ricordata"
 
-#: text-utils/pg.c:1328
-#, fuzzy
+#: text-utils/pg.c:1308
 msgid "Cannot open "
-msgstr "Impossibile aprire %s\n"
+msgstr "Impossibile aprire "
 
-#: text-utils/pg.c:1376
-#, fuzzy
+#: text-utils/pg.c:1356
 msgid "saved"
-msgstr "invio"
+msgstr "salvato"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
-#, fuzzy
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
-msgstr "Password *NON* modificata. Riprovare successivamente.\n"
+msgstr "fork() non riuscito, riprovare più tardi\n"
 
-#: text-utils/pg.c:1720
-#, fuzzy
+#: text-utils/pg.c:1700
 msgid "(Next file: "
-msgstr "(File successivo: %s)"
+msgstr "(File successivo: "
 
 #: text-utils/rev.c:113
 #, c-format
@@ -10387,22 +9978,22 @@ msgstr "Impossibile allocare lo spazio buffer\n"
 #: text-utils/rev.c:156
 #, c-format
 msgid "usage: rev [file ...]\n"
-msgstr "utilizzo: rev [file ...]\n"
+msgstr "uso: rev [file ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "impossibile aprire %s in lettura"
+msgstr "Impossibile aprire \"%s\" in lettura\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "utilizzo: %s [file]\n"
+msgstr "Uso: tailf file-di-log\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "utilizzo: %s [ -i ] [ -tTerm ] file...\n"
+msgstr "Uso: %s [ -i ] [ -tTerm ] file...\n"
 
 #: text-utils/ul.c:152
 #, c-format
@@ -10429,399 +10020,152 @@ msgstr "Linea di input troppo lunga.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 
-#, fuzzy
-#~ msgid "Warning: omitting partitions after %d\n"
-#~ msgstr "Attenzione: cancellazione delle partizioni dopo %d\n"
-
-#~ msgid "mount: fs type %s not supported by kernel"
-#~ msgstr "mount: fs di tipo %s non supportato dal kernel"
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Numero non valido: %s\n"
 
-#~ msgid "BLKGETSIZE ioctl failed for %s\n"
-#~ msgstr "BLKGETSIZE ioctl non riuscito per %s\n"
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Errore di sintassi: '%s'\n"
 
-#~ msgid "%s: not compiled with minix v2 support\n"
-#~ msgstr "%s: non e' stato compilato con il supporto per minix v2\n"
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Parametro non impostato: '%s'\n"
 
-#~ msgid "Boot (%02X)"
-#~ msgstr "Avvio (%02X)"
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] dev nome\n"
 
-#~ msgid "None (%02X)"
-#~ msgstr "Nessuno (%02X)"
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] disp\n"
 
-#, fuzzy
-#~ msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-#~ msgstr "%s: [%04x]:%ld (%s) offset %d, criptazione %s\n"
-
-#~ msgid ""
-#~ "mount: Could not find any loop device.\n"
-#~ "       Maybe /dev/loop# has a wrong major number?"
-#~ msgstr ""
-#~ "mount: impossibile trovare qualsiasi loop device.\n"
-#~ "       Forse /dev/loop# ha un major number errato?"
-
-#~ msgid ""
-#~ "mount: Could not find any loop device. Maybe this kernel does not know\n"
-#~ "       about the loop device (then recompile or `insmod loop.o'), or\n"
-#~ "       maybe /dev/loop# has the wrong major number?"
-#~ msgstr ""
-#~ "mount: impossibile trovare qualsiasi loop device. Forse questo kernel\n"
-#~ "       non è a conoscenza del loop device (allora ricompilare o \n"
-#~ "       `insmod loop.o'), o forse /dev/loop# ha il major number errato?"
-
-#, fuzzy
-#~ msgid "Error: unable to open %s for reading\n"
-#~ msgstr "impossibile aprire %s in lettura"
-
-#, fuzzy
-#~ msgid "Retype password: "
-#~ msgstr "Ridigitare la nuova password: "
-
-#, fuzzy
-#~ msgid "Error: gpg key file decryption failed\n"
-#~ msgstr "apertura file rc non riuscita\n"
-
-#, fuzzy
-#~ msgid "Error: Password must be at least %d characters.\n"
-#~ msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
-
-#, fuzzy
-#~ msgid "Error: Unable to allocate memory\n"
-#~ msgstr "Impossibile allocare altra memoria\n"
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] disp\n"
 
-#~ msgid "Init (up to 16 hex digits): "
-#~ msgstr "Init (fino a 16 cifre esadecimali): "
+#~ msgid "version"
+#~ msgstr "versione"
 
-#~ msgid "Non-hex digit '%c'.\n"
-#~ msgstr "Cifra non esadec. '%c'.\n"
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr " impossibile aprire /dev/urandom"
 
-#~ msgid "Don't know how to get key for encryption system %d\n"
-#~ msgstr "Non so come ottenere la chiave del sistema di criptazione %d\n"
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "impossibile leggere dati casuali da /dev/urandom"
 
-#, fuzzy
-#~ msgid "Error: unable to open /etc/fstab for reading\n"
+#~ msgid "can't open %s for reading"
 #~ msgstr "impossibile aprire %s in lettura"
 
-#, fuzzy
-#~ msgid "mount: %s duplicate - not mounted"
-#~ msgstr "umount: %s: non montato"
-
-#~ msgid "UUID"
-#~ msgstr "UUID"
-
-#, fuzzy
-#~ msgid "swapon: invalid loop device name\n"
-#~ msgstr "umount: %s: dispositivo di blocchi non valido"
+#~ msgid "can't stat(%s)"
+#~ msgstr "impossibile eseguire stat(%s)"
 
 #, fuzzy
-#~ msgid "swapon: unable to open loop device %s\n"
-#~ msgstr "mount: si intende utilizzare il loop device %s\n"
-
-#, fuzzy
-#~ msgid "swapon: loop device %s already in use\n"
-#~ msgstr "Questa partizione è già in uso"
-
-#, fuzzy
-#~ msgid "swapon: unable to open swap device %s\n"
-#~ msgstr "impossibile riavvolgere il dispositivo swap"
-
-#, fuzzy
-#~ msgid "swapon: unable to open /dev/urandom\n"
-#~ msgstr " impossibile aprire /dev/urandom"
-
-#, fuzzy
-#~ msgid "swapon: unable to create pipe\n"
-#~ msgstr "impossibile scrivere inode"
-
-#, fuzzy
-#~ msgid "swapon: fork failed\n"
-#~ msgstr "fork non riuscito\n"
-
-#, fuzzy
-#~ msgid "swapon: random password for %s is %s"
-#~ msgstr "Modifica password per %s\n"
-
-#~ msgid "umount: only root can unmount %s from %s"
-#~ msgstr "umount: solamente root può smontare %s da %s"
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s non ha i filemode corretti"
 
-#~ msgid "Partition %i does not end on cylinder boundary:\n"
-#~ msgstr "La partizione %i non termina al limite del cilindro:\n"
-
-#~ msgid "Can't open help file"
-#~ msgstr "Impossibile aprire il file guida"
+#~ msgid "can't read data from %s"
+#~ msgstr "impossibile leggere i dati da %s"
 
 #~ msgid ""
-#~ "\n"
-#~ "Disk %s: %d heads, %d sectors, %d cylinders\n"
-#~ "Units = %s of %d * %d bytes\n"
-#~ "\n"
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
 #~ msgstr ""
-#~ "\n"
-#~ "Disco %s: %d testine, %d settori, %d cilindri\n"
-#~ "Unità = %s di %d * %d byte\n"
-#~ "\n"
-
-#~ msgid "invalid number `%s'\n"
-#~ msgstr "numero `%s' non valido\n"
-
-#~ msgid "number `%s' to `%s' out of range\n"
-#~ msgstr " numero `%s' su `%s' fuori intervallo\n"
-
-#~ msgid "unrecognized option `%s'\n"
-#~ msgstr "opzione `%s' non riconosciuta\n"
-
-#~ msgid "option `%s' requires an argument\n"
-#~ msgstr "l'opzione `%s' richiede un argomento\n"
-
-#~ msgid "option `%s' doesn't allow an argument\n"
-#~ msgstr "l'opzione `%s' non consente un argomento\n"
-
-#~ msgid "unrecognized option `-%c'\n"
-#~ msgstr "opzione `-%c' non riconosciuta\n"
-
-#, fuzzy
-#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-#~ msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
-
-#~ msgid "Block %d in file `"
-#~ msgstr "Blocco %d nel file `"
+#~ "Troppi utenti già collegati.\n"
+#~ "Riprovare successivamente.\n"
 
-#, fuzzy
-#~ msgid "The directory '"
-#~ msgstr "Nessuna directory %s!\n"
-
-#~ msgid "not "
-#~ msgstr "non "
-
-#~ msgid "BSD/386"
-#~ msgstr "BSD/386"
-
-#~ msgid "cannot open %s %s\n"
-#~ msgstr "impossibile aprire %s %s\n"
-
-#~ msgid "read-write"
-#~ msgstr "lettura-scrittura"
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Ci sono troppi processi in esecuzione.\n"
 
-#~ msgid "for reading"
-#~ msgstr "in lettura"
-
-#~ msgid "new "
-#~ msgstr "nuovo "
-
-#~ msgid "The password must contain characters out of two of the following\n"
-#~ msgstr "La password deve contenere caratteri delle due seguenti\n"
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
 
 #~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
 #~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
 #~ msgstr ""
-#~ "classi:  lettere maiuscole minuscole, cifre e caratteri non "
-#~ "alfanumerici.\n"
-
-#~ msgid "characters. See passwd(1) for more information.\n"
-#~ msgstr "Consultare passwd(1) per ulteriori informazioni.\n"
-
-#~ msgid "rebooted"
-#~ msgstr "riavviato"
+#~ "La password deve contenere caratteri tratti da due delle seguenti "
+#~ "classi:\n"
+#~ "lettere maiuscole e minuscole, numeri e caratteri non alfanumerici.\n"
+#~ "Consultare passwd(1) per maggiori informazioni.\n"
 
-#~ msgid "halted"
-#~ msgstr "arrestato"
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Impossibile riutilizzare la vecchia password.\n"
 
-#~ msgid "current"
-#~ msgstr "corrente"
-
-#~ msgid "default"
-#~ msgstr "predefinito"
-
-#~ msgid "%s: %lu ints, %lu/%lu chars; "
-#~ msgstr "%s: %lu ints, %lu/%lu chars;"
-
-#~ msgid "fifo: %lu thresh, %lu tmout, "
-#~ msgstr "fifo: %lu thresh, %lu tmout, "
-
-#~ msgid "%lu max, %lu now\n"
-#~ msgstr "%lu max, %lu now\n"
-
-#~ msgid " which you have read access.\n"
-#~ msgstr " le quali si ha accesso in lettura.\n"
-
-#~ msgid "to file "
-#~ msgstr "al file"
-
-#~ msgid "usage: banner [-w width]\n"
-#~ msgstr "utilizzo: banner [-w width]\n"
-
-#~ msgid "Message: "
-#~ msgstr "Messaggio: "
-
-#~ msgid "The character '%c' is not in my character set"
-#~ msgstr "Il carattere '%c' non è compreso nel mio set di caratteri"
-
-#~ msgid "Message '%s' is OK\n"
-#~ msgstr "Il messaggio '%s' è OK\n"
-
-#~ msgid "ioctl() to open /dev/tty1 failed"
-#~ msgstr "impossibile per ioctl() aprire /dev/tty1"
-
-#~ msgid ": bad directory: size<32"
-#~ msgstr ": directory danneggiata: dimensione<32"
-
-#~ msgid "Warning: partition %d has an odd number of sectors.\n"
-#~ msgstr "Attenzione: la partizione %d ha un numero strano di settori.\n"
-
-#~ msgid ""
-#~ "Re-read table failed with error %d: %s.\n"
-#~ "Reboot your system to ensure the partition table is updated.\n"
+#~ msgid "Please don't use something like your username as password!\n"
 #~ msgstr ""
-#~ "Rilettura della tabella non riuscita con errore %d: %s.\n"
-#~ "Riavviare il sistema per assicurarsi che la tabella delle partizioni sia "
-#~ "aggiornata.\n"
-
-#~ msgid "SGI rxlvol"
-#~ msgstr "SGI rxlvol"
-
-#~ msgid "AST Windows swapfile"
-#~ msgstr "AST Windows swapfile"
-
-#~ msgid "Warning: partition %s contains part of "
-#~ msgstr "Attenzione: la partizione %s contiene parte della "
-
-#~ msgid "the partition table (sector %lu),\n"
-#~ msgstr "tabella delle partizioni (settore %lu),\n"
-
-#~ msgid "and will destroy it when filled\n"
-#~ msgstr "e la eliminerà quando è piena\n"
-
-#~ msgid " (although this is not a problem under Linux)\n"
-#~ msgstr " (sebbene questo non costituisca un problema su Linux)\n"
+#~ "Non utilizzare come password qualcosa che assomigli al proprio nome "
+#~ "utente!\n"
 
-#~ msgid "%s: open for update: %m"
-#~ msgstr "%s: apertura per l'aggiornamento: %m"
-
-#~ msgid "%s: no utmp entry"
-#~ msgstr "%s: nessuna voce utmp"
-
-#~ msgid "badlogin: %s\n"
-#~ msgstr "login non valida: %s\n"
-
-#~ msgid "sleepexit %d\n"
-#~ msgstr "sleepexit %d\n"
-
-#~ msgid "Usage: %s [ -s shell ] "
-#~ msgstr "Utilizzo: %s [ -s shell ]"
-
-#~ msgid "       [ username ]\n"
-#~ msgstr "       [ nome utente ]\n"
-
-#~ msgid "Warning: no Kerberos tickets issued\n"
-#~ msgstr "Attenzione: non sono stati emessi i ticket di Kerberos\n"
-
-#~ msgid "Sorry -- your password has expired.\n"
-#~ msgstr "La password è scaduta.\n"
-
-#~ msgid "Warning: your password expires on %d %s %d.\n"
-#~ msgstr "Attenzione: la password scade in data %d %s %d.\n"
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "Non utilizzare come password qualcosa che assomigli al proprio vero "
+#~ "nome!\n"
 
-#~ msgid "Sorry -- your account has expired.\n"
-#~ msgstr "L'account è scaduto.\n"
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Uso: passwd [nome utente [password]]\n"
 
-#~ msgid "Warning: your account expires on %d %s %d.\n"
-#~ msgstr "Attenzione: l'account scade in data %d %s %d.\n"
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Solo root può utilizzare le forme a uno e due argomenti\n"
 
-#~ msgid "s"
-#~ msgstr "s"
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Uso: passwd [-foqsvV] [utente [password]]\n"
 
-#~ msgid "snow.on"
-#~ msgstr " snow.on"
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Exec %s impossibile: %s\n"
 
-#~ msgid "snow.off"
-#~ msgstr " snow.off"
+#~ msgid "Cannot find login name"
+#~ msgstr "Impossibile trovare il nome di login"
 
-#~ msgid "softscroll.on"
-#~ msgstr " softscroll.on"
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Solo root può modificare la password per gli altri.\n"
 
-#~ msgid "softscroll.off"
-#~ msgstr " softscroll.off"
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Troppi argomenti.\n"
 
-#~ msgid "mount: warning: cannot change mounted device with a remount\n"
-#~ msgstr ""
-#~ "mount: attenzione: impossibile modificare il device montato con un "
-#~ "rimontaggio\n"
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Impossibile trovare il nome utente.`%s' è davvero un utente?"
 
-#~ msgid "mount: warning: cannot change filesystem type with a remount\n"
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 #~ msgstr ""
-#~ "mount: attenzione: impossibile modificare il tipo di filesystem con un "
-#~ "rimontaggio\n"
+#~ "Posso modificare solo le password locali. Utilizzare invece yppasswd."
 
-#~ msgid "not mounted anything"
-#~ msgstr "niente è montato"
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID e nome utente non combaciano, impostore!"
 
-#~ msgid "send_time=%srcv_time=%schange_time=%s"
-#~ msgstr "send_time=%srcv_time=%schange_time=%s"
-
-#~ msgid "Not Set\n"
-#~ msgstr "Non impostato\n"
-
-#~ msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
-#~ msgstr "  rdev -s /dev/fd0 /dev/hda2      imposta SWAP device"
-
-#~ msgid "  swapdev ...                     same as rdev -s"
-#~ msgstr "  swapdev ...                     same as rdev -s"
-
-#~ msgid "anything\n"
-#~ msgstr "qualsiasi\n"
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Modifica password per %s\n"
 
-#~ msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
-#~ msgstr "Velocità di ripetizione impostata su %.1f cps (ritardo = %d ms)\n"
+#~ msgid "Enter old password: "
+#~ msgstr "Immettere vecchia password: "
 
-#~ msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
-#~ msgstr " Utilizzo: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Password non valida, impostore."
 
-#~ msgid "Cannot open /dev/port"
-#~ msgstr "Impossibile aprire /dev/port"
+#~ msgid "Enter new password: "
+#~ msgstr "Immettere la nuova password: "
 
-#~ msgid "Writing disklabel to %s%d.\n"
-#~ msgstr "Scrittura del disklabel su %s%d in corso.\n"
+#~ msgid "Password not changed."
+#~ msgstr "Password non modificata."
 
-#~ msgid "%s%d contains no disklabel.\n"
-#~ msgstr "%s%d non contiene disklabel.\n"
+#~ msgid "Re-type new password: "
+#~ msgstr "Ridigitare la nuova password: "
 
-#~ msgid "Bootstrap installed on %s%d.\n"
-#~ msgstr "Bootstrap installato su %s%d.\n"
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Ortografia sbagliata. La password non è stata modificata."
 
-#~ msgid "%s: unknown geometry\n"
-#~ msgstr "%s: geometria sconosciuta\n"
+#~ msgid "password changed, user %s"
+#~ msgstr "password modificata, utente %s"
 
-#~ msgid "exec rc failed\n"
-#~ msgstr " exec di rc non riuscito\n"
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "PASSWORD ROOT MODIFICATA"
 
-#~ msgid "fork of rc shell failed\n"
-#~ msgstr "fork della shell rc non riuscita\n"
+#~ msgid "password changed by root, user %s"
+#~ msgstr "password modificata da root, utente %s"
 
-#~ msgid "Cannot get loop info"
-#~ msgstr "Impossibile avere informazioni sul loop"
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "chiamata di setpwnam per impostare la password.\n"
 
-#~ msgid "mount: %s has wrong major or minor number"
-#~ msgstr "mount: %s ha un major o un minor number errato"
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Password *NON* modificata. Riprovare successivamente.\n"
 
-#~ msgid "mount: block device %s is not permitted on its filesystem"
-#~ msgstr ""
-#~ "mount: il dispositivo di blocchi %s non è consentito sul relativo "
-#~ "filesystem"
+#~ msgid "Password changed.\n"
+#~ msgstr "Password modificata.\n"
 
-#~ msgid ""
-#~ "Usage: mount [-hV]\n"
-#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
-#~ "       mount [-nfrsvw] [-o options] special | node\n"
-#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
 #~ msgstr ""
-#~ "Utilizzo: mount [-hV]\n"
-#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
-#~ "       mount [-nfrsvw] [-o options] special | node\n"
-#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-#~ "       Un device speciale può essere indicato da  -L label  o  -U uuid .\n"
-
-#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
-#~ msgstr "mount: %s:%s non riuscito, motivo indicato dal server: %s\n"
-
-#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
-#~ msgstr "utilizzo: %s [-shm | -msg | -sem] id\n"
+#~ "mount: questa versione è stata compilata senza supporto per il tipo 'nfs'"
diff --git a/po/ja.gmo b/po/ja.gmo
new file mode 100644
index 000000000..b4d4fdead
--- /dev/null
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 6540a668d..8b84a3155 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11n\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2001-12-11 22:43+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -115,7 +115,7 @@ msgstr "%s: %s ¤Ç ioctl ¥¨¥é¡¼\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   ³«»ÏSec    ¥µ¥¤¥º   ¥Ç¥Ð¥¤¥¹\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "»È¤¤Êý:\n"
@@ -159,13 +159,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "»È¤¤Êý: %s [ -n ] ¥Ç¥Ð¥¤¥¹\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s from %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -190,7 +189,7 @@ msgstr "ξ"
 msgid "Single"
 msgstr "ÊÒ"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -200,97 +199,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, fuzzy, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: %s ¤Ç seek ¥¨¥é¡¼\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, fuzzy, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "(%d, %d, %d) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, fuzzy, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: minix v2 ¤Î¥µ¥Ý¡¼¥È¤Ä¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, fuzzy, c-format
 msgid "%s is not a block device or file\n"
 msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó²òÀÏ¥¨¥é¡¼\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -767,7 +766,7 @@ msgstr "i-¥Î¡¼¥É¤¬Â¿¤¹¤®¤Þ¤¹ - ºÇÂç 512 ¤Ç¤¹"
 msgid "not enough space, need at least %lu blocks"
 msgstr "Îΰ褬ÉÔ½½Ê¬¤Ç¤¹¡£ºÇÄã¤Ç¤â %lu ¥Ö¥í¥Ã¥¯É¬ÍפǤ¹"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "¥Ç¥Ð¥¤¥¹: %s\n"
@@ -836,19 +835,19 @@ msgstr ".. ¹àÌܽñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 msgid "error closing %s"
 msgstr "%s ¤Î close ¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "»È¤¤Êý: mkfs [-V] [-t ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à·¿] [fs ¥ª¥×¥·¥ç¥ó] ¥Ç¥Ð¥¤¥¹ [¥µ¥¤¥º]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: ¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó¡ª\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs ¥Ð¡¼¥¸¥ç¥ó %s (%s)\n"
@@ -891,7 +890,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -944,10 +942,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, fuzzy, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1020,7 +1014,6 @@ msgstr "inode ¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó"
 msgid "write failed in write_block"
 msgstr "write_block ¤Ç¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1056,7 +1049,7 @@ msgstr "¥Ö¥í¥Ã¥¯¤Î¥Æ¥¹¥ÈÃæ¤Ë¥·¡¼¥¯¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check ¤ËÊѤÊÃͤ¬¤¢¤ê¤Þ¤¹: ¿ʬ¥Ð¥°¤Ç¤·¤ç¤¦\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "check_blocks ¤Ç¤Î¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
@@ -1098,106 +1091,106 @@ msgstr "%s ¤Î¾õÂÖ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' ¾å¤Ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºî¤é¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "ÉÔÀµ¤Ê¥æ¡¼¥¶»ØÄê¥Ú¡¼¥¸¥µ¥¤¥º %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "¥·¥¹¥Æ¥à¤Î¥Ú¡¼¥¸¥µ¥¤¥ºÃÍ %2$d/%3$d ¤ÎÂå¤ï¤ê¤Ë¡¢¥æ¡¼¥¶»ØÄêÃÍ %1$d ¤ò»È¤¤¤Þ¤¹\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "¥µ¥¤¥º %d (%d ¤Ç¤Ï¤Ê¤¯) ¤Î¥Ú¡¼¥¸¤ò»î¤·¤Þ¤¹\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "¥é¥Ù¥ë"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "»È¤¤Êý: %s [-c] [-v0|-v1] [-p¥Ú¡¼¥¸¥µ¥¤¥º] /dev/name [¥Ö¥í¥Ã¥¯¿ô]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "ÉÔÀµ¥Ú¡¼¥¸¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "ÉÔÀµ¤Ê¥Ú¡¼¥¸¿ô\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "ÉÔÀµ¤Ê¥Ú¡¼¥¸¿ô %d\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: ¥¨¥é¡¼: ¥¹¥ï¥Ã¥×¤òÍ­¸ú¤ËÀßÄꤹ¤ë¤¿¤á¤Î¾ì½ê¤¬¤Ê¤¤¡©\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: ¥¨¥é¡¼: ¥µ¥¤¥º %ld ¤¬¥Ç¥Ð¥¤¥¹¤Î¥µ¥¤¥º %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: ¥¨¥é¡¼: ÉÔÌÀ¤Ê¥Ð¡¼¥¸¥ç¥ó %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: ¥¨¥é¡¼: ¥¹¥ï¥Ã¥×Îΰè¤Ï¾¯¤Ê¤¯¤È¤â %ldkB ɬÍפǤ¹\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: ·Ù¹ð: ¥¹¥ï¥Ã¥×Îΰè¤ò %ldkB ¤ËÀÚ¤êµÍ¤á¤Þ¤·¤¿\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: ¥¨¥é¡¼: ¥¹¥ï¥Ã¥×¤òÍ­¸ú¤ËÀßÄꤹ¤ë¤¿¤á¤Î¾ì½ê¤¬¤Ê¤¤¡©\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "'%s' ¤Ë¤Ï¥¹¥ï¥Ã¥×¥Ç¥ô¥¡¥¤¥¹¤òºî¤é¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "Ã×Ì¿¥¨¥é¡¼: ºÇ½é¤Î¥Ú¡¼¥¸¤òÆɹþ¤á¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1210,120 +1203,83 @@ msgstr ""
 "¤·¤Þ¤¦¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£¤â¤·¤¢¤Ê¤¿¤¬ËÜÅö¤Ë¤½¤Î¥Ç¥Ð¥¤¥¹¤Ë v0 ¥¹¥ï¥Ã¥×\n"
 "¤ò¤òºîÀ®¤·¤¿¤±¤ì¤Ð¡¢-f ¥ª¥×¥·¥ç¥ó¤Ç¶¯Íפ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "¥¹¥ï¥Ã¥×¶õ´Ö¤òÀßÄê¤Ç¤­¤Þ¤»¤ó: Æɹþ¤á¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "¥¹¥ï¥Ã¥×¶õ´Ö¥Ð¡¼¥¸¥ç¥ó %d ¤òÀßÄꤷ¤Þ¤¹¡¢¥µ¥¤¥º = %ld ¥Ð¥¤¥È\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "¥¹¥ï¥Ã¥×¥Ç¥ô¥¡¥¤¥¹¤ò´¬¤­Ì᤻¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "½ð̾¥Ú¡¼¥¸¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync ¤Ë¼ºÇÔ"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "ÉÔÀµ¤Ê¿ô: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "ʸˡ¥¨¥é¡¼: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "¤½¤Î¤è¤¦¤ÊÀßÄê¥Ñ¥é¥á¥¿¤Ï¤¢¤ê¤Þ¤»¤ó: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] ¥Ç¥Ð¥¤¥¹ ̾Á°\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] ¥Ç¥Ð¥¤¥¹\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] ¥Ç¥Ð¥¤¥¹\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "»ÈÍÑÉÔ²Ä"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "¶õ¤­Îΰè"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "¥Ç¥£¥¹¥¯¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr "Îΰè¾ðÊó¤òÀµ¤·¤¯¹¹¿·¤µ¤»¤ë¤Ë¤Ï¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1336,330 +1292,311 @@ msgstr ""
 "¤Þ¤Ã¤¿¾ì¹ç¤Ï¡¢cfdisk ¥Þ¥Ë¥å¥¢¥ë¤Ë¤¢¤ëÄɲþðÊó¥Ú¡¼¥¸\n"
 "¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "*Ã×̿Ū¤Ê¥¨¥é¡¼*"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "ÃæÃǤ¹¤ë¤Ë¤Ï²¿¤«¥­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¾å¤Ç seek ¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤òÆɤ߹þ¤á¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Îΰ褬¿¤¹¤®¤Þ¤¹"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Îΰ褬¥»¥¯¥¿ 0 ¤è¤ê¤Þ¤¨¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Îΰ褬¥»¥¯¥¿ 0 ¤è¤êÁ°¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Îΰ褬¥Ç¥£¥¹¥¯¤Î½ªÅÀ¤è¤ê¤â¸å¤í¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Îΰ褬¥Ç¥£¥¹¥¯¤Î½ªÅÀ¤è¤ê¤â¸å¤í¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "ÏÀÍýÎΰ褬¥Ç¥£¥¹¥¯¤Î½ç½ø¤È°ìÃפ·¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "ÏÀÍýÎΰ褬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "³ÈÂ礵¤ì¤¿ÏÀÍýÎΰ褬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! ÆâÉô¥¨¥é¡¼¡£³ÈÄ¥Îΰè°Ê³°¤ËÏÀÍý¥É¥é¥¤¥Ö¤òºîÀ®¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹ !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "¤³¤³¤Ë¤ÏÏÀÍý¥É¥é¥¤¥Ö¤òºîÀ®¤Ç¤­¤Þ¤»¤ó -- 2 ¤Ä¤Î³ÈÄ¥Îΰè¤Ç¤¢¤ì¤ÐºîÀ®¤·¤Þ¤¹"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "¥á¥Ë¥å¡¼¹àÌÜ̾¤¬Ä¹¤¹¤®¤Þ¤¹¡£¥á¥Ë¥å¡¼É½¼¨¤¬Íð¤ì¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "¥á¥Ë¥å¡¼¤ËÊý¸þ¤¬¤¢¤ê¤Þ¤»¤ó¡£¿åÊ¿Êý¸þ¤ò½é´üÃͤȤ·¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "ÉÔÀµ¤Ê¥­¡¼"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "³¤±¤ë¤Ë¤Ï²¿¤«¥­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "¿·µ¬¤Ë´ðËÜÎΰè¤òºîÀ®¤·¤Þ¤¹"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "ÏÀÍýÎΰè"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "¿·µ¬¤ËÏÀÍýÎΰè¤òºîÀ®¤·¤Þ¤¹"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "̾ȧ"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Îΰè¤òºîÀ®¤·¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! ÆâÉô¥¨¥é¡¼ !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "¥µ¥¤¥º (MB ñ°Ì): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "ºÇ½é¤«¤é"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "¶õ¤­Îΰè¤ÎºÇ½é¤ËÎΰè¤òÄɲÃ"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "ºÇ¸å¤«¤é"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "¶õ¤­Îΰè¤ÎºÇ¸å¤ËÎΰè¤òÄɲÃ"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "³ÈÄ¥Îΰè¤òºîÀ®¤¹¤ë¤¿¤á¤Î¾ì½ê¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "¸½ºß¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤¬Ìµ¤¤¤«Îΰè¥Æ¡¼¥Ö¥ë¤Î½ð̾¤¬ÉÔÀµ¤Ç¤¹"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "ñ¤ËÎΰè¾ðÊó¤òɽ¼¨"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "¸½ºß¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "¥¼¥í¥Æ¡¼¥Ö¥ë¤Ç³«»Ï¤·¤Þ¤·¤ç¤¦¤« [y/N] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "¥Ç¥£¥¹¥¯¤Ë¤È¤Ã¤ÆŬÀڤʿô¤è¤ê¤â¿¤¯¤Î¥·¥ê¥ó¥À¿ô¤ò»ØÄꤵ¤ì¤Þ¤·¤¿"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤ò³«¤±¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "¥Ç¥£¥¹¥¯¤òÆɹþ¤ßÀìÍѤdz«¤­¤Þ¤·¤¿ -- ¤¢¤Ê¤¿¤Ë¤Ï½ñ¹þ¤ß¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "¥Ç¥£¥¹¥¯¥µ¥¤¥º¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "ÉÔÀµ¤Ê´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "ÉÔÀµ¤ÊÏÀÍýÎΰè"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "·Ù¹ð¡ª ¤³¤ì¤Ï¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥¯¤Ë¤¢¤ë¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ó¤Ç¤â¤è¤í¤·¤¤¤Ç¤¹¤«¡©(yes ¤Þ¤¿¤Ï no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "`yes' ¤« `no' ¤Î¤¤¤º¤ì¤«¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò½ñ¤­¹þ¤ßÃæ..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¤Þ¤·¤¿"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Îΰè¥Æ¡¼¥Ö¥ë¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¤¬¡¢ºÆÆɹþ¤ß¤Ë¼ºÇÔ¡£ºÆµ¯Æ°¤·¤Æ¹¹¿·¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "¥Ö¡¼¥È²Äǽ¥Þ¡¼¥¯ÉÕ¤­´ðËÜÎΰ褬¤¢¤ê¤Þ¤»¤ó¡£DOS MBR ¤Ï¤³¤ì¤ò¥Ö¡¼¥È¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "¥Ö¡¼¥È²Äǽ¥Þ¡¼¥¯ÉÕ¤­´ðËÜÎΰ褬ʣ¿ô¤¢¤ê¤Þ¤¹¡£DOS MBR ¤Ï¤³¤ì¤ò¥Ö¡¼¥È¤Ç¤­¤Þ¤»"
 "¤ó¡£"
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ¡¢²èÌ̤Ëɽ¼¨¤¹¤ë¾ì¹ç¤Ï¥ê¥¿¡¼¥ó¥­¡¼: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "¥»¥¯¥¿ 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "¥»¥¯¥¿ %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   ̵¤·   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   ´ðËÜ/ÏÀÍý"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   ´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   ÏÀÍýÎΰè"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "ÉÔÌÀ"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "¥Ö¡¼¥È"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "ÉÔÌÀ(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "½ªÎ»"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            ºÇ½é¤Î   ºÇ¸å¤Î\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1668,7 +1605,7 @@ msgstr ""
 " #  Î롏    ¥»¥¯¥¿   ¥»¥¯¥¿ ¥ª¥Õ¥»¥Ã¥È Â礭¤µ  Filesystem¥¿¥¤¥×(ID)   ¥Õ¥é"
 "¥°\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1677,472 +1614,469 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---ºÇ½é¤Î-----      ----ºÇ¸å¤Î---- ½é¤á¤Î¥»  \n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flags Head Sect Cyl   ID  Head Sect Cyl  ¥¯¥¿ÈÖ¹æ ¥»¥¯¥¿¿ô\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "À¸¥Ç¡¼¥¿"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "À¸¥Ç¡¼¥¿¤Î·Á¼°¤Ç¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤ò½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "¥»¥¯¥¿"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "¥»¥¯¥¿½ç¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤ò½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "¥Æ¡¼¥Ö¥ë"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "ñ¤ËÎΰè¾ðÊó¤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Îΰè¾ðÊó¤ò½ÐÎϤ·¤Ê¤¤"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk ¤Î¥Ø¥ë¥×²èÌÌ"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk ¤ÏüËö·¿¥Ç¥£¥¹¥¯ÎΰèºîÀ®¥×¥í¥°¥é¥à¤Ç¤¹¡£"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "¥Ï¡¼¥É¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤ÎÎΰè¤òºîÀ®¡¢ºï½ü¡¢Êѹ¹"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "¥³¥Þ¥ó¥É      ÀâÌÀ"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ö¡¼¥È¥Õ¥é¥°¤ÎÀÚÂØ"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤òºï½ü"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          ¥·¥ê¥ó¥À, ¥Ø¥Ã¥À, ¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿¿ô¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ·Ù¹ð: ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬²¿¤ò¤¹¤ë¤â¤Î¤«Íý²ò¤·¤Æ¤¤¤Ê¤¤¿Í"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             ¤Ï»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Ê¤¤¡£"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          ¤³¤Î²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤òºÇÂç¤Ë¤¹¤ë¡£"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Ãí°Õ: ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢DOS, OS/2 Åù¤È¸ß´¹À­¤Î¤Ê¤¤"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             Îΰè¤òºîÀ®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          ¶õ¤­Îΰ褫¤é¿·µ¬¤ËÎΰè¤òºîÀ®"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Îΰè¾ðÊó¤ò²èÌ̤ޤ¿¤Ï¥Ç¥£¥¹¥¯¤Ë½ÐÎϤ¹¤ë"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Îΰè¤Î½ÐÎϤˤϼ¡¤Î¤è¤¦¤ÊÊ£¿ô¤Î·Á¼°¤«¤éÁªÂò"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             ¤Ç¤­¤ë:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - À¸¥Ç¡¼¥¿(¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤Þ¤ì¤ë¾ðÊ󤽤Τâ¤Î)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - ¥»¥¯¥¿½ç¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - À¸¤Î·Á¼°¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Îΰè¾ðÊó¤ò½ñ¤­¹þ¤Þ¤º¤Ë¥×¥í¥°¥é¥à¤ò½ªÎ»"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          ɽ¼¨¤¹¤ëÎΰ襵¥¤¥º¤Îñ°Ì¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, ¥»¥¯¥¿, ¥·¥ê¥ó¥À¤Î½ç¤Ë½Û´Ä¤¹¤ë"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤à(Âçʸ»ú W ¤ò"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             ÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤)¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥£¥¹¥¯¾å¤Î"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             ¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢'yes'¤Þ¤¿¤Ï'no'¤ÎÆþ"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             ÎϤˤè¤ê¡¢½ñ¤­¹þ¤ß¤ò¹Ô¤¦¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¡£"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "¾åÌð°õ¥­¡¼   ¾å¤ÎÎΰè¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "²¼Ìð°õ¥­¡¼   ²¼¤ÎÎΰè¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       ²èÌ̤òºÆÉÁ²è"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          ¤³¤Î²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Ãí°Õ: ¥³¥Þ¥ó¥É¤Ï¤¹¤Ù¤ÆÂçʸ»ú¡¢¾®Ê¸»ú¤É¤Á¤é¤Ç¤â»ÈÍѤǤ­¤Þ¤¹"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "(½ñ¤­¹þ¤ß¤ò½ü¤¯)¡£"
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "¥·¥ê¥ó¥À"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "¥·¥ê¥ó¥À¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "¥Ø¥Ã¥É¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "¥»¥¯¥¿¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "½ªÎ»"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "¥¸¥ª¥á¥È¥ê¤òÊѹ¹¤·¤Æ½ªÎ»"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "¥·¥ê¥ó¥À¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "ÉÔÀµ¤Ê¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "¥Ø¥Ã¥À¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥É¿ô"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "ÉÔÀµ¤Ê¥»¥¯¥¿¿ô"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò¶õ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò³ÈÄ¥¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "ÉÔÌÀ(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "´ðËÜ/ÏÀÍý"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "ÉÔÌÀ (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "¥µ¥¤¥º: %lld ¥Ð¥¤¥È"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "¥µ¥¤¥º: %lld ¥Ð¥¤¥È"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "¥Ø¥Ã¥É: %d   ¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿: %d   ¥·¥ê¥ó¥À: %d"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "̾Á°"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "¥Õ¥é¥°"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Îΰ西¥¤¥×"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "FS¥¿¥¤¥×"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[¥é¥Ù¥ë]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr "  ¥»¥¯¥¿"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "¥·¥ê¥ó¥À"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "¥µ¥¤¥º (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "¥µ¥¤¥º (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "¥Ö¡¼¥È²Ä"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ö¡¼¥È¥Õ¥é¥°¤òÀÚ¤êÂؤ¨¤ë"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "ºï½ü"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤òºï½ü"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "¥¸¥ª¥á¥È¥ê"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "¥Ç¥£¥¹¥¯¥¸¥ª¥á¥È¥ê¤òÊѹ¹¤¹¤ë(¥¨¥­¥¹¥Ñ¡¼¥ÈÍÑ)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "¥Ø¥ë¥×²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "ºÇÂç²½"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤òºÇÂç²½(¥¨¥­¥¹¥Ñ¡¼¥ÈÍÑ)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "¿·µ¬ºîÀ®"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "¶õ¤­Îΰ褫¤é¿·¤·¤¯Îΰè¤òºîÀ®"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "ɽ¼¨"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Îΰè¾ðÊó¤ò²èÌ̤ޤ¿¤Ï¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "½ªÎ»"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Îΰè¾ðÊó¤ò½ñ¤­¹þ¤Þ¤º¤Ë¥×¥í¥°¥é¥à¤ò½ªÎ»"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "FS¥¿¥¤¥×"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥¿¥¤¥×¤òÊѹ¹¤¹¤ë(DOS, Linux, OS/2 ¤Ê¤É)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "ñ°Ì"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "ɽ¼¨¤¹¤ëÎΰ襵¥¤¥º¤Îñ°Ì(MB, ¥»¥¯¥¿, ¥·¥ê¥ó¥À)¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "½ñ¤­¹þ¤ß"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤à(¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë²ÄǽÀ­¤¢¤ê)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "¤³¤ÎÎΰè¤ò¥Ö¡¼¥È²Äǽ¤Ë¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "¶õ¤ÎÎΰè¤òºï½ü¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "¤³¤ÎÎΰè¤òºÇÂç²½¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "¤³¤ÎÎΰè¤Ï»ÈÍѤǤ­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "¶õ¤ÎÎΰè¤Î¥¿¥¤¥×¤òÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "¤³¤ì°Ê¾å¤ÎÎΰè¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "ÉÔÀµ¤Ê¥³¥Þ¥ó¥É"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2214,9 +2148,9 @@ msgstr ""
 "\n"
 "BSD ¥é¥Ù¥ëÍѥǥХ¤¥¹: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "¥³¥Þ¥ó¥É¤ÎÆ°ºî"
 
@@ -2236,10 +2170,9 @@ msgstr "   i   ¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë"
 msgid "   l   list known filesystem types"
 msgstr "   l   ´ûÃΤΥե¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   ¤³¤Î¥á¥Ë¥å¡¼¤òɽ¼¨¤¹¤ë"
 
@@ -2251,14 +2184,14 @@ msgstr "   n   ¿·¤¿¤Ë BSD Îΰè¤òºîÀ®¤¹¤ë"
 msgid "   p   print BSD partition table"
 msgstr "   p   BSD Îΰè¥Æ¡¼¥Ö¥ë¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   Êѹ¹¤òÊݸ¤»¤º¤Ë½ªÎ»¤¹¤ë"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   ¥á¥¤¥ó¥á¥Ë¥å¡¼¤ËÌá¤ë"
 
@@ -2301,13 +2234,13 @@ msgstr "%s ¤Ë¤Ï *BSD Îΰè¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "ºÇ½é %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "½ªÅÀ %s ¤Þ¤¿¤Ï +¥µ¥¤¥º ¤Þ¤¿¤Ï +¥µ¥¤¥ºM ¤Þ¤¿¤Ï +¥µ¥¤¥ºK"
@@ -2352,8 +2285,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2454,8 +2385,8 @@ msgstr "¥»¥¯¥¿/¥È¥é¥Ã¥¯"
 msgid "tracks/cylinder"
 msgstr "¥È¥é¥Ã¥¯/¥·¥ê¥ó¥À"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "¥·¥ê¥ó¥À¿ô"
 
@@ -2513,7 +2444,7 @@ msgstr "¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤Ï %s ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤·¤¿¡£\n"
 msgid "Partition (a-%c): "
 msgstr "Îΰè (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "ºÇÂçÎΰè¿ô¤ÏºîÀ®ºÑ¤Ç¤¹\n"
@@ -2537,7 +2468,7 @@ msgstr ""
 "\n"
 "¥Ç¥£¥¹¥¯¤ÈƱ´ü¤µ¤»¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2557,7 +2488,7 @@ msgstr ""
 "-u: (¥·¥ê¥ó¥À¤ÎÂå¤ï¤ê¤Ë)¥»¥¯¥¿¥æ¥Ë¥Ã¥È¤Î³«»Ï¡¢½ªÅÀ¤òÍ¿¤¨¤Þ¤¹\n"
 "-b 2048: (¤¢¤ë¼ï¤Î MO ¥É¥é¥¤¥ÖÍѤË) 2048 ¥Ð¥¤¥È¤Î¥»¥¯¥¿¥µ¥¤¥º¤ò»È¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2573,198 +2504,184 @@ msgstr ""
 " Ëô¤Ï: fdisk /dev/rd/c0d0  Ëô¤Ï: fdisk /dev/ida/c0d0  (RAID ¥Ç¥ô¥¡¥¤¥¹)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s ¤òÆɤá¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s ¤ò¥·¡¼¥¯¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s ¤Ç¤Î BLKGETSIZE ioctl ¤Ë¼ºÇÔ\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "¤³¤ì°Ê¾å¤Î¥á¥â¥ê¤¬³ÎÊݤǤ­¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   Æɹþ¤ßÀìÍѥե饰¤ò¤Ä¤±¤ë"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤òÊÔ½¸¤¹¤ë"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   ¥Þ¥¦¥ó¥È²Äǽ¥Õ¥é¥°¤ò¤Ä¤±¤ë"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   Îΰè¤òºï½ü¤¹¤ë"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   ´ûÃΤÎÎΰ西¥¤¥×¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   ¿·¤¿¤ËÎΰè¤òºîÀ®¤¹¤ë"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   ¿·¤¿¤Ë¶õ¤Î DOS Îΰè¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ë"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   Îΰè¥Æ¡¼¥Ö¥ë¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ¶õ¤Î Sun ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤òºîÀ®¤¹¤ë"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   Îΰè¤Î¥·¥¹¥Æ¥à ID ¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   ɽ¼¨/¹àÌÜ¥æ¥Ë¥Ã¥È¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   Îΰè¥Æ¡¼¥Ö¥ë¤ò¾È¹ç¤¹¤ë"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   ¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¡¢½ªÎ»¤¹¤ë"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   ÆÃÊ̤ʵ¡Ç½ (¥¨¥­¥¹¥Ñ¡¼¥ÈÀìÍÑ)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   ¥Ö¡¼¥È²ÄǽÎΰè¤òÁªÂò¤¹¤ë"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   ¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¥¨¥ó¥È¥ê¤òÊÔ½¸¤¹¤ë"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi ¥¹¥ï¥Ã¥×Îΰè¤òÁªÂò¤¹¤ë"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   ¥Ö¡¼¥È²Äǽ¥Õ¥é¥°¤ò¤Ä¤±¤ë"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos ¸ß´¹¥Õ¥é¥°¤ò¤Ä¤±¤ë"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ÂåÂØ¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   ¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Îΰè¥Æ¡¼¥Ö¥ëÆâ¤ÎÀ¸¥Ç¡¼¥¿¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ¥·¥ê¥ó¥ÀËè¤Î;¾ê¥»¥¯¥¿¿ô¤òÊѹ¹¤¹¤ë"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   ¥Ø¥Ã¥É¿ô¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   ¥¤¥ó¥¿¡¼¥ê¡¼¥Ö¥Õ¥¡¥¯¥¿¤òÊѹ¹¤¹¤ë"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ²óž¿ô¤òÊѹ¹¤¹¤ë (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   ¥»¥¯¥¿¿ô/¥È¥é¥Ã¥¯¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ʪÍý¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   ÎΰèÆâ¤Î¥Ç¡¼¥¿¤ÎÀèƬ¤Ë°ÜÆ°¤¹¤ë"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   ³ÈÄ¥Îΰè¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) Îΰè¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ë"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   Îΰè¤Î½ç½ø¤òŬÀµ²½¤¹¤ë"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "ÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "¥»¥¯¥¿¿ô"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2773,11 +2690,11 @@ msgstr ""
 "%s%s.\n"
 "¤¢¤Ê¤¿¤ÏÆÃÊ̵¡Ç½¥á¥Ë¥å¡¼¤«¤é¤³¤ì¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " µÚ¤Ó "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2796,29 +2713,29 @@ msgstr ""
 "2) Ê̤ΠOS ¤Î¥Ö¡¼¥È¤ä¥Ñ¡¼¥Æ¥£¥·¥ç¥óºîÀ®¥½¥Õ¥È\n"
 "   (Îã. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "´ðËܳÈÄ¥Îΰè¤ËÉÔÀµ¤Ê¥ª¥Õ¥»¥Ã¥È¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %d Æâ¤ÎÆÃÊ̤ʥê¥ó¥¯¥Ý¥¤¥ó¥¿¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %d Æâ¤ÎÆÃÊ̤ʥǡ¼¥¿¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2830,24 +2747,24 @@ msgstr ""
 "¤Ï\n"
 "¥á¥â¥êÆâ¤À¤±¤Ë»Ä¤·¤Þ¤¹¡£¤½¤Î¸å¤Ï¤â¤Á¤í¤ó°ÊÁ°¤ÎÆâÍƤϽ¤ÉüÉÔ²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Ãí°Õ: ¥»¥¯¥¿¥µ¥¤¥º¤¬ %d ¤Ç¤¹ (%d ¤Ç¤Ï¤Ê¤¯)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤Î½ñ¤­¹þ¤ß¤ò¹Ô¤¨¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2856,17 +2773,17 @@ msgstr ""
 "¥Ç¥Ð¥¤¥¹¤ÏÀµ¾ï¤Ê DOS Îΰè¥Æ¡¼¥Ö¥ë¤â¡¢Sun, SGI ¤ä OSF ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤â\n"
 "´Þ¤ó¤Ç¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "ÆâÉô¥¨¥é¡¼\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "ÆÃÊ̤ʳÈÄ¥Îΰè %d ¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2875,7 +2792,7 @@ msgstr ""
 "·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %2$d ¤ÎÉÔÀµ¤Ê¥Õ¥é¥° 0x%1$04x ¤Ï w(½ñ¤­¹þ¤ß)¤Ë¤è¤Ã¤Æ\n"
 "Àµ¾ï¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2884,83 +2801,83 @@ msgstr ""
 "\n"
 "EOF ¤ò 3 ²óÆɤߤޤ·¤¿ -- ½ªÎ»¤·¤Þ¤¹..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "16¿Ê¿ô¥³¡¼¥É (L ¥³¥Þ¥ó¥É¤Ç¥³¡¼¥É¥ê¥¹¥Èɽ¼¨): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, ½é´üÃÍ %d): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "½é´üÃÍ %d ¤ò»È¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Èϰϳ°¤ÎÃͤǤ¹¡£\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "ÎΰèÈÖ¹æ"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¶õ¤Î¥¿¥¤¥×¤Ç¤¹¡£\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "ÆÃÊ̤ʳÈÄ¥Îΰè %d ¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Îΰ褬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "¥·¥ê¥ó¥À"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "¥»¥¯¥¿"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "%s ¤Îɽ¼¨/¹àÌÜ¥æ¥Ë¥Ã¥È¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï³ÈÄ¥Îΰè¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS ¸ß´¹¥Õ¥é¥°¤¬ÀßÄꤵ¤ì¤Þ¤·¤¿\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS ¸ß´¹¥Õ¥é¥°¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Îΰè %d ¤Ï¤Þ¤À¸ºß¤·¤Þ¤»¤ó¡ª\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2973,7 +2890,7 @@ msgstr ""
 "¿ʬÀõ¤Ï¤«¤Ê¤³¤È¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï `d' ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò\n"
 "ºï½ü¤Ç¤­¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2982,7 +2899,7 @@ msgstr ""
 "¤¢¤Ê¤¿¤ÏÎΰè¤ò³ÈÄ¥Îΰè¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó¤·¡¢¤½¤ÎµÕ¤â¤Þ¤¿\n"
 "¤Ç¤­¤Þ¤»¤ó¡£¤Þ¤ººï½ü¤ò¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2992,7 +2909,7 @@ msgstr ""
 "Îΰè 3 ¤ò Whole disk (5) ¤È¤·¤Æ»Ä¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡¢\n"
 "SunOS/Solaris ¤Ï¤³¤ì¤ò´üÂÔ¤·¤Þ¤¹¤·¡¢Linux ¤Ç¤µ¤¨¤½¤ì¤¬Ë¾¤Þ¤·¤¤¤Ç¤¹¡£\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3002,59 +2919,59 @@ msgstr ""
 "Îΰè 9 ¤ò volume header (0) ¤È¤·¤Æ¡¢µÚ¤ÓÎΰè 11 ¤ò entire volume (6)\n"
 "¤È¤·¤Æ»Ä¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡£IRIX ¤Ï¤³¤ì¤òÁÛÄꤷ¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Îΰè¤Î¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò %d ¤«¤é %x (%s) ¤ËÊѹ¹¤·¤Þ¤·¤¿\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Îΰè %d ¤Ï°Û¤Ê¤Ã¤¿ÊªÍý/ÏÀÍý³«»Ï°ÌÃ֤ˤʤäƤ¤¤Þ¤¹(Linux ¤Ç¤Ï̵¤¤?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     ʪÍý=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "ÏÀÍý=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Îΰè %d ¤Ï°Û¤Ê¤Ã¤¿ÊªÍý/ÏÀÍý½ªÅÀ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Îΰè %i ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¡¢¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3064,7 +2981,7 @@ msgstr ""
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -3072,19 +2989,19 @@ msgstr ""
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3093,7 +3010,7 @@ msgstr ""
 "¹Ô¤¦¤Ù¤­¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£´û¤ËÀµ¾ï¤Ê½ç½ø¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3101,16 +3018,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s ¥Ö¡¼¥È   »ÏÅÀ      ½ªÅÀ  ¥Ö¥í¥Ã¥¯   ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "¥Ç¥Ð¥¤¥¹"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3119,7 +3036,7 @@ msgstr ""
 "\n"
 "Îΰè¥Æ¡¼¥Ö¥ë¹àÌܤ¬¥Ç¥£¥¹¥¯¤Î½ç½ø¤È°ìÃפ·¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3130,82 +3047,82 @@ msgstr ""
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    ³«»Ï    ¥µ¥¤¥º ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¥»¥¯¥¿ 0 ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥Ø¥Ã¥É %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥»¥¯¥¿ %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥·¥ê¥ó¥À %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Îΰè %d: Á°¤Î¥»¥¯¥¿ %d ¤Ï¹ç·× %d ¤È°ìÃפ·¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "·Ù¹ð: Îΰè %d ¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿³«»Ï°ÌÃÖ¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¡¢Îΰè %d ¤È½Å¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¶õ¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "ÏÀÍýÎΰè %d ¤ÏÎΰè %d Á´ÂΤˤʤäƤ¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "¹ç·×³ÎÊÝ¥»¥¯¥¿ %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "³ÎÊݤµ¤ì¤Æ¤¤¤Ê¤¤¥»¥¯¥¿¤¬ %d ¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Îΰè %d ¤ÏÄêµÁºÑ¤Ç¤¹¡£¤Þ¤º¤Ïºï½ü¤ò¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "¥»¥¯¥¿ %d ¤Ï´û¤Ë³ÎÊݺѤߤǤ¹\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "ÍøÍѲÄǽ¥Õ¥ê¡¼¥»¥¯¥¿¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3218,22 +3135,22 @@ msgstr ""
 "\t¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£(o ¤ò»È¤¦)\n"
 "\t·Ù¹ð: ¤³¤ì¤Ï¸½ºß¤Î¥Ç¥£¥¹¥¯ÆâÍƤòÇ˲õ¤·¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "³ÈÄ¥Îΰè¤òÄɲ乤ëÁ°¤Ë¡¢¤Þ¤ºÎΰè¤òºï½ü¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "ÏÀÍýÎΰ褬¥Ç¥£¥¹¥¯¤Î½ç½ø¤È°ìÃפ·¤Þ¤»¤ó"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "ÉÔÀµ¤Ê´ðËÜÎΰè"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3244,20 +3161,20 @@ msgstr ""
 "   %s\n"
 "   p   ´ðËÜÎΰè (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   ÏÀÍý (5 °Ê¾å)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   ³ÈÄ¥"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "¥¿¥¤¥× `%c' ¤Ë¤È¤Ã¤Æ¤ÏÉÔÀµ¤ÊÎΰèÈÖ¹æ¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3266,12 +3183,12 @@ msgstr ""
 "Îΰè¥Æ¡¼¥Ö¥ë¤Ï¸ò´¹¤µ¤ì¤Þ¤·¤¿¡ª\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "ioctl() ¤ò¸Æ¤Ó½Ð¤·¤ÆÎΰè¥Æ¡¼¥Ö¥ë¤òºÆÆɹþ¤ß¤·¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3284,7 +3201,7 @@ msgstr ""
 "¥«¡¼¥Í¥ë¤Ï¤Þ¤À¸Å¤¤¥Æ¡¼¥Ö¥ë¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "¿·¤·¤¤¥Æ¡¼¥Ö¥ë¤Ï¼¡²ó¥ê¥Ö¡¼¥È»þ¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3296,75 +3213,75 @@ msgstr ""
 "·Ù¹ð: DOS 6.x Îΰè¤òºîÀ®¡¢¤Þ¤¿¤ÏÊѹ¹¤·¤Æ¤·¤Þ¤Ã¤¿¾ì¹ç¤Ï¡¢\n"
 "fdisk ¥Þ¥Ë¥å¥¢¥ë¤ÎÄɲþðÊó¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "%s ¤Î¥¯¥í¡¼¥º¥¨¥é¡¼\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "¥Ç¥£¥¹¥¯¤òƱ´ü¤µ¤»¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Îΰè %d ¤Ë¥Ç¡¼¥¿Îΰ褬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "¿·µ¬¥Ç¡¼¥¿³«»Ï°ÌÃÖ"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "¾åµé¼Ô¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "¥»¥¯¥¿¿ô"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "·Ù¹ð: DOS ¸ß´¹¤Î¤¿¤á¤Î¥»¥¯¥¿¥ª¥Õ¥»¥Ã¥È¤òÀßÄꤷ¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "¥Ç¥£¥¹¥¯ %s ¤ÏÀµ¾ï¤ÊÎΰè¥Æ¡¼¥Ö¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "¤³¤Î¥«¡¼¥Í¥ë¤Ï¥»¥¯¥¿¥µ¥¤¥º¤ò¼«Ê¬Ç§¼±¤·¤Þ¤¹ -- -b ¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3373,19 +3290,18 @@ msgstr ""
 "·Ù¹ð: -b (¥»¥¯¥¿¥µ¥¤¥ºÀßÄê) ¥ª¥×¥·¥ç¥ó¤Ï 1 ¤Ä¤Î¥Ç¥Ð¥¤¥¹»ØÄê¤È¶¦¤Ë\n"
 "»ÈÍѤµ¤ì¤ë¤Ù¤­¤Ç¤¹\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s ¤ÇOSF/1 ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò¸¡½Ð¤·¤¿¤Î¤Ç¡¢¥Ç¥£¥¹¥¯¥é¥Ù¥ë¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£\n"
 "DOS Îΰè¥Æ¡¼¥Ö¥ë¥â¡¼¥É¤ËÌá¤ë¤Ë¤Ï¡¢'r' ¥³¥Þ¥ó¥É¤ò»È¤¤¤Þ¤·¤ç¤¦¡£\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3394,16 +3310,16 @@ msgstr ""
 "\n"
 "¸½ºß¤Î¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤Ï: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "¿·¤¿¤Ê¥Ö¡¼¥È¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3470,15 +3386,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux ¥¹¥ï¥Ã¥×"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3557,7 +3473,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s ¥»¥¯¥¿%5u ¥µ¥¤¥º%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3614,7 +3529,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Ê£¿ô¤Î entire disk ¤Î¹àÌܤ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Îΰ褬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
@@ -3699,7 +3614,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\t¤¢¤Ê¤¿¤Ï¡¢¥Ö¡¼¥È¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆÄ̾ï¤È°Û¤Ê¤ë̾Á°¤òÁª¤Ó¤Þ¤·¤¿¡£\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3719,11 +3633,10 @@ msgstr ""
 "¤À¤±¤¬¡¢¤³¤Î¤³¤È¤òÌȤì¤Þ¤¹¡£\n"
 "¤³¤ÎÎΰè¤Ë°Û¤Ê¤ë¥¿¥°ÉÕ¤±¤Ë¤Ä¤¤¤Æ¡¢¤è¤¯²ò¤Ã¤Æ¤¤¤ë¤Ê¤é YES ¤ÈÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "YES\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3793,44 +3706,43 @@ msgstr "Îΰè %d ¤ÎÃͤÎÊݸ¤ò»î¤ß¤Þ¤¹¡£\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\t³«»Ï=%d\tŤµ=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "¶õ"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS ¥ë¡¼¥È"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS ¥¹¥ï¥Ã¥×"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid ¼«Æ°¸¡½Ð"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3843,12 +3755,12 @@ msgstr ""
 "Îã. ¥Ø¥Ã¥É¿ô¡¢¥»¥¯¥¿¿ô¡¢¥·¥ê¥ó¥À¿ôµÚ¤Ó¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¿ô\n"
 "¤¢¤ë¤¤¤Ï fresh label ¤ò¶¯À©¤·¤Æ¤¯¤À¤µ¤¤ (¥á¥¤¥ó¥á¥Ë¥å¡¼¤Î s ¥³¥Þ¥ó¥É)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "¼«Æ°ÀßÄê¤Ç %s%s%s ¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3859,7 +3771,7 @@ msgstr ""
 "¿·¤¿¤Ê sun disklabel ¤ò¹½ÃÛ¤·¤Þ¤¹¡£Êѹ¹¤Ï¤¢¤Ê¤¿¤¬½ñ¤­¹þ¤ß¤ò·èÄꤹ¤ë¤Þ¤Ç¡¢\n"
 "¥á¥â¥ê¤Ë¤Î¤ß»Ä¤·¤Þ¤¹¡£¤½¤Î¸å¤Ï¤â¤Á¤í¤ó¡¢°ÊÁ°¤ÎÆâÍƤÏÉü¸µ¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3869,72 +3781,72 @@ msgstr ""
 "   ?   ¼«Æ°ÀßÄê\n"
 "   0   ¥«¥¹¥¿¥à (¥Ï¡¼¥É¥¦¥§¥¢¤¬¸¡½Ð¤·¤¿Ãͤò½é´üÃͤȤ·¤Æ)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "¥¿¥¤¥×¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤ (? ¤Ç¼«Æ°¡¢0 ¤Ç¥«¥¹¥¿¥à): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "¼«Æ°ÀßÄ꤬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "¥»¥¯¥¿/¥È¥é¥Ã¥¯"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "ÂåÂØ¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "ʪÍý¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "²óž¿ô (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "¥¤¥ó¥¿¡¼¥ê¡¼¥Ö"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "¥·¥ê¥ó¥ÀËè¤ÎÆÃÊ̤ʥ»¥¯¥¿"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Á´¤Æ¤Î¥Ç¥£¥¹¥¯¥Ñ¥é¥á¡¼¥¿¤ò x ¥á¥Ë¥å¡¼¤«¤éÊѹ¹¤Ç¤­¤Þ¤¹"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" ¥Õ¥í¥Ã¥Ô¡¼"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¾¤Î¥»¥¯¥¿ %d-%d ¤È½Å¤Ê¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "̤»ÈÍÑ¥®¥ã¥Ã¥× -- 0-%d ¥»¥¯¥¿\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "̤»ÈÍÑ¥®¥ã¥Ã¥× -- %d-%d ¥»¥¯¥¿\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3943,7 +3855,7 @@ msgstr ""
 "¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬´û¤Ë¥Ç¥£¥¹¥¯Á´ÂΤòʤ¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "¤Þ¤º¤½¤ì¤òºï½ü¤·¤Æ¤«¤é¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3954,7 +3866,7 @@ msgstr ""
 "¾¤Î¤¤¤¯¤Ä¤«¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òʤ¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤Ê¤¿¤Î¹àÌÜ¤Ï %d %s ¤Ë\n"
 "Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3964,7 +3876,7 @@ msgstr ""
 "Whole disk (5) ¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "0 ¤«¤é»Ï¤Þ¤ë %u ¥»¥¯¥¿Ê¬¤Ç¤¹\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3978,7 +3890,7 @@ msgstr ""
 "¤â¤·¡¢¤¢¤Ê¤¿¤¬ËÜÅö¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ËÉä¹ç 82 (Linux swap) ¤ò¤Ä¤±¤¿¤±¤ì¤Ð\n"
 "YES ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3997,7 +3909,7 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = %s of %d * 512 ¥Ð¥¤¥È\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4010,16 +3922,16 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = %s of %d * 512 ¥Ð¥¤¥È\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s ¥Õ¥é¥°  »ÏÅÀ        ½ªÅÀ   ¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "ÂåÂØ¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "ʪÍý¥·¥ê¥ó¥À¿ô"
 
@@ -4043,32 +3955,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "³ÈÄ¥Îΰè"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX ¥Ö¡¼¥È²Äǽ"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 ¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 #, fuzzy
 msgid "W95 FAT32"
@@ -4079,7 +3985,6 @@ msgstr "Win95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 #, fuzzy
 msgid "W95 FAT16 (LBA)"
@@ -4177,12 +4082,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4203,8 +4106,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4214,7 +4115,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD ¤Þ¤¿¤Ï SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4235,12 +4135,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "¸Å¤¤ Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / ¸Å¤¤ Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4271,12 +4169,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad ¥Ï¥¤¥Ð¥Í¡¼¥·¥ç¥ó"
@@ -4285,7 +4181,6 @@ msgstr "IBM Thinkpad ¥Ï¥¤¥Ð¥Í¡¼¥·¥ç¥ó"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4350,30 +4245,22 @@ msgstr "Èó FS ¥Ç¡¼¥¿"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell ¥æ¡¼¥Æ¥£¥ê¥Æ¥£"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4382,117 +4269,110 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC ¥Ö¡¼¥È"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS ¥»¥«¥ó¥À¥ê"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "%s ¤Î¥·¡¼¥¯¥¨¥é¡¼ -- %lu ¤ò¥·¡¼¥¯¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "¥·¡¼¥¯¥¨¥é¡¼: 0x%08x%08x ¤Î¤Ï¤º¤Ç¤·¤¿¤¬ 0x%08x%08x ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó -- Äü¤á¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "%s ¤ÎÆɤ߼è¤ê¥¨¥é¡¼ -- ¥»¥¯¥¿ %lu ¤òÆɤá¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "¥¨¥é¡¼: ¥»¥¯¥¿ %lu ¤Ë¤Ï msdos ¥µ¥¤¥ó¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼ -- ¥»¥¯¥¿ %lu ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥»¥¯¥¿Êݸ¥Õ¥¡¥¤¥ë (%s) ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥óÉü¸µ¥Õ¥¡¥¤¥ë (%s) ¤Î¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥óÉü¸µ¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹ -- Éü¸µ¤ò¹Ô¤Ê¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "¥á¥â¥ê¤¬Â­¤ê¤Ê¤¤¡©\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥óÉü¸µ¥Õ¥¡¥¤¥ë (%s) ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "%s ¤ÎÆɤ߼è¤ê¥¨¥é¡¼\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "¥Ç¥Ð¥¤¥¹ %s ¤ò½ñ¤­¹þ¤ß¤è¤¦¤Ë¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "%2$s ¤Î¥»¥¯¥¿ %1$lu ¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "¥Ç¥£¥¹¥¯ %s: ¥¸¥ª¥á¥È¥ê¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "¥Ç¥£¥¹¥¯ %s: ¥µ¥¤¥º¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4504,22 +4384,22 @@ msgstr ""
 "¤³¤³¤Ë fdisk ¤òÍøÍѤ¹¤ë¤Î¤Ï¿ʬ°ÕÌ£¤¬¤Ê¤¤¤³¤È¤Ç¤¹¡£\n"
 "[ËÜÅö¤Ë¤³¤ì¤ò¹Ô¤Ê¤¤¤¿¤±¤ì¤Ð¡¢--force ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "·Ù¹ð: HDIO_GETGEO ¤Ë¤è¤ë¤È¡¢¥Ø¥Ã¥É¿ô¤Ï %lu ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "·Ù¹ð: HDIO_GETGEO ¤Ë¤è¤ë¤È¡¢¥»¥¯¥¿¿ô¤Ï %lu ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "·Ù¹ð: BLKGETSIZE/HDIO_GETGEO ¤Ë¤è¤ë¤È¡¢¥·¥ê¥ó¥À¿ô¤Ï %lu ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4529,7 +4409,7 @@ msgstr ""
 "¤³¤ì¤Ï¡¢C/H/S ¤ò¥¢¥É¥ì¥¹¼èÆÀ¤ËÍøÍѤ·¤Æ¤¤¤ëÁ´¤Æ¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ç¡¢\n"
 "ÌäÂ꤬À¸¤º¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4538,7 +4418,7 @@ msgstr ""
 "\n"
 "¥Ç¥£¥¹¥¯ %s: ¥·¥ê¥ó¥À¿ô %lu¡¢¥Ø¥Ã¥É¿ô %lu¡¢%lu ¥»¥¯¥¿/¥È¥é¥Ã¥¯\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4546,7 +4426,7 @@ msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %2$s ¤Î¥Ø¥Ã¥É¿ô¤È¤·¤Æ %1$s ¤ÏÉÔ²Äǽ¤Ç¤¹: %3$lu (0-%4$lu ¤Ë¤·¤Æ"
 "¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4555,7 +4435,7 @@ msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %2$s ¤Î¥»¥¯¥¿¿ô¤È¤·¤Æ %1$s ¤ÏÉÔ²Äǽ¤Ç¤¹: %3$lu (1-%4$lu ¤Ë¤·¤Æ"
 "¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4564,7 +4444,7 @@ msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %2$s ¤Î¥·¥ê¥ó¥À¿ô¤È¤·¤Æ %1$s ¤ÏÉÔ²Äǽ¤Ç¤¹: %3$lu (0-%4$lu ¤Ë¤·"
 "¤Æ¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4573,12 +4453,12 @@ msgstr ""
 "Id  ̾Á°\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤òºÆÆɤ߹þ¤ßÃæ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4586,31 +4466,31 @@ msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥óºÆÆɹþ¤ß¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n"
 "mkfs ¤ò»È¤¦Á°¤Ë¡¢¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s ¤Î¥¯¥í¡¼¥º¥¨¥é¡¼\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ¤½¤Î¤è¤¦¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥Õ¥©¡¼¥Þ¥Ã¥È -- ¥»¥¯¥¿¿ô¤òÍøÍѤ·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "̤¼ÂÁõ¤Î¥Õ¥©¡¼¥Þ¥Ã¥È -- %s ¤òÍøÍѤ·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4619,12 +4499,12 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = %lu ¥Ð¥¤¥È¤Î¥·¥ê¥ó¥À¡¢1024 ¥Ð¥¤¥È¤Î¥Ö¥í¥Ã¥¯¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È »ÏÅÀ   ½ªÅÀ   #¥·¥ê¥ó¥À #¥Ö¥í¥Ã¥¯ ID   ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4633,12 +4513,12 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = 512 ¥Ð¥¤¥È¤Î¥»¥¯¥¿¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr " ¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È  »ÏÅÀ      ½ªÅÀ   #¥»¥¯¥¿   ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4647,12 +4527,12 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = 1024 ¥Ð¥¤¥È¤Î¥Ö¥í¥Ã¥¯¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr " ¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È »ÏÅÀ        ½ªÅÀ  #¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4661,31 +4541,31 @@ msgstr ""
 "Units = 1048576 ¥Ð¥¤¥È¤ò¥á¥¬¥Ð¥¤¥È¡¢1024 ¥Ð¥¤¥È¤Î¥Ö¥í¥Ã¥¯¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È »ÏÅÀ   ½ªÅÀ    MB   #¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t³«»Ï: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t½ªÅÀ: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "¥·¥ê¥ó¥À %ld ¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î½ªÅÀ¡¢¥Ç¥£¥¹¥¯¤ÎºÇ¸å¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4696,52 +4576,52 @@ msgstr ""
 "  (%ld/%ld/%ld ¤Î¤«¤ï¤ê¤Ë)¡£\n"
 "¤³¤Î¥ê¥¹¥È¤Ï¡¢¤½¤Î¥¸¥ª¥á¥È¥ê¤È¸«¤Ê¤·¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "¸½ºß¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "ÊѤǤ¹¡¢%d ¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤·¤«ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥µ¥¤¥º 0 ¤Ç¤¹¤¬¡¢¶õ¤È¤·¤Æ¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥µ¥¤¥º 0 ¤Ê¤Î¤Ë¥Ö¡¼¥È²Äǽ¤Ç¤¹¡£\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥µ¥¤¥º 0 ¤Ç¡¢Èó¥¼¥í¤Î³«»Ï°ÌÃ֤Ǥ¹\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¡¢"
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "¤È %s ¤¬½Å¤Ê¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4750,17 +4630,17 @@ msgstr ""
 "·Ù¹ð: Îΰè %s ¤ÏÎΰè¥Æ¡¼¥Ö¥ë (¥»¥¯¥¿ %lu) ¤Î°ìÉô¤ò´Þ¤ó¤Ç¤ª¤ê¡¢\n"
 "¤½¤ì¤¬Ëä¤á¤é¤ì¤ë»þÅÀ¤ÇÇ˲õ¤µ¤ì¤ë»ö¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤¬¥»¥¯¥¿ 0 ¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥Ç¥£¥¹¥¯¤Î½ª¤ê¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4768,17 +4648,17 @@ msgstr ""
 "´ðËÜÎΰè¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ç¤Ï¡¢³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò°ì¤Ä¤À¤±ºî¤ì¤Þ¤¹\n"
 " ¡ÊLinux ¤Ç¤ÏÌäÂê¤È¤Ï¤Ê¤ê¤Þ¤»¤ó¤±¤ì¤É¤â¡Ë\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥·¥ê¥ó¥À¶­³¦¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4787,7 +4667,7 @@ msgstr ""
 "LILO ¤Ë¤È¤Ã¤Æ¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¤¬¡¢DOS ¤Î MBR ¤Ï¤³¤Î¥Ç¥£¥¹¥¯¤ò¥Ö¡¼¥È¤Ç¤­¤Ê¤¯\n"
 "¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4795,7 +4675,7 @@ msgstr ""
 "·Ù¹ð: ÉáÄ̤ϥץ饤¥Þ¥ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó°ì¤Ä¤ò¥Ö¡¼¥È¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£\n"
 "LILO ¤Ï `¥Ö¡¼¥È²Äǽ' ¥Õ¥é¥°¤ò̵»ë¤·¤Þ¤¹¤±¤É¤â¡£\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4804,37 +4684,37 @@ msgstr ""
 "LILO ¤Ë¤È¤Ã¤Æ¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¤¬¡¢DOS MBR ¤Ï¤³¤Î¥Ç¥£¥¹¥¯¤ò¥Ö¡¼¥È¤Ç¤­¤Ê¤¯\n"
 "¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 #, fuzzy
 msgid "start"
 msgstr "¾õÂÖ"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s: »ÏÅÀ: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "Á÷¿®"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s: ½ªÅÀ: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "¥·¥ê¥ó¥À %2$ld ¤Ë¤¢¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %1$s ¤Î½ªÅÀ¤Ï¥Ç¥£¥¹¥¯¤ÎºÇ¸å¤ò±Û¤¨¤Æ¤¤¤Þ"
 "¤¹\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4843,7 +4723,7 @@ msgstr ""
 "·Ù¹ð: ³ÈÄ¥Îΰè¤Î³«»Ï°ÌÃÖ¤¬ %ld ¤«¤é %ld ¤Ë°Ü¤µ¤ì¤Þ¤·¤¿\n"
 "¡Ê¥ê¥¹¥Èɽ¼¨¤Î°Ù¤À¤±¤Ç¤¹¡£¤½¤ÎÆâÍƤËÊѹ¹¤Ï¤¢¤ê¤Þ¤»¤ó¡£¡Ë\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4851,133 +4731,132 @@ msgstr ""
 "·Ù¹ð: ³ÈÄ¥Îΰ褬¥·¥ê¥ó¥À¶­³¦¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 "DOS ¤È Linux ¤ÏÃæ¿È¤ò°Û¤Ê¤Ã¤Æ²ò¼á¤¹¤ë¤Ç¤·¤ç¤¦¡£\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Â¿¤¹¤®¤Þ¤¹ -- nr (%d) °Ê¹ß¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥Ä¥ê¡¼¡©\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager ¤ò¸¡½Ð -- ¤³¤ì¤òÊ᪤Ǥ­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 ½ð̾¤òȯ¸« -- Äü¤á¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "ÊѤǤ¹..., ¥µ¥¤¥º 0 ¤Î³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó ¡©\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "ÊѤǤ¹..., ¥µ¥¤¥º 0 ¤Î BSD ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¡©\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: ǧ¼±¤Ç¤­¤Ê¤¤¥Ñ¡¼¥Æ¥£¥·¥ç¥ó\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n ¥Õ¥é¥°¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿: ²¿¤âÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "¸Å¤¤¥»¥¯¥¿¤ÎÊݸ¤Ë¼ºÇÔ -- ÃæÃǤ·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó½ñ¤­¹þ¤ß¤Ë¼ºÇÔ\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "Ť¤¤«ÉÔ´°Á´¤Ê¹Ô¤ÎÆþÎÏ -- Ãæ»ß¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼: `=' ¤Ï %s ¥Õ¥£¡¼¥ë¥É¤Î¸å¤Ë¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼: %2$s ¥Õ¥£¡¼¥ë¥É¤Î¸å¤Îͽ´ü¤·¤Ê¤¤Ê¸»ú `%1$c'\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤ÆþÎÏ: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "¿ô»ú¤¬Â礭¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "¿ô»ú¤Î¸å¤í¤Ë¥´¥ß¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥óµ­½Ò»Ò¤Î¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î°Ï¤¤¤ò¹½ÃۤǤ­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "ÆþÎÏ¥Õ¥£¡¼¥ë¥É¤¬Â¿¤¹¤®¤Þ¤¹\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "¤³¤ì°Ê¾å¤Î¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "ÉÔÀµ¤Ê¥¿¥¤¥×\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "·Ù¹ð: Í¿¤¨¤é¤ì¤¿¥µ¥¤¥º (%lu) ¤Ï¡¢µöÍƤǤ­¤ëºÇÂ祵¥¤¥º (%lu) ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "·Ù¹ð: ¶õ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "·Ù¹ð: ÉÔÀµ¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹ (°ìÈֺǽé %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥Ö¡¼¥È²Äǽ¥Õ¥é¥° -- - ¤« * ¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s ¤Î°ìÉô¤ò»ØÄê¡©\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Í½´ü¤·¤¿¾ì½ê¤Ë¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "ÉÔÀµ¤ÊÆþÎÏ\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Â¿¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -4988,103 +4867,99 @@ msgstr ""
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "ÉáÄÌ¤Ï <start> ¤È <size> (¤½¤·¤Æ¶²¤é¤¯ <type>)¤ò»ØÄꤹ¤ë¤À¤±¤Ç¹½¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "¥Ð¡¼¥¸¥ç¥ó"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó] ¥Ç¥Ð¥¤¥¹Ì¾...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "¥Ç¥Ð¥¤¥¹: /dev/hda ¤ä /dev/sda ¤ÎÍͤʲ¿¤«"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "Í­±×¤Ê¥ª¥×¥·¥ç¥ó:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [or --show-size]: Îΰ襵¥¤¥º¤Î¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [or --id]:        Îΰè ID ¤Îɽ¼¨¤Þ¤¿¤ÏÊѹ¹"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [or --list]:      ¥Ç¥Ð¥¤¥¹Ëè¤ÎÎΰè¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [or --dump]:      Á°¤ËƱ¤¸¤À¤¬¡¢¸å¤ÎÆþÎϽñ¼°¤Ë±è¤¦¤è¤¦¤Ë¤¹¤ë"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [or --increment]: ¥·¥ê¥ó¥À¿ô¤Ê¤É¡£0 ¤Ç¤Ï¤Ê¤¯ 1 ¤«¤é"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  ¥»¥¯¥¿/¥Ö¥í¥Ã¥¯/¥·¥ê¥ó¥À/MB ¤Î¥æ¥Ë¥Ã¥È¤Î¼õÍý/Êó¹ð"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [or --list-types]:´ûÃΤÎÎΰ西¥¤¥×¤Î¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [or --DOS]:       DOS ¸ß´¹¥â¡¼¥É -- ¶õ´Ö¤¬¾¯¤·ÌµÂ̤ˤʤê¤Þ¤¹"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [or --re-read]:   ¥«¡¼¥Í¥ë¤ËÎΰè¥Æ¡¼¥Ö¥ë¤òºÆÆɹþ¤ß¤µ¤»¤ë"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                »ØÄêÈÖ¹æ# ¤ÎÎΰè¤Î¤ßÊѹ¹¤¹¤ë"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ¥Ç¥£¥¹¥¯¤Ø¤Î¼ÂºÝ¤Î½ñ¹þ¤ß¤ò¹Ô¤ï¤Ê¤¤"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O file :            ¾å½ñ¤­¤µ¤ì¤ë¥»¥¯¥¿¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ¥»¥¯¥¿¤ò¥Õ¥¡¥¤¥ë¤«¤éÉü¸µ¤¹¤ë"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [or --version]:   ¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [or --help]:      ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "´í¸±¤Ê¥ª¥×¥·¥ç¥ó:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [or --show-geometry]: ¥«¡¼¥Í¥ë¤Î¥¸¥ª¥á¥È¥ê¾ðÊó¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -g [or --show-geometry]: ¥«¡¼¥Í¥ë¤Î¥¸¥ª¥á¥È¥ê¾ðÊó¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5092,115 +4967,115 @@ msgstr ""
 "    -x [or --show-extended]: ³ÈÄ¥Îΰè¥ê¥¹¥È¤âɽ¼¨¤¹¤ë\n"
 "                             ¤Þ¤¿¤Ï¤½¤ì¤é¤Îµ­½Ò»Ò¤ÎÆþÎϤòÆÀ¤ë"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [or --Linux]:      Linux ¤Ë¤½¤°¤ï¤Ê¤¯¤Æ¤âʸ¶ç¤ò±¾¤ï¤Ê¤¤"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [or --quiet]:      ·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òÍÞÀ©¤¹¤ë"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    ¥¸¥ª¥á¥È¥ê¸¡½Ð¤ò¶¯À©»ØÄê¤Ç¤­¤Þ¤¹:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [or --cylinders #]:»ÈÍѤ¹¤ë¥·¥ê¥ó¥À¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [or --heads #]:    »ÈÍѤ¹¤ë¥Ø¥Ã¥É¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [or --sectors #]:  »ÈÍѤ¹¤ë¥»¥¯¥¿¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Ì·½â¤Î¥Á¥§¥Ã¥¯¤ò¹Ô¤ï¤Ê¤¤¤è¤¦¤Ë¤Ç¤­¤Þ¤¹:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [or --force]:      ¤ª¤«¤·¤Ê»ØÄê¤ò¹Ô¤Ã¤Æ¤â¡¢¤½¤Î¤Þ¤Þ¼Â¹Ô¤·¤Þ¤¹"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "»È¤¤Êý:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s ¥Ç¥Ð¥¤¥¹\t\t ¥Ç¥Ð¥¤¥¹¾å¤Î¥¢¥¯¥Æ¥£¥ôÎΰè¤ò¥ê¥¹¥È¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s ¥Ç¥Ð¥¤¥¹ n1 n2 ... n1 ¤ò¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Æ..., »Ä¤ê¤òÈó¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An ¥Ç¥Ð¥¤¥¹\t n ¤ò¥¢¥¯¥Æ¥£¥ô¤Ë¤·¡¢¤½¤ì°Ê³°¤òÈó¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "¥³¥Þ¥ó¥É¤Ê¤·¡©\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "¹ç·×: %d ¥Ö¥í¥Ã¥¯\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "»È¤¤Êý: sfdisk --print-id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "»È¤¤Êý: sfdisk --change-id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ ID\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "»È¤¤Êý: sfdisk --id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ [ID]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "°ì¤Ä¤Î¥Ç¥Ð¥¤¥¹¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹ (-l ¤ä -s ¤ò½ü¤¯)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: ¥·¥ê¥ó¥À¿ô %ld¡¢¥Ø¥Ã¥É¿ô %ld¡¢%ld ¥»¥¯¥¿/¥È¥é¥Ã¥¯\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "%s ¤Î¥µ¥¤¥º¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ÉÔÀµ¤Ê¥Ö¡¼¥È¥Õ¥é¥°: 0x80 ¤Ç¤Ê¤¯ 0x%x ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5208,7 +5083,7 @@ msgstr ""
 "½ªÎ»\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5218,35 +5093,35 @@ msgstr ""
 "LILO ¤Ç¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¤¬¡¢DOS MBR ¤Ï 1 ¤Ä¤Î¥¢¥¯¥Æ¥£¥Ö¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤·¤«\n"
 "¥Ö¡¼¥È¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ë¤Ï ID %x ¤¬¤¢¤ê¡¢±£¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ÉÔÀµ¤Ê ID %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "·Ù¹ð: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "¸½ºß¡¢Ã¯¤â¤³¤Î¥Ç¥£¥¹¥¯¤ò»È¤Ã¤Æ¤¤¤Ê¤¤¤«¤òÄ´¤Ù¤Þ¤¹...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5260,30 +5135,30 @@ msgstr ""
 "   ¤¬¤¢¤ì¤Ð swapoff ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "   ¤Á¤Ê¤ß¤Ë --no-reread ¥Õ¥é¥°¤Ç¤³¤Î¥Á¥§¥Ã¥¯¤òÍÞÀ©¤Ç¤­¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Á´¤Æ¤Î¥Á¥§¥Ã¥¯¤òĶ±Û¤µ¤»¤ë¤Ë¤Ï --force ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "¸Å¤¤¾ìÌÌ:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¸ºß¤·¤Þ¤»¤ó¤Î¤Ç¡¢Êѹ¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "¿·¤¿¤Ê¾ìÌÌ:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5291,21 +5166,21 @@ msgstr ""
 "»ä¤Ï¤³¤ì¤é¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë´ØÍ¿¤·¤¿¤¯¤¢¤ê¤Þ¤»¤ó -- Êѹ¹¤·¤Þ¤»¤ó¡£\n"
 "(ËÜÅö¤Ë¤³¤ì¤ò¹Ô¤Ê¤¤¤¿¤±¤ì¤Ð¡¢--force ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "»ä¤Ï¤³¤ì¤Ë´ØÍ¿¤·¤¿¤¯¤¢¤ê¤Þ¤»¤ó -- ¶²¤é¤¯ No ¤ÈÅú¤¨¤ë¤Ù¤­¤Ç¤·¤ç¤¦\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "¤³¤ì¤Ç¤¢¤Ê¤¿¤ÎÍ×µá¤ÏËþ¤¿¤µ¤ì¤Þ¤¹¤«¡© [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "¥Ç¥£¥¹¥¯¤Ø¤Î½ñ¤­¹þ¤ß¤ò¹Ô¤Ê¤¤¤Þ¤¹¤«¡© [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5314,16 +5189,16 @@ msgstr ""
 "\n"
 "sfdisk: ÆþÎϤ¬Ã»¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "ÃæÃÇ -- ²¿¤âÊѹ¹¤·¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "y,n,q ¤Î¤¤¤º¤ì¤«¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5332,7 +5207,7 @@ msgstr ""
 "¿·¤¿¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î½ñ¤­¹þ¤ß¤ËÀ®¸ù\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5432,130 +5307,130 @@ msgstr "getopt (enhanced) 1.1.2\n"
 msgid "internal error, contact the author."
 msgstr "ÆâÉô¥¨¥é¡¼¡¢ºî¼Ô¤ËÏ¢Íí¤ò¡£"
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "MILO ¤«¤é¥Ö¡¼¥È¤µ¤ì¤Þ¤·¤¿\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Áƹú¤Ê BCD ¥¯¥í¥Ã¥¯\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "¥¯¥í¥Ã¥¯¥Ý¡¼¥È¤ò 0x%x ¤Ë½¤Àµ¤·¤Þ¤·¤¿\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "¥¤¥«¤·¤¿ TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: ÉÔ²Äʬ¤Ê%s¤Î 1000 ²ó¤ÎÈ¿Éü¤¬¼ºÇÔ!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port ¤ò³«¤±¤Þ¤»¤ó: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "µö²Ä¤Î¼èÆÀ¤ò»î¤µ¤Ê¤«¤Ã¤¿¤Î¤Ç¡¢µö²Ä¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s ¤Ï I/O ¥Ý¡¼¥È¥¢¥¯¥»¥¹¤¬¤Ç¤­¤Þ¤»¤ó: iopl(3) ¥³¡¼¥ë¤Ë¼ºÇÔ¡£\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "¶²¤é¤¯¥ë¡¼¥È¸¢¸Â¤¬É¬ÍפǤ¹¡£\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×%s»þ¹ï¤òÊÝ»ý¤·¤Æ¤¤¤ë¤È¤ß¤Ê¤·¤Þ¤¹\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr " UTC "
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "¥í¡¼¥«¥ë"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: ·Ù¹ð: adjtime ¥Õ¥¡¥¤¥ë¤Î»°¹ÔÌܤ¬Ç§¼±¤Ç¤­¤Þ¤»¤ó\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(´üÂÔ¤·¤¿¤Î¤Ï: `UTC', `LOCAL' ¤¢¤ë¤¤¤Ï²¿¤â¤Ê¤¤¤«¤Ç¤¹¡£)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "ľÁ°¤Î¤º¤ì¤Î½¤Àµ¤Ï 1969 ǯ°Ê¹ß %ld ÉûþÅÀ¤Ç¹Ô¤Ê¤ï¤ì¤Þ¤·¤¿\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "ľÁ°¤ÎÄ´À°¤Ï 1969 ǯ°Ê¹ß %ld ÉûþÅÀ¤Ç¹Ô¤Ê¤ï¤ì¤Þ¤·¤¿\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Ï%s»þ¹ï¤Ç¤¹\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "ÉÔÌÀ¤Ê"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤òÂԤäƤ¤¤Þ¤¹...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤ò¼èÆÀ¤·¤Þ¤·¤¿\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤ËÉÔÀµ¤ÊÃÍ: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "¥Ï¡¼¥É¥¦¥§¥¢»þ·×»þ¹ï : %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 ǯ°ÊÍè %ld ÉÃ\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤«¤éÆɹþ¤ó¤À»þ¹ï: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤ò %.2d:%.2d:%.2d ¤ËÀßÄê = 1969 ǯ°ÊÍè %ld ÉÃ\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "¥¯¥í¥Ã¥¯¤òÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿ -- ¥Æ¥¹¥È¤À¤±¤Ç¤¹¡£\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5564,7 +5439,7 @@ msgstr ""
 "»þ¹ï¤ò»²¾È¤·¤¿»þÅÀ¤«¤é %.6f É÷вᡣ\n"
 "¼¡¤Î´°Á´¤ÊÉäޤÇÃ٤餻¤Þ¤¹¡£\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5573,22 +5448,22 @@ msgstr ""
 "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¥ì¥¸¥¹¥¿¤¬¤ª¤«¤·¤ÊÃÍ(Îã ²¿·î50Æü)¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢\n"
 "Ê᪤Ǥ­¤Ê¤¤ÈϰϤÎÃÍ(Îã 2095ǯ)¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f ÉÃ\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "--date ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date °ú¿ô¤¬Ä¹¤¹¤®¤Þ¤¹\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5597,23 +5472,23 @@ msgstr ""
 "--date ¥ª¥×¥·¥ç¥ó¤ÎÃͤ¬Àµ¤·¤¤ÆüÉդǤϤ¢¤ê¤Þ¤»¤ó¡£\n"
 "Æäˡ¢¥¯¥©¡¼¥Æ¡¼¥·¥ç¥ó¥Þ¡¼¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "date ¥³¥Þ¥ó¥É¤òȯ¹Ô¤·¤Þ¤¹: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "/bin/sh ¥·¥§¥ëÆâ¤Ç 'date' ¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£\n"
 "popen() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date ¥³¥Þ¥ó¥É¤«¤é¤ÎÊÖÅú = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5628,7 +5503,7 @@ msgstr ""
 "¤½¤ÎÊÖÅú¤Ï:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5645,12 +5520,12 @@ msgstr ""
 "¤½¤Î±þÅú¤Ï:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "date ʸ»úÎó %s ¤ò 1969 ǯ°ÊÍè %ld ÉäȤ·¤Þ¤¹\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5659,57 +5534,57 @@ msgstr ""
 "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Ï¡¢Àµ¤·¤¤»þ¹ï¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤Î¤Ç¡¢¤³¤³¤«¤éÆÀ¤é¤ì¤¿Ãͤò\n"
 "¥·¥¹¥Æ¥à»þ¹ï¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "settimeofday ¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "¥Æ¥¹¥È¥â¡¼¥É¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤¿¤á¡¢¥·¥¹¥Æ¥à¥¯¥í¥Ã¥¯¤òÀßÄꤷ¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "¥·¥¹¥Æ¥à¥¯¥í¥Ã¥¯¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ¸Æ¤Ó½Ð¤·¤Ë¼ºÇÔ"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ¹ï¤Ë°ÊÁ°¤Î¥´¥ß¤¬´Þ¤Þ¤ì¤Æ¤ª¤ê¡¢¤º¤ì¤ò½¤Àµ¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, fuzzy, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr "Á°²ó¤ÎÄ´À°°ÊÍè¡¢¾¯¤Ê¤¯¤È¤â°ìÆü·Ð²á¤·¤Ê¤¤¤È¡¢¤º¤ì¤ò½¤Àµ¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr "Á°²ó¤ÎÄ´À°°ÊÍè¡¢¾¯¤Ê¤¯¤È¤â°ìÆü·Ð²á¤·¤Ê¤¤¤È¡¢¤º¤ì¤ò½¤Àµ¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5720,22 +5595,22 @@ msgstr ""
 "É交ì¤Þ¤·¤¿¡£\n"
 "°ìÆü¤¢¤¿¤ê %4$f É交ì¤ò½¤Àµ¤·¤Þ¤¹\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Á°²ó¤Î½¤Àµ¤«¤é¤Î»þ´Ö¤Ï %d ÉäǤ¹\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "%d ÉäÎÁÞÆþ¤È¡¢%.6f ÉÃÁ°¤Î»þ¹ï¤Î»²¾È¤¬É¬ÍפǤ¹\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "¥Æ¥¹¥È¥â¡¼¥É¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤¿¤á adjtime ¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5744,38 +5619,38 @@ msgstr ""
 "ËÜÍè¤Ê¤é¤Ð %s ¤Ë°Ê²¼¤Î¤è¤¦¤Ë½ñ¤­¹þ¤Þ¤ì¤ë¤Ï¤º¤Ç¤·¤¿:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "¤º¤ì¤Î½¤ÀµÃͤϹ¹¿·¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤¬¡¢Àµ¾ï¤Ê»þ¹ï¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤Î¤Ç¡¢½¤Àµ¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "ɬÍפʽ¤Àµ¤¬°ìÉÃ̤Ëþ¤Ê¤Î¤Ç¡¢¥¯¥í¥Ã¥¯¤òÀßÄꤷ¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "%s ¤ò»È¤¤¤Þ¤¹¡£\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "ÍøÍѲÄǽ¤Ê¥¯¥í¥Ã¥¯¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "¥·¥¹¥Æ¥à¥¯¥í¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5788,17 +5663,17 @@ msgstr ""
 "¤³¤Î hwclock ¤ÎÊ£À½¤Ï Alpha °Ê³°¤Î¥Þ¥·¥ó¤Ç¥Ó¥ë¥É¤µ¤ì¤Þ¤·¤¿\n"
 "(¤½¤·¤ÆÅöÁ³¡¢¸½ºß Alpha ¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó)¡£¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "¥«¡¼¥Í¥ë¤«¤é¥¨¥Ý¥Ã¥¯Ãͤò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "¥«¡¼¥Í¥ë¤Ï¥¨¥Ý¥Ã¥¯Ãͤò %lu ¤ÈÁÛÄꤷ¤Æ¤¤¤Þ¤¹\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5807,17 +5682,22 @@ msgstr ""
 "¥¨¥Ý¥Ã¥¯ÃͤòÀßÄꤹ¤ë¤¿¤á¤Ë¤Ï¡¢²¿¤ÎÃͤòÀßÄꤹ¤ë¤«¤òÃΤ餻¤ë¤¿¤á¤Ë 'epoch'\n"
 "¥ª¥×¥·¥ç¥ó¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "¥¨¥Ý¥Ã¥¯¤ò %d ¤ËÀßÄꤷ¤Þ¤»¤ó -- ¥Æ¥¹¥È¤À¤±¤Ç¤¹¡£\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "¥«¡¼¥Í¥ë¤Ë¥¨¥Ý¥Ã¥¯ÃͤòÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s from %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5876,7 +5756,7 @@ msgstr ""
 "  -noadjfile    /etc/adjtime ¤Ë¥¢¥¯¥»¥¹¤·¤Ê¤¤¡£--utc Ëô¤Ï --localtime\n"
 "                ¤Î¤¤¤º¤ì¤«¤Î»ÈÍѤòɬÍפȤ¹¤ë\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5885,12 +5765,12 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                ¤¢¤Ê¤¿¤Î alpha ¤Î¥¿¥¤¥×¤ò»Ø¼¨¤¹¤ë (hwclock(8) »²¾È)\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ¤Ï²¿¤é¤«¤Î¥ª¥×¥·¥ç¥ó°ú¿ô¤ò¼è¤ê¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï %d ¸ÄÍ¿¤¨¤Þ¤·¤¿¡£\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5899,7 +5779,7 @@ msgstr ""
 "¤¢¤Ê¤¿¤Ïµ¡Ç½¥ª¥×¥·¥ç¥ó¤òÊ£¿ô¸Ä»ØÄꤷ¤Þ¤·¤¿¡£\n"
 "°ìÅ٤˰ì¤Ä¤Îµ¡Ç½¤Î¤ß¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5908,7 +5788,7 @@ msgstr ""
 "%s: --utc ¤È --localtime ¥ª¥×¥·¥ç¥ó¤ÏÁê¸ßÇÓ¾Ū¤Ç¤¹¤¬¡¢Î¾Êý¤¬»ØÄꤵ¤ì¤Þ¤·"
 "¤¿¡£\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -5917,30 +5797,30 @@ msgstr ""
 "%s: --adjust ¤È --noadjfile ¥ª¥×¥·¥ç¥ó¤ÏÁê¸ßÇÓ¾Ū¤Ç¤¹¤¬¡¢Î¾Êý¤¬»ØÄꤵ¤ì¤Þ¤·"
 "¤¿¡£\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: --noadjfile ¤ò¤Ä¤±¤¿¾ì¹ç¡¢--utc ¤« --localtime ¤Î¤¤¤º¤ì¤«¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð"
 "¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Í­¸ú¤ÊÀßÄê»þ¹ï¤¬¤¢¤ê¤Þ¤»¤ó¡£¥¯¥í¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 "»ÄÇ°¤Ê¤¬¤é¡¢¥Ï¡¼¥É¥¦¥§¥¢¥¯»þ·×¤ÎÊѹ¹¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤·¤«¹Ô¤Ê¤¨¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "»ÄÇ°¤Ê¤¬¤é¡¢¥·¥¹¥Æ¥à»þ·×¤ÎÊѹ¹¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤·¤«¹Ô¤Ê¤¨¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -5949,12 +5829,12 @@ msgstr ""
 "»ÄÇ°¤Ê¤¬¤é¡¢¥«¡¼¥Í¥ëÆâ¤Î¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Î¥¨¥Ý¥Ã¥¯ÃͤòÊѹ¹¤Ç¤­¤ë¤Î¤Ï¡¢\n"
 "¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤À¤±¤Ç¤¹¡£\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "´ûÃΤΤɤó¤ÊÊýË¡¤Ç¤â¡¢¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5988,7 +5868,6 @@ msgstr "%s ¤«¤é»þ¹ï¤òÆɹþ¤à¤¿¤á¤Î ioctl() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 msgid "ioctl KDSHWCLK failed"
 msgstr "KDSHWCLK ioctl ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "/dev/tty1 ¤Þ¤¿¤Ï /dev/vc/1 ¤ò³«¤±¤Þ¤»¤ó"
@@ -6085,9 +5964,6 @@ msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 "%2$s ¤«¤é RTC_EPOCH_READ ioctl ¤Ë¤è¤Ã¤Æ¥¨¥Ý¥Ã¥¯ %1$ld ¤òÆɤ߼è¤ê¤Þ¤·¤¿¡£\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6115,7 +5991,6 @@ msgstr "%s ¤Ø¤Î ioctl(RTC_EPOCH_SET) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 msgid "calling open_tty\n"
 msgstr "open_tty ¤Î¸Æ¤Ó½Ð¤·Ãæ\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "termio_init ¸Æ¤Ó½Ð¤·Ãæ\n"
@@ -6124,7 +5999,6 @@ msgstr "termio_init ¸Æ¤Ó½Ð¤·Ãæ\n"
 msgid "writing init string\n"
 msgstr "½é´ü²½Ê¸»úÎó¤Î½ñ¤­¹þ¤ßÃæ\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "¼«Æ°¥Ü¡¼¥ì¡¼¥È¸¡½ÐÁ°\n"
@@ -6138,7 +6012,6 @@ msgstr "cr-lf ¤òÂԤäƤ¤¤Þ¤¹\n"
 msgid "read %c\n"
 msgstr "%c ¤òÆɹþ¤ß\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "¥í¥°¥¤¥ó̾¤òÆɹþ¤á¤Þ¤»¤ó\n"
@@ -6192,7 +6065,6 @@ msgstr "/dev: chdir() ¤¬¼ºÇÔ: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ¥­¥ã¥é¥¯¥¿¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6207,12 +6079,10 @@ msgstr "/dev/%s: ɸ½àÆþÎϤȤ·¤Æ³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: Æɤ߽ñ¤­Î¾ÍѤ˥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "Ê£À½Ãæ\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6255,30 +6125,25 @@ msgstr ""
 "Ëô¤Ï\t[-hiLmw] [-l ¥í¥°¥¤¥ó¥×¥í¥°¥é¥à] [-t¥¿¥¤¥à¥¢¥¦¥È [-I ½é´ü²½Ê¸»úÎó] [-H "
 "¥í¥°¥¤¥ó¥Û¥¹¥È] ¹Ô ¥Ü¡¼¥ì¡¼¥È,... [üËö¥¿¥¤¥×]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: ¥á¥â¥ê¤¬¾¯¤Ê¤¤¤Î¤Ç¡¢¥í¥°¥¤¥ó¤Ë¼ºÇÔ¤¹¤ë¤è¤¦¤Ç¤¹\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "tty ¥¯¥é¥¹ÍÑ¥á¥â¥ê¤¬³ÎÊݤǤ­¤Þ¤»¤ó"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "¥°¥ë¡¼¥×¥ê¥¹¥ÈÍÑ¥á¥â¥ê¤¬³ÎÊݤǤ­¤Þ¤»¤ó"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "%2$s ¤«¤é %1$s ¤Ø¤Î¥í¥°¥¤¥ó¤Ï¡¢½é´ü¾õÂ֤ǤϵñÈݤµ¤ì¤Þ¤·¤¿¡£\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "%2$s ¤«¤é %1$s ¤Ø¤Î¥í¥°¥¤¥ó¤ÏÈÝÄꤵ¤ì¤Þ¤·¤¿¡£\n"
@@ -6324,8 +6189,8 @@ msgstr "%s ¤Î finger ¾ðÊó¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 msgid "Password error."
 msgstr "¥Ñ¥¹¥ï¡¼¥É¥¨¥é¡¼¡£"
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "¥Ñ¥¹¥ï¡¼¥É: "
@@ -6503,34 +6368,6 @@ msgstr "¥ê¥¹¥È¤ò¸«¤ë¤Ë¤Ï¡¢%s -l ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 msgid "No known shells.\n"
 msgstr "ÃΤé¤Ê¤¤¥·¥§¥ë¤Ç¤¹¡£\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "/dev/urandom ¤ò³«¤±¤Þ¤»¤ó"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "/dev/urandom ¤«¤é¥é¥ó¥À¥à¥Ç¡¼¥¿¤¬Æɹþ¤á¤Þ¤»¤ó"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "(%s) ¥Õ¥¡¥¤¥ë¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s ¤ÏÀµ¤·¤¤¥Õ¥¡¥¤¥ë¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "%s ¤«¤é¥Ç¡¼¥¿¤òÆɹþ¤á¤Þ¤»¤ó"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6540,11 +6377,11 @@ msgstr "%s ¤òÆɤá¤Þ¤»¤ó¤Î¤Ç½ªÎ»¤·¤Þ¤¹¡£"
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "»È¤¤Êý: last [-#] [-f ¥Õ¥¡¥¤¥ë] [-t üËö] [-h ¥Û¥¹¥È̾] [¥æ¡¼¥¶ ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  ¥í¥°¥¤¥ó¤·¤¿¤Þ¤Þ¤Ç¤¹"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6553,15 +6390,15 @@ msgstr ""
 "\n"
 "wtmp ¤Ï %s ¤«¤é»Ï¤Þ¤ê¤Þ¤¹ "
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: ¥á¥â¥ê³ÎÊݤ˼ºÇÔ¡£\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6570,51 +6407,45 @@ msgstr ""
 "\n"
 "³ä¤ê¹þ¤ß¤¬Æþ¤ê¤Þ¤·¤¿ %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: %s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h ¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ÀìÍѤǤ¹¡£\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "»È¤¤Êý: login [-fp] [¥æ¡¼¥¶Ì¾]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM ¼ºÇÔ¡£ÃæÃǤ·¤Þ¤¹: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM ¤Î½é´ü²½¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "¥í¥°¥¤¥ó: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6623,17 +6454,17 @@ msgstr ""
 "Login ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "*¥í¥°¥¤¥ó¥È¥é¥¤¤¬Â¿¤¹¤®¤Þ¤¹* (%d) %s ¤«¤é %s ¤Ø, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "¼ºÇÔ¤·¤¿¥í¥°¥¤¥ó¥»¥Ã¥·¥ç¥ó %s ¤«¤é %s ¤Ø, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6642,7 +6473,7 @@ msgstr ""
 "\n"
 "Login ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6651,135 +6482,120 @@ msgstr ""
 "\n"
 "¥»¥Ã¥·¥ç¥ó¥»¥Ã¥È¥¢¥Ã¥×¤ËÌäÂê¡£ÃæÃǤ·¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL ¥æ¡¼¥¶Ì¾¤¬ %s:%d ¤Ë¤¢¤ê¤Þ¤¹¡£ÃæÃǤ·¤Þ¤¹¡£"
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "̵¸ú¤Ê¥æ¡¼¥¶Ì¾ \"%s\" ¤¬ %s:%d ¤Ë¤¢¤ê¤Þ¤¹¡£ÃæÃǤ·¤Þ¤¹"
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: ¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "ÉÔÀµ¤Ê¥æ¡¼¥¶Ì¾"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s ¤Î¥í¥°¥¤¥ó¤Ï¤³¤ÎüËö¤Ç¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "¥í¥°¥¤¥ó %s ¤òµñÀä¡¢%s ¤«¤é TTY %s ¾å¤Ç"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "¥í¥°¥¤¥ó %s ¤òµñÀä¡¢TTY %s ¾å¤Ç"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"´û¤Ë¥í¥°¥¤¥ó¤·¤Æ¤¤¤ë¥æ¡¼¥¶¡¼¿ô¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
-"¤Þ¤¿¸å¤Ç»î¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "¤¢¤Ê¤¿¤¬¼Â¹Ô¤·¤Æ¤¤¤ë¥×¥í¥»¥¹¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "¥À¥¤¥¢¥ë¥¢¥Ã¥×¤Ç %s ¤Ë¡¢%s ¤Ë¤è¤ë"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s ¤Ë ROOT ¤¬¥í¥°¥¤¥ó¡¢%s ¤«¤é"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s ¤Ë ROOT ¤¬¥í¥°¥¤¥ó"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s ¤Ë %s ¤¬¥í¥°¥¤¥ó¡¢%s ¤«¤é"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s ¤Ë %s ¤¬¥í¥°¥¤¥ó"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "¿·¤·¤¤¥á¥¤¥ë¤¬ÆϤ¤¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "¥á¥¤¥ë¤¬ÆϤ¤¤Æ¤¤¤Þ¤¹¡£\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork ¤Ë¼ºÇÔ: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ¤Ë¼ºÇÔ"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬¤¢¤ê¤Þ¤»¤ó¡ª\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê \"/\" ¤Ç¥í¥°¥¤¥ó¤·¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ¥·¥§¥ë¥¹¥¯¥ê¥×¥ÈÍѤΥá¥â¥ê¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ¥·¥§¥ë¤¬¤¢¤ê¤Þ¤»¤ó: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6788,65 +6604,65 @@ msgstr ""
 "\n"
 "%s ¥í¥°¥¤¥ó: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "¥í¥°¥¤¥ó̾¤¬Ä¹¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "̾Á°¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "¥í¥°¥¤¥ó̾¤Ï '-' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "¹ÔÁ÷¤ê(linefeed) ¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "²áÂç¤Ê¹ÔÁ÷¤ê(linefeed)"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "%d Éøå¤Ë¥í¥°¥¤¥ó¤Î»þ´ÖÀÚ¤ì\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "ºÇ½ª¥í¥°¥¤¥ó: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr " %.*s ¤«¤é\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr " %.*s ¾å\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s ¤«¤é¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ¤Ç¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ²ó %s ¤«¤é¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ²ó %s ¤Ç¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
@@ -6866,168 +6682,30 @@ msgstr "¤Ï n ¤Ç¤¹\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "»È¤¤Êý: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: ¤¢¤ó¤¿Ã¯¡©"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: ¤½¤Î¤è¤¦¤Ê¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: µö²Ä¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "¥·¥§¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏºÇÄã 6 ʸ»úɬÍפǤ¹¡£¤â¤¦°ìÅÙ¤ä¤êľ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"¥Ñ¥¹¥ï¡¼¥É¤Ï°Ê²¼¤ÎÁȤߤ«¤é 2 ¤Ä°Ê¾å¤Ç¹½À®¤µ¤ì¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó:\n"
-"±ÑÂçʸ»ú¤È±Ñ¾®Ê¸»ú¡¢¿ô»ú¤ÈÈó¥¢¥ë¥Õ¥¡¥Ù¥Ã¥Èʸ»ú\n"
-"¾Ü¤·¤¤¾ðÊó¤Ï passwd(1) ¤ò¸«¤Þ¤·¤ç¤¦¡£\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "¸Å¤¤¥Ñ¥¹¥ï¡¼¥É¤ÎºÆÍøÍѤϤǤ­¤Þ¤»¤ó¡£\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "¥æ¡¼¥¶Ì¾¤ÈƱ¤¸¤è¤¦¤Ê¥Ñ¥¹¥ï¡¼¥É¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡ª\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "¤¢¤Ê¤¿¤Î¼Â̾¤Î¤è¤¦¤Ê¥Ñ¥¹¥ï¡¼¥É¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡ª\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "»È¤¤Êý: passwd [¥æ¡¼¥¶Ì¾ [¥Ñ¥¹¥ï¡¼¥É]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "root ¤À¤±¤¬°ì¤Ä¤Þ¤¿¤ÏÆó¤Ä¤Î°ú¿ô·Á¼°¤Ç¼Â¹Ô¤Ç¤­¤Þ¤¹\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "»È¤¤Êý: passwd [-foqsvV] [¥æ¡¼¥¶ [¥Ñ¥¹¥ï¡¼¥É]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "¥í¥°¥¤¥ó̾¤¬¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "root ¤À¤±¤¬Â¾¿Í¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤Ç¤­¤Þ¤¹\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "¥æ¡¼¥¶Ì¾¤¬¤É¤³¤Ë¤â¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£`%s' ¤ÏËÜÅö¤Ë¥æ¡¼¥¶¤Ç¤¹¤«¡©"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"»ÄÇ°¤Ê¤¬¤é¡¢¥í¡¼¥«¥ë¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÊѹ¹¤·¤«¤Ç¤­¤Þ¤»¤ó¡£\n"
-"¤«¤ï¤ê¤Ë yppasswd ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "¥æ¡¼¥¶ID ÈÖ¹æ¤È¥æ¡¼¥¶Ì¾¤¬°ìÃפ·¤Þ¤»¤ó¡£º¾¾Î¤À¡ª"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "%s ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤Þ¤¹\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "µå¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "ÉÔÀµ¤Ê¥Ñ¥¹¥ï¡¼¥É¡¢º¾¾Î¤Ç¤¹¡£"
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "¿·¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£"
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "¿·¥Ñ¥¹¥ï¡¼¥É¤ò¤â¤¦°ìÅÙÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Ä֤꤬°ã¤¤¤Þ¤¹¡£¸å¤Ç¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£"
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£¥æ¡¼¥¶ %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "* root ¤Î¥Ñ¥¹¥ï¡¼¥É¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿ *"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤Ï¥ë¡¼¥È¤Ë¤è¤Ã¤ÆÊѹ¹¤µ¤ì¤Þ¤·¤¿¡¢¥æ¡¼¥¶ %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤òÀßÄꤹ¤ë¤¿¤á setpwnam ¤ò¸Æ¤Ó½Ð¤·Ãæ¡£\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹ *¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿*¡£¸å¤Ç¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7074,7 +6752,6 @@ msgstr "%s ¤Ë¤è¤ë reboot: %s"
 msgid "halted by %s: %s"
 msgstr "%s ¤Ë¤è¤ë halt: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7111,7 +6788,6 @@ msgstr "¥×¥í¥°¥é¥à \"%s\" ¤ò¼Â¹Ô¤·¤Æ¤¤¤Þ¤¹...\n"
 msgid "Error executing\t%s\n"
 msgstr "¼Â¹Ô¥¨¥é¡¼\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7201,7 +6877,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr "finalprog µ¯Æ°»þ¤Ë¥¨¥é¡¼È¯À¸\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "finalprog ¤Î fork »þ¤Ë¥¨¥é¡¼È¯À¸\n"
@@ -7230,7 +6905,7 @@ msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ª¡¼¥×¥ó¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n"
 msgid "fork failed\n"
 msgstr "fork ¤¬¼ºÇÔ\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "¼Â¹Ô¤Ë¼ºÇÔ\n"
 
@@ -7379,12 +7054,6 @@ msgstr "ÉÔÀµ¤Ê·î: 1-12 ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤"
 msgid "illegal year value: use 1-9999"
 msgstr "ÉÔÀµ¤Êǯ: 1-9999 ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7395,13 +7064,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "»È¤¤Êý: cal [-mjyV] [Æü ·î ǯ]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "»È¤¤Êý: %s [+½ñ¼°] [Æü ·î ǯ]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "À» Tib ¤ÎÆü"
 
@@ -7533,7 +7201,7 @@ msgstr "%s: %s ¤«¤é %s ¤Ø¤Î̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s from to files...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7544,22 +7212,22 @@ msgstr ""
 "ËÜÅö¤Ë¤½¤ì¤ò»È¤¤¤¿¤¤¤Ê¤é `%s [¥ª¥×¥·¥ç¥ó] %s' ¤ò»È¤¤¤Þ¤·¤ç¤¦\n"
 "script ¤Ï³«»Ï¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "»È¤¤Êý: script [-a] [-f] [-q] [-t] [¥Õ¥¡¥¤¥ë]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤ò³«»Ï¤·¤Þ¤·¤¿¡¢¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "¥¹¥¯¥ê¥×¥È¤Ï %s ¤Ë³«»Ï¤·¤Þ¤·¤¿"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7568,254 +7236,253 @@ msgstr ""
 "\n"
 "¥¹¥¯¥ê¥×¥È¤Ï %s ¤Ë½ªÎ»¤·¤Þ¤·¤¿"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤ò½ªÎ»¤·¤Þ¤·¤¿¡¢¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ¤¬¼ºÇÔ\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "ÍøÍѤǤ­¤ë pty ¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: °ú¿ô¥¨¥é¡¼¡¢»È¤¤Êý¤Ï\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term üËö̾ ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ ¥¿¥Ö1 ¥¿¥Ö2 ¥¿¥Ö3 ... ] ]      (¥¿¥Ö¿ô = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ ¥¿¥Ö1 ¥¿¥Ö2 ¥¿¥Ö3 ... ] ]   (¥¿¥Ö¿ô = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file ¥À¥ó¥×¥Õ¥¡¥¤¥ë̾ ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "¥Ñ¥ï¡¼¥»¡¼¥Ö¥â¡¼¥É¤ËÀßÄê(Ëô¤Ï²ò½ü)¤Ç¤­¤Þ¤»¤ó\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl ¥¨¥é¡¼: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "%s ¤ÎÆɹþ¤ß¥¨¥é¡¼\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "¥¹¥¯¥ê¡¼¥ó¥À¥ó¥×½ñ¤­¹þ¤ß¥¨¥é¡¼\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "%s ¤òÆɤá¤Þ¤»¤ó¡¢¤½¤·¤Æ ioctl ¥À¥ó¥×¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
@@ -7890,10 +7557,6 @@ msgstr "·Ù¹ð: %s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ -- Âå¤ê¤Ë %s ¤ò»È¤¤¤Þ¤¹\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8191,82 +7854,72 @@ msgstr "mount: %s ¤ò®ÅÙÀßÄêÍѤ˥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ®ÅÙ¤ÎÀßÄ꤬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork ¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï 'nfs' ¥¿¥¤¥×¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: nfs mount version 4 ¤Ç¤Ï¼ºÇÔ¤·¤Þ¤·¤¿¡£3 ¤ò»î¤·¤Þ¤¹..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: none ¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¤¬¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò·èÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: ¥Þ¥¦¥ó¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: µö²Ä¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount ¤ò»È¤¦¤Ë¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s ¤Ï»ÈÍÑÃæ¤Ç¤¹"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ¤Ï¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ¤Ï ¥Þ¥¦¥ó¥ÈºÑ¤« %s ¤¬»ÈÍÑÃæ¤Ç¤¹"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤¬Â¸ºß¤·¤Þ¤»¤ó"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤Ï¤É¤³¤â¤µ¤·¤Æ¤¤¤Ê¤¤¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤Ç¤¹"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: ¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹ %s ¤¬Â¸ºß¤·¤Þ¤»¤ó"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8275,12 +7928,12 @@ msgstr ""
 "mount: ¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹ %s ¤¬Â¸ºß¤·¤Þ¤»¤ó\n"
 "       (¥Ñ¥¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ¤Ï¤Þ¤À¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8290,72 +7943,71 @@ msgstr ""
 "       %s ¤Î¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤¬ÉÔÀµ¡¢°¿¤¤¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Þ¥¦¥ó¥È\n"
 "       ¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "¥Þ¥¦¥ó¥È¥Æ¡¼¥Ö¥ë¤¬¤¤¤Ã¤Ñ¤¤¤Ç¤¹"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤òÆɤá¤Þ¤»¤ó"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ÉÔÌÀ¤Ê¥Ç¥Ð¥¤¥¹¤Ç¤¹"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   ´ûÃΤΥե¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: ¤ª¤½¤é¤¯¤¢¤Ê¤¿¤Ï %s ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤·¤ç¤¦"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: ¿ʬ¤¢¤Ê¤¿¤Ï iso9660 ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤Ï¡©"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: ¿ʬ¤¢¤Ê¤¿¤Ï iso9660 ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤Ï¡©"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s ¤Ï´Ö°ã¤Ã¤¿¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×\n"
 "       %s ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¢¤À¤«¤é stat ¤¬¼ºÇÔ¡©"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8364,73 +8016,68 @@ msgstr ""
 "mount: ¤³¤Î¥«¡¼¥Í¥ë¤Ï %s ¤ò¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤È¤·¤Æǧ¼±¤·¤Þ¤»¤ó\n"
 "       (¿ʬ¡¢`insmod ¥É¥é¥¤¥Ð' ¤·¤Ê¤¤¤È¤¤¤±¤Ê¤¤¤Î¤Ç¤Ï¡©)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó (¿ʬ `-o loop' ¤È¤ä¤Ã¤Æ¤ß¤¿¤é¡©)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ¤ÏÀµ¾ï¤Ê¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹ "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ¤òÆɹþ¤ßÀìÍѤǥޥ¦¥ó¥È¤Ç¤­¤Þ¤»¤ó"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s ¤Ï½ñ¤­¹þ¤ß¶Ø»ß¤Ç¤¹¤¬¡¢`-w' ¥Õ¥é¥°¤¬ÌÀ¼¨Åª¤ËÍ¿¤¨¤é¤ì¤Þ¤·¤¿"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ¤Ï½ñ¤­¹þ¤ß¶Ø»ß¤Ç¤¹¡¢Æɹþ¤ßÀìÍѤǥޥ¦¥ó¥È¤·¤Þ¤¹"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: ¥¿¥¤¥×¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó -- ¥³¥í¥ó¤¬¤¢¤ë¤Î¤Ç nfs ¤ÎÍͤǤ¹¤¬\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: ¥¿¥¤¥×¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó -- ¥³¥í¥ó¤¬¤¢¤ë¤Î¤Ç smbfs ¤ÎÍͤǤ¹¤¬\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: Äü¤á¤Þ¤·¤¿ \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8475,34 +8122,34 @@ msgstr ""
 "¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó: [-nfFrsvw] [-o ¥ª¥×¥·¥ç¥ó]\n"
 "¤â¤Ã¤È¾Ü¤·¤¤¤³¤È¤òÃΤꤿ¤±¤ì¤Ð¡¢man 8 mount ¤È¾§¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: root ¤À¤±¤¬¤½¤ì¤ò¹Ô¤Ê¤¨¤Þ¤¹"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó -- ºîÀ®¤·¤Þ¤¹..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: ¤½¤Î¤è¤¦¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s ¤ò¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "²¿¤â¥Þ¥¦¥ó¥È¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %2$s Æâ¤Ë %1$s ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %2$s ¤ä %3$s Æâ¤Ë %1$s ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
@@ -8537,99 +8184,99 @@ msgstr "       ¥¿¥¤¥× %s ¤ò»î¤·¤Æ¤ß¤Þ¤¹\n"
 msgid "Trying %s\n"
 msgstr "%s ¤ò»î¤·¤Þ¤¹\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: ¶Ëü¤ËŤ¤ ¥Û¥¹¥È:¥Ç¥£¥ì¥¯¥È¥ê °ú¿ô\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: ·Ù¹ð: Ê£¿ô¤Î¥Û¥¹¥È̾¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 "mount: ¥Þ¥¦¥ó¥ÈÀè¥Ç¥£¥ì¥¯¥È¥ê¤¬ ¥Û¥¹¥È:¥Ç¥£¥ì¥¯¥È¥ê ·Á¼°¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: %s ¤Î¥¢¥É¥ì¥¹¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ÉÔÀµ¤Ê hp->h_length Ãͤò¼èÆÀ¤·¤Þ¤·¤¿\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: ¥ª¥×¥·¥ç¥ó°ú¿ô¤¬Ä¹¤¹¤®¤Þ¤¹\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "·Ù¹ð: proto= ¥ª¥×¥·¥ç¥ó¤¬Íý²ò¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "·Ù¹ð: namlen ¥ª¥×¥·¥ç¥ó¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "ÉÔÌÀ¤Ê nfs ¥Þ¥¦¥ó¥È¥Ñ¥é¥á¡¼¥¿: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "·Ù¹ð: nolock ¥ª¥×¥·¥ç¥ó¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "ÉÔÌÀ¤Ê nfs ¥Þ¥¦¥ó¥È¥ª¥×¥·¥ç¥ó: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ÉÔÀµ¤Ê hp->h_length Ãͤò¼èÆÀ¡©\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "TCP ·Ðͳ¤Î NFS ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs ¥½¥±¥Ã¥È"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs ¥µ¡¼¥Ð¤Ï¥µ¡¼¥Ó¥¹¤¬ÍøÍѤǤ­¤Ê¤¤¤ÈÊó¹ð¤·¤Þ¤·¤¿"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "NFS ¥Ý¡¼¥È¤ò¸«¤Ä¤±¤ë¤¿¤á¤Ë portmapper ¤òÍøÍÑ\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "nfs ¥Ç¡¼¥â¥ó¤Î¤¿¤á¤Ë %d È֥ݡ¼¥È¤òÍøÍÑ\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs Àܳ"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "ÉÔÌÀ¤Ê nfs ¥¹¥Æ¡¼¥¿¥¹ÃͤòÊÖ¤·¤Þ¤·¤¿: %d"
@@ -8638,7 +8285,7 @@ msgstr "ÉÔÌÀ¤Ê nfs ¥¹¥Æ¡¼¥¿¥¹ÃͤòÊÖ¤·¤Þ¤·¤¿: %d"
 msgid "bug in xstrndup call"
 msgstr "xstrndup ¸Æ¤Ó½Ð¤·¤Î¥Ð¥°"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8651,7 +8298,7 @@ msgstr ""
 "        %s [-v] [-p Í¥ÀèÅÙ] ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8663,139 +8310,137 @@ msgstr ""
 "        %s [-v] [-p Í¥ÀèÅÙ] ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%2$s ¤Ë %1$s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: %s ¤Ë \"_stext\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: %s ¤Î¾õÂÖ¼èÆÀ¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: ·Ù¹ð: %s ¤Ï°ÂÁ´¤Ç¤Ê¤¤¸¢¸Â %04o ¤ò»ý¤Á¤Þ¤¹¡£ %04o ¤¬¤ª´«¤á¤Ç¤¹\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: ¥Õ¥¡¥¤¥ë %s ¤ò¥¹¥­¥Ã¥× -- ¥Û¡¼¥ë¤ò¸¡½Ð¡£\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "Not superuser.\n"
 msgstr "¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "mount: -f ¥ª¥×¥·¥ç¥ó¤Î¥µ¥Ý¡¼¥È̵¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: fork ¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "¥Û¥¹¥È: %s, ¥Ç¥£¥ì¥¯¥È¥ê: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: %s ¤Î¥¢¥É¥ì¥¹¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: ÉÔÀµ¤Ê hostp->h_length Ãͤò¼èÆÀ¤·¤Þ¤·¤¿\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s ¤ÏÉÔÀµ¤Ê¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤¹"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: ¥Ç¥Ð¥¤¥¹¤ò»ÈÍÑÃæ¤Ç¤¹"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: ¥¢¥ó¥Þ¥¦¥ó¥È¤¹¤ë¤Ë¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Çµö²Ä¤µ¤ì¤Þ¤»¤ó"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 ¤¬¤¢¤ê¤Þ¤»¤ó¡¢umount ¤·¤Æ¤ß¤Þ¤¹...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ -- Âå¤ê¤Ë %s ¤ò»È¤Ã¤Æ¤ß¤Þ¤¹\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ¤Ï»ÈÍÑÃæ¤Ç¤¹ -- Æɹþ¤ßÀìÍѤȤ·¤ÆºÆ¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s ¤òÆɹþ¤ßÀìÍѤǺƥޥ¦¥ó¥È¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ¤Ï¥¢¥ó¥Þ¥¦¥ó¥È¤µ¤ì¤Þ¤·¤¿\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ¥¢¥ó¥Þ¥¦¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥ê¥¹¥È¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, fuzzy, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8806,49 +8451,48 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×]\n"
 "        umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab ¤Ë %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (mtab ¤Ë¤è¤ë¤È)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s ¤ÏÊ£¿ô¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ç¤¹"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 "umount: %s ¤Ï fstab ¤Ë¤¢¤ê¤Þ¤»¤ó (¤µ¤é¤Ë¡¢¤¢¤Ê¤¿¤Ï root ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s ¤Ï fstab ¤È°ìÃפ·¤Ê¤¤¥Þ¥¦¥ó¥È¤Ç¤¹"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: %s ¤À¤±¤¬ %s ¤ò %s ¤«¤é¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: root ¤À¤±¤¬¤½¤ì¤ò¹Ô¤Ê¤¨¤Þ¤¹"
 
@@ -9004,7 +8648,7 @@ msgstr "%s: ÉÔÌÀ¤Ê¥·¥°¥Ê¥ë %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9174,8 +8818,6 @@ msgstr "¥«¡¼¥Í¥ë¤Ç¤Î¶¦Í­¥á¥â¥ê¤Î°Ù¤ÎÀßÄ꤬¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ ¥·¥§¥¢¡¼¥É¥á¥â¥ê¤ÎÀ©¸Â --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
@@ -9954,17 +9596,17 @@ msgid ""
 msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "»È¤¤Êý: %s [-dflpcsu] [+¹ÔÈÖ¹æ | +/¥Ñ¥¿¡¼¥ó] ̾Á°1 ̾Á°2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: ÉÔÌÀ¤Ê¥·¥°¥Ê¥ë %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9975,8 +9617,7 @@ msgstr ""
 "*** %s: ¥Ç¥£¥ì¥¯¥È¥ê ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9987,46 +9628,46 @@ msgstr ""
 "******** %s: ¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[½ªÎ»¤¹¤ë¤Ë¤Ï q ¤« Q ¤ò²¡¤·¤Æ²¼¤µ¤¤]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--³¤±¤ë--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(¼¡¤Î¥Õ¥¡¥¤¥ë: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[¥¹¥Ú¡¼¥¹¥­¡¼¤ò²¡¤¹¤È³¤­¡¢'q' ¤Ç½ªÎ»¡£]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "... %d ¥Ú¡¼¥¸Ìá¤ê¤Þ¤¹"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "... 1 ¥Ú¡¼¥¸Ìá¤ê¤Þ¤¹"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 #, fuzzy
 msgid "...skipping one line"
 msgstr "...%d ¹ÔÈô¤Ð¤·¤Þ¤¹"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "...%d ¹ÔÈô¤Ð¤·¤Þ¤¹"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10036,7 +9677,7 @@ msgstr ""
 "***Ìá¤ë***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10048,7 +9689,7 @@ msgstr ""
 "¤¹¡£\n"
 "À±°õ(*)¤Ï¥Ç¥Õ¥©¥ë¥È¤¬Êѹ¹¤µ¤ì¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 #, fuzzy
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
@@ -10091,34 +9732,34 @@ msgstr ""
 ":f\t\t\t¸½ºß¤Î¥Õ¥¡¥¤¥ë̾¤È¹ÔÈÖ¹æ¤òɽ¼¨¤¹¤ë\n"
 ".\t\t\tľÁ°¤Î¥³¥Þ¥ó¥É¤ò·«¤êÊÖ¤¹\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "['h' ¥­¡¼¤ÇÁàºîÊýË¡]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" %d ¹Ô"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Èó¥Õ¥¡¥¤¥ë] %d ¹Ô"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Â礭¤¹¤®\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Àµµ¬É½¸½¤¬¥Þ¥º¤¤"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10126,15 +9767,15 @@ msgstr ""
 "\n"
 "¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "»Ò¥×¥í¥»¥¹¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10142,19 +9783,19 @@ msgstr ""
 "\n"
 "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹ "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...¥Õ¥¡¥¤¥ë¤òÈô¤Ð¤·¤Þ¤¹ "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...¥Õ¥¡¥¤¥ë¤ËÌá¤ê¤Þ¤¹ "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "¹Ô¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "ÂçÂΤΤ¿¤á¤Î°ÊÁ°¤Î¥³¥Þ¥ó¥É¤¬¤¢¤ê¤Þ¤»¤ó"
 
@@ -10208,98 +9849,95 @@ msgstr "hexdump: ÉÔÀµ¤Ê½ñ¼° {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ÉÔÀµ¤ÊÊÑ´¹¥­¥ã¥é¥¯¥¿ %%%s¡£\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "ÉÔÀµ¤Ê¥­¡¼"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 #, fuzzy
 msgid "No next file"
 msgstr "(¼¡¤Î¥Õ¥¡¥¤¥ë: %s)"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 #, fuzzy
 msgid "No previous file"
 msgstr "Îΰ褬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: %s ¤Ç read ¥¨¥é¡¼\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: %s ¤Ç seek ¥¨¥é¡¼\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: °ì»þ¥Õ¥¡¥¤¥ë¤òÆɤá¤Þ¤»¤ó¡£\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 #, fuzzy
 msgid "RE error: "
 msgstr ", ¥¨¥é¡¼"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 #, fuzzy
 msgid "Cannot open "
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 #, fuzzy
 msgid "saved"
 msgstr "Á÷¿®"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹ *¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿*¡£¸å¤Ç¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 #, fuzzy
 msgid "(Next file: "
 msgstr "(¼¡¤Î¥Õ¥¡¥¤¥ë: %s)"
@@ -10354,6 +9992,156 @@ msgstr "ÆþÎϹԤ¬Ä¹¤¹¤®¤Þ¤¹¡£\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "¥Ð¥Ã¥Õ¥¡¤ò³ÈÂ礹¤ë¤È¤­¤Ë¥á¥â¥ê¤¬Â­¤ê¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "ÉÔÀµ¤Ê¿ô: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "ʸˡ¥¨¥é¡¼: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "¤½¤Î¤è¤¦¤ÊÀßÄê¥Ñ¥é¥á¥¿¤Ï¤¢¤ê¤Þ¤»¤ó: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] ¥Ç¥Ð¥¤¥¹ ̾Á°\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] ¥Ç¥Ð¥¤¥¹\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] ¥Ç¥Ð¥¤¥¹\n"
+
+#~ msgid "version"
+#~ msgstr "¥Ð¡¼¥¸¥ç¥ó"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "/dev/urandom ¤ò³«¤±¤Þ¤»¤ó"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "/dev/urandom ¤«¤é¥é¥ó¥À¥à¥Ç¡¼¥¿¤¬Æɹþ¤á¤Þ¤»¤ó"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "(%s) ¥Õ¥¡¥¤¥ë¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s ¤ÏÀµ¤·¤¤¥Õ¥¡¥¤¥ë¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "%s ¤«¤é¥Ç¡¼¥¿¤òÆɹþ¤á¤Þ¤»¤ó"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "´û¤Ë¥í¥°¥¤¥ó¤·¤Æ¤¤¤ë¥æ¡¼¥¶¡¼¿ô¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
+#~ "¤Þ¤¿¸å¤Ç»î¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "¤¢¤Ê¤¿¤¬¼Â¹Ô¤·¤Æ¤¤¤ë¥×¥í¥»¥¹¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏºÇÄã 6 ʸ»úɬÍפǤ¹¡£¤â¤¦°ìÅÙ¤ä¤êľ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "¥Ñ¥¹¥ï¡¼¥É¤Ï°Ê²¼¤ÎÁȤߤ«¤é 2 ¤Ä°Ê¾å¤Ç¹½À®¤µ¤ì¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó:\n"
+#~ "±ÑÂçʸ»ú¤È±Ñ¾®Ê¸»ú¡¢¿ô»ú¤ÈÈó¥¢¥ë¥Õ¥¡¥Ù¥Ã¥Èʸ»ú\n"
+#~ "¾Ü¤·¤¤¾ðÊó¤Ï passwd(1) ¤ò¸«¤Þ¤·¤ç¤¦¡£\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "¸Å¤¤¥Ñ¥¹¥ï¡¼¥É¤ÎºÆÍøÍѤϤǤ­¤Þ¤»¤ó¡£\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "¥æ¡¼¥¶Ì¾¤ÈƱ¤¸¤è¤¦¤Ê¥Ñ¥¹¥ï¡¼¥É¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡ª\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "¤¢¤Ê¤¿¤Î¼Â̾¤Î¤è¤¦¤Ê¥Ñ¥¹¥ï¡¼¥É¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡ª\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "»È¤¤Êý: passwd [¥æ¡¼¥¶Ì¾ [¥Ñ¥¹¥ï¡¼¥É]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "root ¤À¤±¤¬°ì¤Ä¤Þ¤¿¤ÏÆó¤Ä¤Î°ú¿ô·Á¼°¤Ç¼Â¹Ô¤Ç¤­¤Þ¤¹\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "»È¤¤Êý: passwd [-foqsvV] [¥æ¡¼¥¶ [¥Ñ¥¹¥ï¡¼¥É]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "¥í¥°¥¤¥ó̾¤¬¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "root ¤À¤±¤¬Â¾¿Í¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤Ç¤­¤Þ¤¹\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "¥æ¡¼¥¶Ì¾¤¬¤É¤³¤Ë¤â¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£`%s' ¤ÏËÜÅö¤Ë¥æ¡¼¥¶¤Ç¤¹¤«¡©"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "»ÄÇ°¤Ê¤¬¤é¡¢¥í¡¼¥«¥ë¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÊѹ¹¤·¤«¤Ç¤­¤Þ¤»¤ó¡£\n"
+#~ "¤«¤ï¤ê¤Ë yppasswd ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "¥æ¡¼¥¶ID ÈÖ¹æ¤È¥æ¡¼¥¶Ì¾¤¬°ìÃפ·¤Þ¤»¤ó¡£º¾¾Î¤À¡ª"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "%s ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤Þ¤¹\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "µå¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "ÉÔÀµ¤Ê¥Ñ¥¹¥ï¡¼¥É¡¢º¾¾Î¤Ç¤¹¡£"
+
+#~ msgid "Enter new password: "
+#~ msgstr "¿·¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#~ msgid "Password not changed."
+#~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+
+#~ msgid "Re-type new password: "
+#~ msgstr "¿·¥Ñ¥¹¥ï¡¼¥É¤ò¤â¤¦°ìÅÙÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Ä֤꤬°ã¤¤¤Þ¤¹¡£¸å¤Ç¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£"
+
+#~ msgid "password changed, user %s"
+#~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£¥æ¡¼¥¶ %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "* root ¤Î¥Ñ¥¹¥ï¡¼¥É¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿ *"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤Ï¥ë¡¼¥È¤Ë¤è¤Ã¤ÆÊѹ¹¤µ¤ì¤Þ¤·¤¿¡¢¥æ¡¼¥¶ %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤òÀßÄꤹ¤ë¤¿¤á setpwnam ¤ò¸Æ¤Ó½Ð¤·Ãæ¡£\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹ *¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿*¡£¸å¤Ç¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï 'nfs' ¥¿¥¤¥×¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "·Ù¹ð: %d °Ê¹ß¤ÎÎΰè¤òºï½ü¤·¤Þ¤¹\n"
diff --git a/po/nl.gmo b/po/nl.gmo
new file mode 100644
index 000000000..3ab62f305
--- /dev/null
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index cf305e156..5616404f3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-21 18:46-0500\n"
-"PO-Revision-Date: 2005-01-20 18:29+0100\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-25 10:35+0100\n"
 "Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -126,7 +126,7 @@ msgstr "%s: ioctl fout bij %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   StartSec     Grootte Apparaat\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "gebruik:\n"
@@ -170,13 +170,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "gebruik: %s [ -n ] apparaat\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s van %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -201,7 +200,7 @@ msgstr "Dubbel"
 msgid "Single"
 msgstr "Enkel"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -216,97 +215,99 @@ msgstr ""
 " -v         meer informatie weergeven\n"
 " file       bestand om te testen\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: fout %d bij uitpakken! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: grootte fout in symbolische koppeling `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  uitpakken blok bij %ld tot %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: foutieve modus op `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  gat bij %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Niet-blok (%ld) bytes\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Niet-grootte (%ld vs. %ld) bytes\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: onjuist cramfs--slechte padlengte\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: gecompileerd zonder -x ondersteuning\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: waarschuwing--kon bestandssysteem grootte niet bepalen \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s is geen blok-apparaat of bestand\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: onjuist cramfs--bestandslengte te kort\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: onjuist cramfs--foutieve soort-aanduiding\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: waarschuwing--bestandslengte te lang, opgevulde afbeelding?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: onjuist cramfs--crc fout\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: waarschuwing--oude cramfs afbeelding, geen CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: onjuist cramfs--slecht superblok\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
-msgstr "%s: onjuist cramfs--map-gegevens einde (%ld) != bestandsgegevens start (%ld)\n"
+msgstr ""
+"%s: onjuist cramfs--map-gegevens einde (%ld) != bestandsgegevens start (%"
+"ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: onjuist cramfs--onjuiste bestandsgegevens plaats\n"
@@ -782,7 +783,7 @@ msgstr "te veel inodes - maximum: 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "niet genoeg ruimte, tenminste %lu blokken nodig"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Apparaat: %s\n"
@@ -851,18 +852,20 @@ msgstr "fout bij schrijven .. ingang"
 msgid "error closing %s"
 msgstr "fout bij sluiten %s"
 
-#: disk-utils/mkfs.c:76
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
-msgstr "Gebruik: mkfs [-V] [-t soort bestandssysteem] [opties bestandssysteem] apparaat [grootte]\n"
+msgstr ""
+"Gebruik: mkfs [-V] [-t soort bestandssysteem] [opties bestandssysteem] "
+"apparaat [grootte]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:347 getopt/getopt.c:89
-#: getopt/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
+#: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Geheugentekort!\n"
 
-#: disk-utils/mkfs.c:99
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versie %s (%s)\n"
@@ -870,7 +873,8 @@ msgstr "mkfs versie %s (%s)\n"
 #: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
-"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
+"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
+"outfile\n"
 " -h         print this help\n"
 " -v         be verbose\n"
 " -E         make all warnings errors (non-zero exit status)\n"
@@ -884,13 +888,15 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"gebruik: %s [-h] [-v] [-b blokgrootte] [-e editie] [-i bestand] [-n naam] mapnaam uitvoerbestand\n"
+"gebruik: %s [-h] [-v] [-b blokgrootte] [-e editie] [-i bestand] [-n naam] "
+"mapnaam uitvoerbestand\n"
 " -h         deze hulp weergeven\n"
 " -v         meer informatie weergeven\n"
 " -E         van alle waarschuwingen fouten maken (niet-nul afsluitstatus)\n"
 " -b         gebruik deze blokgrootte; moet gelijk zijn aan paginagrootte\n"
 " -e editie  editienummer instellen (deel van bestandssysteem id)\n"
-" -i bestand een bestandsafbeelding invoegen in het bestandssysteem (>= 2.4.0 nodig)\n"
+" -i bestand een bestandsafbeelding invoegen in het bestandssysteem (>= 2.4.0 "
+"nodig)\n"
 " -n naam    naam van cramfs bestandssysteem instellen\n"
 " -p         opvullen met %d bytes voor opstartcode\n"
 " -s         mapingangen sorteren (oude optie, wordt genegeerd)\n"
@@ -905,7 +911,8 @@ msgid ""
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 "Erg lange (%u bytes) bestandsnaam `%s' gevonden.\n"
-" Verhoog alstublieft MAX_INPUT_NAMELEN in mkcramfs.c en hercompileer.  Afsluiten.\n"
+" Verhoog alstublieft MAX_INPUT_NAMELEN in mkcramfs.c en hercompileer.  "
+"Afsluiten.\n"
 
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
@@ -914,8 +921,12 @@ msgstr "bestandssysteem te groot.  Afsluiten.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
-msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
-msgstr "MAXENTRIES overschreden.  Verhoog deze waarde in mkcramfs.c en hercompileer.  Afsluiten.\n"
+msgid ""
+"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
+"Exiting.\n"
+msgstr ""
+"MAXENTRIES overschreden.  Verhoog deze waarde in mkcramfs.c en "
+"hercompileer.  Afsluiten.\n"
 
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
@@ -929,8 +940,12 @@ msgstr "%6.2f%% (%+d bytes)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:819
 #, c-format
-msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
-msgstr "waarschuwing: de geschatte benodigde grootte (bovengrens) is %LdMB, maar maximale afbeeldingsgrootte is %uMB.  Dit gaat misschien niet lukken.\n"
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB.  We might die prematurely.\n"
+msgstr ""
+"waarschuwing: de geschatte benodigde grootte (bovengrens) is %LdMB, maar "
+"maximale afbeeldingsgrootte is %uMB.  Dit gaat misschien niet lukken.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
 #, c-format
@@ -960,17 +975,15 @@ msgstr "CRC: %x\n"
 #: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
-msgstr "niet genoeg ruimte gereserveerd voor ROM afbeelding (%Ld gereserveerd, %d gebruikt)\n"
+msgstr ""
+"niet genoeg ruimte gereserveerd voor ROM afbeelding (%Ld gereserveerd, %d "
+"gebruikt)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "Schrijven ROM afbeelding mislukt (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -988,13 +1001,19 @@ msgstr "waarschuwing: bestandsgroottes afgekapt tot %luMB (min 1 byte).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
-msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "waarschuwing: uids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem zijn.)\n"
+msgid ""
+"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"waarschuwing: uids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem "
+"zijn.)\n"
 
 #: disk-utils/mkfs.cramfs.c:928
 #, c-format
-msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "waarschuwing: gids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem zijn.)\n"
+msgid ""
+"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"waarschuwing: gids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem "
+"zijn.)\n"
 
 #: disk-utils/mkfs.cramfs.c:933
 #, c-format
@@ -1043,7 +1062,6 @@ msgstr "schrijven inodes mislukt"
 msgid "write failed in write_block"
 msgstr "schrijven mislukt in write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1079,7 +1097,7 @@ msgstr "zoeken mislukt tijdens testen van blokken"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Vreemde waarden in do_check: waarschijnlijk programmeerfouten\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "zoeken mislukt in check_blocks"
 
@@ -1121,80 +1139,108 @@ msgstr "vinden %s mislukt"
 msgid "will not try to make filesystem on '%s'"
 msgstr "zal niet proberen een bestandssysteem te maken op '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Slechte door gebruiker aangegeven pagina grootte %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr "Door gebruiker aangegeven pagina grootte %d wordt gebruikt, in plaats van systeemwaarden %d/%d\n"
+msgstr ""
+"Door gebruiker aangegeven pagina grootte %d wordt gebruikt, in plaats van "
+"systeemwaarden %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Pagina groottes van %d worden aangenomen (niet %d)\n"
 
-#: disk-utils/mkswap.c:326
+#: disk-utils/mkswap.c:233
+#, c-format
+msgid "Bad swap header size, no label written.\n"
+msgstr "Slechte swap-headergrootte, er is geen label weggeschreven.\n"
+
+#: disk-utils/mkswap.c:243
+#, c-format
+msgid "Label was truncated.\n"
+msgstr "Label is ingekort.\n"
+
+#: disk-utils/mkswap.c:249
+#, c-format
+msgid "no label, "
+msgstr "geen label,"
+
+#: disk-utils/mkswap.c:257
 #, c-format
-msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr "Gebruik: %s [-c] [-v0|-v1] [-pPAGINAGROOTTE] /dev/naam [blokken]\n"
+msgid "no uuid\n"
+msgstr "geen uuid\n"
 
-#: disk-utils/mkswap.c:349
+#: disk-utils/mkswap.c:381
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
+msgstr ""
+"Gebruik: %s [-c] [-v0|-v1] [-pPAGINAGROOTTE] [-L label] /dev/naam [blokken]\n"
+
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "teveel slechte pagina's"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1975 text-utils/more.c:1986
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Geheugentekort"
 
-#: disk-utils/mkswap.c:380
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "één slechte pagina\n"
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu slechte pagina's\n"
 
-#: disk-utils/mkswap.c:502
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fout: Nergens om wisselgeheugen op in te stellen?\n"
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fout: grootte %lu is groter dan apparaatgrootte %lu\n"
 
-#: disk-utils/mkswap.c:539
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fout: onbekende versie %d\n"
 
-#: disk-utils/mkswap.c:546
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fout: wisselgeheugen moet tenminste %ldkB zijn\n"
 
-#: disk-utils/mkswap.c:563
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: waarschuwing: afkappen wisselgeheugen tot %ldkB\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:644
+#, c-format
+msgid "%s: error: label only with v1 swap area\n"
+msgstr "%s: fout: label enkel met v1 swapruimte\n"
+
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Zal niet proberen wisselgeheugen in te stellen op '%s'"
 
-#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fataal: eerste pagina onleesbaar"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1208,115 +1254,82 @@ msgstr ""
 "wisselgeheugen op dat apparaat wilt maken, kunt u de -f optie gebruiken\n"
 "om het te forceren.\n"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Instellen wisselgeheugen mislukt: onleesbaar"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Instellen wisselgeheugen versie %d, grootte = %llu kB\n"
 
-#: disk-utils/mkswap.c:623
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "terugwinden wisselapparaat mislukt"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "schrijven ondertekeningspagina mislukt"
 
-#: disk-utils/mkswap.c:634
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync mislukt"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Onjuist getal: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaxis fout: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Zo'n parameter bestaat niet: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] apparaat naam\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr "   %s [ -p ] apparaat grootte sect koppen sporen strekken gat ratio spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] apparaat\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] apparaat\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2053
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Onbruikbaar"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2055
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Vrije ruimte"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "De schijf is veranderd.\n"
 
-#: fdisk/cfdisk.c:408
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr "Start het systeem opnieuw op om er zeker van te zijn dat de partitietabel juist wordt bijgewerkt.\n"
+msgstr ""
+"Start het systeem opnieuw op om er zeker van te zijn dat de partitietabel "
+"juist wordt bijgewerkt.\n"
 
 #: fdisk/cfdisk.c:411
 #, c-format
@@ -1382,724 +1395,733 @@ msgstr "logische partities niet in schijfvolgorde"
 msgid "logical partitions overlap"
 msgstr "logische partities overlappen"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "vergrootte logische partities overlappen"
 
-#: fdisk/cfdisk.c:991
-msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr "!!!! Interne fout bij maken logische schijf zonder uitgebreide partitie !!!!"
+#: fdisk/cfdisk.c:993
+msgid ""
+"!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr ""
+"!!!! Interne fout bij maken logische schijf zonder uitgebreide partitie !!!!"
 
-#: fdisk/cfdisk.c:1002 fdisk/cfdisk.c:1014
-msgid "Cannot create logical drive here -- would create two extended partitions"
-msgstr "Kan hier geen logische schijf maken -- zou twee uitgebreide partities maken"
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
+msgstr ""
+"Kan hier geen logische schijf maken -- zou twee uitgebreide partities maken"
 
-#: fdisk/cfdisk.c:1162
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menu item te lang. Menu ziet er misschien raar uit."
 
-#: fdisk/cfdisk.c:1218
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu zonder richting. Gebruik standaard: horizontaal."
 
-#: fdisk/cfdisk.c:1349
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Onjuiste toets"
 
-#: fdisk/cfdisk.c:1372
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Druk op een toets om door te gaan"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:2024 fdisk/cfdisk.c:2556
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primair"
 
-#: fdisk/cfdisk.c:1419
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Een nieuwe primaire partitie maken"
 
-#: fdisk/cfdisk.c:1420 fdisk/cfdisk.c:2024 fdisk/cfdisk.c:2555
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logisch"
 
-#: fdisk/cfdisk.c:1420
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Een nieuwe logische partitie maken"
 
-#: fdisk/cfdisk.c:1421 fdisk/cfdisk.c:1476 fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: fdisk/cfdisk.c:1421 fdisk/cfdisk.c:1476
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Geen partitie maken"
 
-#: fdisk/cfdisk.c:1437
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Interne fout !!!"
 
-#: fdisk/cfdisk.c:1440
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Grootte (in MB): "
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Begin"
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Partitie toevoegen aan begin vrije ruimte"
 
-#: fdisk/cfdisk.c:1475
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Einde"
 
-#: fdisk/cfdisk.c:1475
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Partitie toevoegen aan einde vrije ruimte"
 
-#: fdisk/cfdisk.c:1493
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Geen ruimte om de uitgebreide partitie te maken"
 
-#: fdisk/cfdisk.c:1555
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Geen partitietabel.\n"
 
-#: fdisk/cfdisk.c:1559
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Geen partitietabel. Gestart met een lege tabel."
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Slechte handtekening op partitietabel"
 
-#: fdisk/cfdisk.c:1573
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Onbekend partitietabeltype"
 
-#: fdisk/cfdisk.c:1575
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Wilt u met een lege tabel beginnen [j/N] ?"
 
-#: fdisk/cfdisk.c:1623
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "U heeft meer cylinders aangegeven dan er op de schijf passen"
 
-#: fdisk/cfdisk.c:1655
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Kan schijf niet openen"
 
-#: fdisk/cfdisk.c:1657 fdisk/cfdisk.c:1837
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
-msgstr "Schijf alleen-lezen geopend -- u heeft geen toegangsrechten om te schrijven"
+msgstr ""
+"Schijf alleen-lezen geopend -- u heeft geen toegangsrechten om te schrijven"
 
-#: fdisk/cfdisk.c:1678
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Kan schijfgrootte niet opvragen"
 
-#: fdisk/cfdisk.c:1704
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/cfdisk.c:1734
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Slechte logische partitie"
 
-#: fdisk/cfdisk.c:1849
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Waarschuwing!!  Dit kan gegevens op uw schijf wissen!"
 
-#: fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr "Weet u zeker dat u de partitietabel naar de schijf wilt schrijven? (ja of nee): "
+msgstr ""
+"Weet u zeker dat u de partitietabel naar de schijf wilt schrijven? (ja of "
+"nee): "
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nee"
 
-#: fdisk/cfdisk.c:1860
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Partitietabel niet naar schijf geschreven"
 
-#: fdisk/cfdisk.c:1862
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Antwoord alstublieft `ja' of `nee'"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Schrijven partitietabel naar schijf..."
 
-#: fdisk/cfdisk.c:1894 fdisk/cfdisk.c:1898
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "De partitietabel is weggeschreven naar de schijf"
 
-#: fdisk/cfdisk.c:1896
-msgid "Wrote partition table, but re-read table failed.  Reboot to update table."
-msgstr "Partitietabel geschreven, maar opnieuw inlezen mislukt.  Start opnieuw op om de tabel bij te werken."
+#: fdisk/cfdisk.c:1904
+msgid ""
+"Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr ""
+"Partitietabel geschreven, maar opnieuw inlezen mislukt.  Start opnieuw op om "
+"de tabel bij te werken."
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr "Geen primaire partities aangegeven als opstartbaar. DOS MBR kan dit niet opstarten."
+msgstr ""
+"Geen primaire partities aangegeven als opstartbaar. DOS MBR kan dit niet "
+"opstarten."
 
-#: fdisk/cfdisk.c:1908
-msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr "Meer dan één primaire partitie is aangegeven als opstartbaar. DOS MBR kan dit niet opstarten."
+#: fdisk/cfdisk.c:1916
+msgid ""
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Meer dan één primaire partitie is aangegeven als opstartbaar. DOS MBR kan "
+"dit niet opstarten."
 
-#: fdisk/cfdisk.c:1966 fdisk/cfdisk.c:2085 fdisk/cfdisk.c:2169
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
-msgstr "Geef een bestandsnaam of druk op ENTER om op het scherm weer te geven: "
+msgstr ""
+"Geef een bestandsnaam of druk op ENTER om op het scherm weer te geven: "
 
-#: fdisk/cfdisk.c:1975 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan bestand '%s' niet openen"
 
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Schijf: %s\n"
 
-#: fdisk/cfdisk.c:1988
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:1995
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Geen   "
 
-#: fdisk/cfdisk.c:2017
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primair"
 
-#: fdisk/cfdisk.c:2021
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logisch"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2059 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:650
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: fdisk/cfdisk.c:2065 fdisk/cfdisk.c:2533 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Opstartbaar"
 
-#: fdisk/cfdisk.c:2067
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2069
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Geen"
 
-#: fdisk/cfdisk.c:2104 fdisk/cfdisk.c:2188
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitietabel voor %s\n"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Eerste      Laatste\n"
 
-#: fdisk/cfdisk.c:2107
-msgid " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) Flag\n"
-msgstr " # Soort      Sector      Sector   Plaats    Lengte   Bestandssysteem (ID) Optie\n"
+#: fdisk/cfdisk.c:2115
+msgid ""
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+msgstr ""
+" # Soort      Sector      Sector   Plaats    Lengte   Bestandssysteem (ID) "
+"Optie\n"
 
-#: fdisk/cfdisk.c:2108
-msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
-msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+#: fdisk/cfdisk.c:2116
+msgid ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2191
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Begin---         ----Einde----     Start     Aantal\n"
 
-#: fdisk/cfdisk.c:2192
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # OptiesKop  Sect Cyl   ID  Kop  Sect Cyl     Sector    Sectoren\n"
 
-#: fdisk/cfdisk.c:2193
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Ruw"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Deze tabel weergeven met ruwe gegevens formaat"
 
-#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sectoren"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Deze tabel weergeven, geordend op sectoren"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Gewoon de partitietabel weergeven"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Tabel niet weergeven"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Hulpscherm voor cfdisk"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dit is cfdisk, een schijfpartitioneringsprogramma gebaseerd op"
 
-#: fdisk/cfdisk.c:2260
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "cursus, waarmee u partities kunt maken, verwijderen of wijzigen"
 
-#: fdisk/cfdisk.c:2261
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "op uw harde schijf."
 
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2265
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Opdracht     Betekenis"
 
-#: fdisk/cfdisk.c:2266
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "--------     -------"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          `Opstartbaar'-optie voor huidige partitie aan/uitzetten"
 
-#: fdisk/cfdisk.c:2268
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Cylinders, koppen, sectoren-per-spoor wijzigen"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WAARSCHUWING: Deze optie dient alleen te worden gebruikt"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             door mensen die weten wat ze doen."
 
-#: fdisk/cfdisk.c:2272
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Dit scherm weergeven"
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Schijf gebruik maximaliseren voor huidige partitie"
 
-#: fdisk/cfdisk.c:2274
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Let op: Dit kan een partitie incompatibel maken met"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Nieuwe partitie maken van vrije ruimte"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Partitietabel weergeven op scherm of naar bestand"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Er zijn verschillende formaten voor de partitie"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             waaruit u kunt kiezen:"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr "                r - Ruwe gegevens (exact wat naar de schijf zou worden geschreven)"
+msgstr ""
+"                r - Ruwe gegevens (exact wat naar de schijf zou worden "
+"geschreven)"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel geordend op sectoren"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel in ruw formaat"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Soort bestandssysteem wijzigen"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Eenheden partitiegrootte weergave wijzigen"
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Roteert door MB, sectoren en cylinders"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr "  W          Partitietabel naar schijf wegschrijven (moet met hoofdletter)"
+msgstr ""
+"  W          Partitietabel naar schijf wegschrijven (moet met hoofdletter)"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Omdat dit mogelijk gegevens op de schijf wist, moet"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             u bevestigen of weigeren door te antwoorden met `ja' of"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `nee'"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pijl omhoog  Aanwijzer naar vorige partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pijl omlaag  Aanwijzer naar volgende partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Het scherm opnieuw tekenen"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Dit scherm weergeven"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Let op: Alle opdrachten kunnen zowel met hoofd- als kleine letter"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "worden ingevoerd (behalve W)."
 
-#: fdisk/cfdisk.c:2328 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylinders"
 
-#: fdisk/cfdisk.c:2328
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Cylinder geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2329 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Koppen"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Koppen geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Sector geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2331
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Klaar"
 
-#: fdisk/cfdisk.c:2331
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Klaar met wijzigen geometrie"
 
-#: fdisk/cfdisk.c:2344
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Geef het aantal cylinders: "
 
-#: fdisk/cfdisk.c:2355 fdisk/cfdisk.c:2926
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Onjuiste waarde cylinders"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Geef het aantal koppen: "
 
-#: fdisk/cfdisk.c:2368 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Onjuiste waarde koppen"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Geef het aantal sectoren per spoor: "
 
-#: fdisk/cfdisk.c:2381 fdisk/cfdisk.c:2943
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Onjuiste waarde sectoren"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Geef het soort bestandssysteem: "
 
-#: fdisk/cfdisk.c:2502
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Kan bestandsysteem soort niet veranderen tot leeg"
 
-#: fdisk/cfdisk.c:2504
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Kan bestandssysteem soort niet veranderen tot uitgebreid"
 
-#: fdisk/cfdisk.c:2535
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Onbekend(%02X)"
 
-#: fdisk/cfdisk.c:2538 fdisk/cfdisk.c:2541
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Onbekend (%02X)"
 
-#: fdisk/cfdisk.c:2633
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Schijf: %s"
 
-#: fdisk/cfdisk.c:2640
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Grootte: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Grootte: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2647
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Koppen: %d   Sectoren per spoor: %d   Cylinders: %lld"
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Naam"
 
-#: fdisk/cfdisk.c:2652
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Opties"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part soort"
 
-#: fdisk/cfdisk.c:2654
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Bestandssysteem"
 
-#: fdisk/cfdisk.c:2655
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Sectoren"
 
-#: fdisk/cfdisk.c:2659
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cylinders"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Grootte (MB)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Grootte (GB)"
 
-#: fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Opstartbaar"
 
-#: fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Huidige partitie wel/niet op opstartbaar zetten"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "De huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2719
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2719
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Schijf geometrie wijzigen (alleen experts)"
 
-#: fdisk/cfdisk.c:2720
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Hulp"
 
-#: fdisk/cfdisk.c:2720
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Hulpscherm weergeven"
 
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximaliseren"
 
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Schijfgebruik maximaliseren voor huidige partitie (alleen experts)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nieuw"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Nieuwe partitie maken van vrije ruimte"
 
-#: fdisk/cfdisk.c:2723
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Weergeven"
 
-#: fdisk/cfdisk.c:2723
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitietabel weergeven op scherm of naar een bestand"
 
-#: fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2725
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Soort"
 
-#: fdisk/cfdisk.c:2725
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Bestandssysteem soort wijzigen (DOS, Linux, OS/2 enz.)"
 
-#: fdisk/cfdisk.c:2726
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Eenheden"
 
-#: fdisk/cfdisk.c:2726
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "De gebruikte eenheden in weergave wijzigen (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Schrijven"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Partitietabel naar schijf schrijven (kan gegevens wissen)"
 
-#: fdisk/cfdisk.c:2773
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Kan deze partitie niet opstartbaar maken"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Kan geen lege partitie verwijderen"
 
-#: fdisk/cfdisk.c:2803 fdisk/cfdisk.c:2805
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Kan deze partitie niet maximaliseren"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Deze partitie is onbruikbaar"
 
-#: fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Deze partitie is al in gebruik"
 
-#: fdisk/cfdisk.c:2832
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan niet de soort van een lege partitie wijzigen"
 
-#: fdisk/cfdisk.c:2859 fdisk/cfdisk.c:2865
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Niet meer partities"
 
-#: fdisk/cfdisk.c:2872
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Onjuiste opdracht"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2889
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2129,12 +2151,372 @@ msgstr ""
 "\n"
 "Opties:\n"
 "-a: Pijl gebruiken in plaats van oplichting;\n"
-"-z: Start met een nul-partitietabel, in plaats van deze van schijf te lezen;\n"
+"-z: Start met een nul-partitietabel, in plaats van deze van schijf te "
+"lezen;\n"
 "-c C -h H -s S: Forceer andere waarden voor aantal cylinders, koppen en\n"
 "                sectoren/spoor dan de kernel geeft.\n"
 "\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdiskaixlabel.c:27
+msgid ""
+"\n"
+"\tThere is a valid AIX label on this disk.\n"
+"\tUnfortunately Linux cannot handle these\n"
+"\tdisks at the moment.  Nevertheless some\n"
+"\tadvice:\n"
+"\t1. fdisk will destroy its contents on write.\n"
+"\t2. Be sure that this disk is NOT a still vital\n"
+"\t   part of a volume group. (Otherwise you may\n"
+"\t   erase the other disks as well, if unmirrored.)\n"
+"\t3. Before deleting this physical volume be sure\n"
+"\t   to remove the disk logically from your AIX\n"
+"\t   machine.  (Otherwise you become an AIXpert)."
+msgstr ""
+"\n"
+"\tEr is een geldig AIX label op deze schijf. Helaas\n"
+"\tondersteunt Linux deze schijven op dit moment niet.\n"
+"\tToch wat advies:\n"
+"\t1. fdisk zal de inhoud wissen bij schrijven.\n"
+"\t2. Controleer of deze schijf ECHT NIET nog deel\n"
+"\t   uit maakt van een volume groep. (Anders wist\n"
+"\t   u mogelijk de andere schijven ook, als er\n"
+"\t   geen mirror is.)\n"
+"\t3. Haal, voordat u dit fysieke volume wist, de\n"
+"\t   schijf logisch uit uw AIX machine.\n"
+"\t   (Anders wordt u een AIXpert)."
+
+#: fdisk/fdiskbsdlabel.c:122
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+"\n"
+"BSD label voor apparaat: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
+msgid "Command action"
+msgstr "Opdracht actie"
+
+#: fdisk/fdiskbsdlabel.c:130
+msgid "   d   delete a BSD partition"
+msgstr "   d   een BSD partitie verwijderen"
+
+#: fdisk/fdiskbsdlabel.c:131
+msgid "   e   edit drive data"
+msgstr "   e   schijfgegevens bewerken"
+
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   i   install bootstrap"
+msgstr "   i   bootstrap installeren"
+
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   l   list known filesystem types"
+msgstr "   l   bekende bestandssysteem soorten opsommen"
+
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+msgid "   m   print this menu"
+msgstr "   m   dit menu weergeven"
+
+#: fdisk/fdiskbsdlabel.c:135
+msgid "   n   add a new BSD partition"
+msgstr "   n   een nieuwe BSD partitie toevoegen"
+
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   p   print BSD partition table"
+msgstr "   p   BSD partitietabel weergeven"
+
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
+msgid "   q   quit without saving changes"
+msgstr "   q   afsluiten zonder wijzigingen op te slaan"
+
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
+msgid "   r   return to main menu"
+msgstr "   r   terug naar hoofdmenu"
+
+#: fdisk/fdiskbsdlabel.c:139
+msgid "   s   show complete disklabel"
+msgstr "   s   complete schijflabel weergeven"
+
+#: fdisk/fdiskbsdlabel.c:140
+msgid "   t   change a partition's filesystem id"
+msgstr "   t   bestandssysteem id van partitie wijzigen"
+
+#: fdisk/fdiskbsdlabel.c:141
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   eenheden (cylinders/sectoren) wijzigen"
+
+#: fdisk/fdiskbsdlabel.c:142
+msgid "   w   write disklabel to disk"
+msgstr "   w   schijflabel naar schijf schrijven"
+
+#: fdisk/fdiskbsdlabel.c:144
+msgid "   x   link BSD partition to non-BSD partition"
+msgstr "   x   BSD partitie koppelen aan niet-BSD partitie"
+
+#: fdisk/fdiskbsdlabel.c:176
+#, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "Partitie %s heeft ongeldige startsector 0.\n"
+
+#: fdisk/fdiskbsdlabel.c:180
+#, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "Lezen schijflabel van %s bij sector %d.\n"
+
+#: fdisk/fdiskbsdlabel.c:190
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr "Er is geen *BSD partitie op %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:204
+msgid "BSD disklabel command (m for help): "
+msgstr "BSD schijflabel opdracht (m voor hulp): "
+
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
+#, c-format
+msgid "First %s"
+msgstr "Eerste %s"
+
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "Laatste %s of +size of +sizeM of +sizeK"
+
+#: fdisk/fdiskbsdlabel.c:318
+#, c-format
+msgid "type: %s\n"
+msgstr "soort: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:320
+#, c-format
+msgid "type: %d\n"
+msgstr "soort: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:321
+#, c-format
+msgid "disk: %.*s\n"
+msgstr "schijf: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:322
+#, c-format
+msgid "label: %.*s\n"
+msgstr "label: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:323
+#, c-format
+msgid "flags:"
+msgstr "opties:"
+
+#: fdisk/fdiskbsdlabel.c:325
+#, c-format
+msgid " removable"
+msgstr " verwijderbaar"
+
+#: fdisk/fdiskbsdlabel.c:327
+#, c-format
+msgid " ecc"
+msgstr " ecc"
+
+#: fdisk/fdiskbsdlabel.c:329
+#, c-format
+msgid " badsect"
+msgstr " slechte sector"
+
+#: fdisk/fdiskbsdlabel.c:333
+#, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "bytes/sector: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:334
+#, c-format
+msgid "sectors/track: %ld\n"
+msgstr "sectoren/spoor: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:335
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr "sporen/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:336
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr "sectoren/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:337
+#, c-format
+msgid "cylinders: %ld\n"
+msgstr "cylinders: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:338
+#, c-format
+msgid "rpm: %d\n"
+msgstr "rpm: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:339
+#, c-format
+msgid "interleave: %d\n"
+msgstr "tussenruimte: %d\n"
+
+# let op: komt vaker voor
+#: fdisk/fdiskbsdlabel.c:340
+#, c-format
+msgid "trackskew: %d\n"
+msgstr "trackskew: %d\n"
+
+# let op: komt vaker voor
+#: fdisk/fdiskbsdlabel.c:341
+#, c-format
+msgid "cylinderskew: %d\n"
+msgstr "cylinderskew: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:342
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr "schakelen kop: %ld\t\t# milliseconden\n"
+
+#: fdisk/fdiskbsdlabel.c:344
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr "spoor-tot-spoor zoeken: %ld\t# milliseconden\n"
+
+#: fdisk/fdiskbsdlabel.c:346
+#, c-format
+msgid "drivedata: "
+msgstr "schijfgegevens: "
+
+#: fdisk/fdiskbsdlabel.c:355
+#, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
+msgstr ""
+"\n"
+"%d partities:\n"
+
+#: fdisk/fdiskbsdlabel.c:356
+#, c-format
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr ""
+"#       start       eind     grootte  bestandssysteem [grootte bsize cpg]\n"
+
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
+#, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "Schrijven schijflabel naar %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr "%s bevat geen schijflabel.\n"
+
+#: fdisk/fdiskbsdlabel.c:427
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr "Wilt u een schijflabel maken? (j/n) "
+
+#: fdisk/fdiskbsdlabel.c:467
+msgid "bytes/sector"
+msgstr "bytes/sector"
+
+#: fdisk/fdiskbsdlabel.c:468
+msgid "sectors/track"
+msgstr "sectoren/spoor"
+
+#: fdisk/fdiskbsdlabel.c:469
+msgid "tracks/cylinder"
+msgstr "sporen/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
+msgid "cylinders"
+msgstr "cylinders"
+
+#: fdisk/fdiskbsdlabel.c:477
+msgid "sectors/cylinder"
+msgstr "sectoren/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:481
+#, c-format
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr "Moet zijn: <= sectoren/spoor * sporen/cylinder (standaard).\n"
+
+#: fdisk/fdiskbsdlabel.c:483
+msgid "rpm"
+msgstr "rpm"
+
+#: fdisk/fdiskbsdlabel.c:484
+msgid "interleave"
+msgstr "tussenruimte"
+
+#: fdisk/fdiskbsdlabel.c:485
+msgid "trackskew"
+msgstr "trackskew"
+
+#: fdisk/fdiskbsdlabel.c:486
+msgid "cylinderskew"
+msgstr "cylinderskew"
+
+#: fdisk/fdiskbsdlabel.c:487
+msgid "headswitch"
+msgstr "schakelen kop"
+
+#: fdisk/fdiskbsdlabel.c:488
+msgid "track-to-track seek"
+msgstr "spoor-tot-spoor zoeken"
+
+#: fdisk/fdiskbsdlabel.c:529
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr "Bootstrap: %sboot -> boot%s (%s): "
+
+#: fdisk/fdiskbsdlabel.c:554
+#, c-format
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Bootstrap overlapt met schijflabel!\n"
+
+#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Bootstrap geïnstalleerd op %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:599
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "Partitie (a-%c): "
+
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
+#, c-format
+msgid "The maximum number of partitions has been created\n"
+msgstr "Het maximum aantal partities is gemaakt\n"
+
+#: fdisk/fdiskbsdlabel.c:630
+#, c-format
+msgid "This partition already exists.\n"
+msgstr "Deze partitie bestaat al.\n"
+
+#: fdisk/fdiskbsdlabel.c:756
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr "Waarschuwing: teveel partities (%d, maximum is %d).\n"
+
+#: fdisk/fdiskbsdlabel.c:804
+#, c-format
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+"\n"
+"Synchroniseren schijven.\n"
+
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2146,7 +2528,8 @@ msgid ""
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
 "Gebruik: fdisk [-b SECTORGROOTTE] [-u] APPARAAT    Partitietabel wijzigen\n"
-"         fdisk -l [-b SECTORGROOTTE] [-u] APPARAAT Partitietabel(len) opsommen\n"
+"         fdisk -l [-b SECTORGROOTTE] [-u] APPARAAT Partitietabel(len) "
+"opsommen\n"
 "         fdisk -s PARTITIE            Partitiegrootte(s) in blokken geven\n"
 "         fdisk -v                     Versie fdisk weergeven\n"
 "Hier is DISK zoiets als /dev/hdb of /dev/sda en\n"
@@ -2154,7 +2537,7 @@ msgstr ""
 "-u: geef Start en Einde in sector (in plaats van cylinder) eenheden\n"
 "-b 2048: (voor sommige MO schijven) gebruik 2048-byte sectoren\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2170,227 +2553,184 @@ msgstr ""
 "   of: fdisk /dev/rd/c0d0  of: fdisk /dev/ida/c0d0  (voor RAID apparaten)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan %s niet openen\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan %s niet lezen\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan niet zoeken op %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan niet schrijven naar %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl mislukt op %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan niet meer geheugen reserveren\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fatale fout\n"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:367 fdisk/fdisk.c:374
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
-msgid "Command action"
-msgstr "Opdracht actie"
-
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   wel/niet alleen-lezen instellen"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd schijflabel bewerken"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   wel/niet aankoppelbaar instellen"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   een partitie verwijderen"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   bekende partitiesoorten opsommen"
 
-#. sun
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:368 fdisk/fdisk.c:380
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
-#: fdisk/fdiskbsdlabel.c:134
-msgid "   m   print this menu"
-msgstr "   m   dit menu weergeven"
-
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   een nieuwe partitie toevoegen"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   een nieuwe, lege DOS partitietabel maken"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   de partitietabel weergeven"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:370 fdisk/fdisk.c:384
-#: fdisk/fdisk.c:407 fdisk/fdisk.c:424 fdisk/fdisk.c:440 fdisk/fdisk.c:457
-#: fdisk/fdiskbsdlabel.c:137
-msgid "   q   quit without saving changes"
-msgstr "   q   afsluiten zonder wijzigingen op te slaan"
-
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   een nieuwe, lege Sun schijflabel maken"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   systeem id van partitie wijzigen"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   weergave/invoer eenheden wijzigen"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   de partitietabel controleren"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   tabel naar schijf schrijven en afsluiten"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   extra functionaliteit (alleen experts)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   opstarbare partitie selecteren"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   opstartbestand ingang bewerken"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi wisselpartitie selecteren"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   wel/niet opstartbaar instellen"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   wel/niet dos compatibel instellen"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   aantal alternatieve cylinders wijzigen"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   aantal cylinders wijzigen"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   ruwe gegevens in partitietabel weergeven"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   aantal extra sectoren per cylinder wijzigen"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   aantal koppen wijzigen"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   tussenruimte factor wijzigen"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   rotatiesnelheid wijzigen (rpm)"
 
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
-#: fdisk/fdiskbsdlabel.c:138
-msgid "   r   return to main menu"
-msgstr "   r   terug naar hoofdmenu"
-
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   aantal sectoren/spoor wijzigen"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   aantal fysieke cylinders wijzigen"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   begin gegevens verplaatsen in een partitie"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   uitgebreide partities opsommen"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   een IRIX (SGI) partitietabel maken"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   partitie volgorde repareren"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "U moet instellen:"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "koppen"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:936
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sectoren"
 
-#: fdisk/fdisk.c:591 fdisk/fdisk.c:1260 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:936
-msgid "cylinders"
-msgstr "cylinders"
-
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2399,11 +2739,11 @@ msgstr ""
 "%s%s.\n"
 "U kunt dit doen vanuit het menu met extra functies.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " en "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2422,12 +2762,12 @@ msgstr ""
 "2) opstart- en partitioneringssoftware van andere besturings-\n"
 "   systemen, zoals DOS FDISK en OS/2 FDISK\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Slechte plaats in primaire uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2436,17 +2776,17 @@ msgstr ""
 "Waarschuwing: partities na #%d worden weggelaten.\n"
 "Ze zullen worden verwijderd als u deze partitietabel bewaard.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Waarschuwing: extra koppelingsverwijzer in partitietabel %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Waarschuwing: extra gegevens in partitietabel %d worden genegeerd\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2459,17 +2799,17 @@ msgstr ""
 "dat moment is de vorige inhoud uiteraard niet meer herstelbaar.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Let op: sectorgrootte is %d (niet %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "U zult geen partitietabel kunnen wegschrijven.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2478,27 +2818,33 @@ msgstr ""
 "Deze schijf heeft zowel DOS als BSD identificatienummers.\n"
 "Geef de opdracht 'b' om naar BSD modus te gaan.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
-msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
 msgstr "Apparaat bevat geen geldige DOS, Sun, SGI of OSF schijflabel\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Interne fout\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Extra uitgebreide partitie %d wordt genegeerd\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
-msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
-msgstr "Waarschuwing: onjuiste optie 0x%04x van partitietabel %d zal worden gecorrigeerd bij schrijven\n"
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
+"(rite)\n"
+msgstr ""
+"Waarschuwing: onjuiste optie 0x%04x van partitietabel %d zal worden "
+"gecorrigeerd bij schrijven\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2507,83 +2853,83 @@ msgstr ""
 "\n"
 "driemaal EOF ontvangen - afsluiten..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Hex code (typ L om codes op te sommen): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standaard %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Standaardwaarde %u wordt gebruikt\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Waarde buiten bereik.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitienummer"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Waarschuwing: partitie %d heeft lege soortaanduiding\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Geselecteerde partitie %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Er zijn nog geen partities gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primaire partities zijn al gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Weergave/invoer eenheden worden veranderd naar %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WAARSCHUWING: Partitie %d is een uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS compatibaliteit is aan gezet\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS compatibaliteit is uit gezet\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitie %d bestaat nog niet!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2596,7 +2942,7 @@ msgstr ""
 "om partities te hebben van soort 0. U kunt een par-\n"
 "titie verwijderen met de `-d' opdracht.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2605,7 +2951,7 @@ msgstr ""
 "U kunt een partitie niet veranderen in een uitgebreide of andersom.\n"
 "Verwijder de partitie eerst.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2616,7 +2962,7 @@ msgstr ""
 "SunOS/Solaris het verwacht en zelfs Linux het liefst heeft.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -2627,52 +2973,53 @@ msgstr ""
 "partitie 11 als geheel volume (6) zoals IRIX het verwacht.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Systeemsoort van partitie %d veranderd naar %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
-msgstr "Partitie %d heeft verschillende fysieke/logische beginpunten (niet-Linux?):\n"
+msgstr ""
+"Partitie %d heeft verschillende fysieke/logische beginpunten (niet-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partitie %d heeft verschillende fysieke/logische eindpunten:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitie %i begint niet op de cylinder grens:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "moet zijn (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partitie %i eindigt niet op een cylinder grens.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "moet zijn (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -2681,7 +3028,7 @@ msgstr ""
 "\n"
 "Schijf %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -2690,17 +3037,17 @@ msgstr ""
 "\n"
 "Schijf %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d koppen, %d sectoren/spoor, %d cylinders"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", totaal %llu sectoren"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2709,7 +3056,7 @@ msgstr ""
 "Eenheden = %s van %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -2718,7 +3065,7 @@ msgstr ""
 "Niets te doen. De ordening is al goed.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -2729,16 +3076,16 @@ msgstr ""
 "Waarschijnlijk selecteerde u het verkeerde apparaat.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot      Start         Einde    Blokken  Id  Systeem\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Apparaat"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -2747,7 +3094,7 @@ msgstr ""
 "\n"
 "Partitietabel ingangen zijn niet in schijfvolgorde\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -2758,93 +3105,84 @@ msgstr ""
 "Schijf %s: %d koppen, %d sectoren, %d cylinders\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Grootte ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Waarschuwing: partitie %d bevat sector 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partitie %d: kop %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partitie %d: sector %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partities %d: cylinder %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partitie %d: vorige sectoren %d stemt niet overeen met totaal %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Waarschuwing: slechte start-van-gegevens in partitie %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Waarschuwing: partitie %d overlapt partitie %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Waarschuwing: partitie %d is leeg\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logische partitie %d niet geheel in partitie %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Totaal gereserveerde sectoren %d groter dan maximum %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld niet-gereserveerde sectoren\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr "Partitie %d is al gedefinieerd.  Verwijder haar alvorens haar opnieuw toe te voegen.\n"
-
-#: fdisk/fdisk.c:1945 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
-#, c-format
-msgid "First %s"
-msgstr "Eerste %s"
+msgstr ""
+"Partitie %d is al gedefinieerd.  Verwijder haar alvorens haar opnieuw toe te "
+"voegen.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sector %d is al gereserveerd\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Geen vrije sectoren beschikbaar\n"
 
-#: fdisk/fdisk.c:2005 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
-#, c-format
-msgid "Last %s or +size or +sizeM or +sizeK"
-msgstr "Laatste %s of +size of +sizeM of +sizeK"
-
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -2857,27 +3195,23 @@ msgstr ""
 "\tnieuwe, lege DOS partitietabel. (Gebruik o.)\n"
 "\tWAARSCHUWING: Dit zal de huidige schijfinhoud wissen.\n"
 
-#: fdisk/fdisk.c:2082 fdisk/fdiskbsdlabel.c:618
-#, c-format
-msgid "The maximum number of partitions has been created\n"
-msgstr "Het maximum aantal partities is gemaakt\n"
-
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr "U moet een partitie verwijderen en eerst een uitgebreide partitie toevoegen\n"
+msgstr ""
+"U moet een partitie verwijderen en eerst een uitgebreide partitie toevoegen\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Alle logische partities zijn in gebruik\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr " Een primaire partitie toevoegen\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -2888,20 +3222,20 @@ msgstr ""
 "   %s\n"
 "   p   primaire partitie (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logische (5 of hoger)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   uitgebreid"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Onjuist partitienummer voor soort `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -2910,12 +3244,12 @@ msgstr ""
 "De partitietabel is gewijzigd!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Aanroepen ioctl() om partitietabel opnieuw in te lezen.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -2928,7 +3262,7 @@ msgstr ""
 "De kernel gebruikt nog de oude tabel.\n"
 "De nieuwe tabel wordt na opnieuw opstarten gebruikt.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -2941,7 +3275,7 @@ msgstr ""
 "of gewijzigd, kunt u het best meer informatie opzoeken\n"
 "in het fdisk handboek.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -2950,81 +3284,85 @@ msgstr ""
 "\n"
 "Fout bij sluiten van bestand\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchroniseren schijven.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitie %d heeft geen gegevens-plaats\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nieuw begin van gegevens"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Expert opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Aantal cylinders"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Aantal koppen"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Aantal sectoren"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Waarschuwing: sector plaats wordt ingesteld voor DOS compatibaliteit\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Schijf %s bevat geen geldige partitietabel\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2454
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: onbekende opdracht\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Deze kernel vind de sectorgrootte zelf - -b optie genegeerd\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
-msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
-msgstr "Waarschuwing: de -b (sectorgrootte instellen) optie moet met één aangegeven apparaat worden gebruikt\n"
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"Waarschuwing: de -b (sectorgrootte instellen) optie moet met één aangegeven "
+"apparaat worden gebruikt\n"
 
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "OSF/1 schijflabel gevonden op %s, ga in schijflabel modus.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3033,16 +3371,16 @@ msgstr ""
 "\n"
 "Het huidige opstartbestand is: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Geef alstublieft de naam van het nieuwe opstartbestand: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Opstartbestand ongewijzigd\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3053,322 +3391,6 @@ msgstr ""
 "\tSorry, het experts menu is niet beschikbaar voor SGI partitietabellen.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:27
-msgid ""
-"\n"
-"\tThere is a valid AIX label on this disk.\n"
-"\tUnfortunately Linux cannot handle these\n"
-"\tdisks at the moment.  Nevertheless some\n"
-"\tadvice:\n"
-"\t1. fdisk will destroy its contents on write.\n"
-"\t2. Be sure that this disk is NOT a still vital\n"
-"\t   part of a volume group. (Otherwise you may\n"
-"\t   erase the other disks as well, if unmirrored.)\n"
-"\t3. Before deleting this physical volume be sure\n"
-"\t   to remove the disk logically from your AIX\n"
-"\t   machine.  (Otherwise you become an AIXpert)."
-msgstr ""
-"\n"
-"\tEr is een geldig AIX label op deze schijf. Helaas\n"
-"\tondersteunt Linux deze schijven op dit moment niet.\n"
-"\tToch wat advies:\n"
-"\t1. fdisk zal de inhoud wissen bij schrijven.\n"
-"\t2. Controleer of deze schijf ECHT NIET nog deel\n"
-"\t   uit maakt van een volume groep. (Anders wist\n"
-"\t   u mogelijk de andere schijven ook, als er\n"
-"\t   geen mirror is.)\n"
-"\t3. Haal, voordat u dit fysieke volume wist, de\n"
-"\t   schijf logisch uit uw AIX machine.\n"
-"\t   (Anders wordt u een AIXpert)."
-
-#: fdisk/fdiskbsdlabel.c:122
-#, c-format
-msgid ""
-"\n"
-"BSD label for device: %s\n"
-msgstr ""
-"\n"
-"BSD label voor apparaat: %s\n"
-
-#: fdisk/fdiskbsdlabel.c:130
-msgid "   d   delete a BSD partition"
-msgstr "   d   een BSD partitie verwijderen"
-
-#: fdisk/fdiskbsdlabel.c:131
-msgid "   e   edit drive data"
-msgstr "   e   schijfgegevens bewerken"
-
-#: fdisk/fdiskbsdlabel.c:132
-msgid "   i   install bootstrap"
-msgstr "   i   bootstrap installeren"
-
-#: fdisk/fdiskbsdlabel.c:133
-msgid "   l   list known filesystem types"
-msgstr "   l   bekende bestandssysteem soorten opsommen"
-
-#: fdisk/fdiskbsdlabel.c:135
-msgid "   n   add a new BSD partition"
-msgstr "   n   een nieuwe BSD partitie toevoegen"
-
-#: fdisk/fdiskbsdlabel.c:136
-msgid "   p   print BSD partition table"
-msgstr "   p   BSD partitietabel weergeven"
-
-#: fdisk/fdiskbsdlabel.c:139
-msgid "   s   show complete disklabel"
-msgstr "   s   complete schijflabel weergeven"
-
-#: fdisk/fdiskbsdlabel.c:140
-msgid "   t   change a partition's filesystem id"
-msgstr "   t   bestandssysteem id van partitie wijzigen"
-
-#: fdisk/fdiskbsdlabel.c:141
-msgid "   u   change units (cylinders/sectors)"
-msgstr "   u   eenheden (cylinders/sectoren) wijzigen"
-
-#: fdisk/fdiskbsdlabel.c:142
-msgid "   w   write disklabel to disk"
-msgstr "   w   schijflabel naar schijf schrijven"
-
-#: fdisk/fdiskbsdlabel.c:144
-msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x   BSD partitie koppelen aan niet-BSD partitie"
-
-#: fdisk/fdiskbsdlabel.c:176
-#, c-format
-msgid "Partition %s has invalid starting sector 0.\n"
-msgstr "Partitie %s heeft ongeldige startsector 0.\n"
-
-#: fdisk/fdiskbsdlabel.c:180
-#, c-format
-msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Lezen schijflabel van %s bij sector %d.\n"
-
-#: fdisk/fdiskbsdlabel.c:190
-#, c-format
-msgid "There is no *BSD partition on %s.\n"
-msgstr "Er is geen *BSD partitie op %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:204
-msgid "BSD disklabel command (m for help): "
-msgstr "BSD schijflabel opdracht (m voor hulp): "
-
-#: fdisk/fdiskbsdlabel.c:318
-#, c-format
-msgid "type: %s\n"
-msgstr "soort: %s\n"
-
-#: fdisk/fdiskbsdlabel.c:320
-#, c-format
-msgid "type: %d\n"
-msgstr "soort: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:321
-#, c-format
-msgid "disk: %.*s\n"
-msgstr "schijf: %.*s\n"
-
-#: fdisk/fdiskbsdlabel.c:322
-#, c-format
-msgid "label: %.*s\n"
-msgstr "label: %.*s\n"
-
-#: fdisk/fdiskbsdlabel.c:323
-#, c-format
-msgid "flags:"
-msgstr "opties:"
-
-#: fdisk/fdiskbsdlabel.c:325
-#, c-format
-msgid " removable"
-msgstr " verwijderbaar"
-
-#: fdisk/fdiskbsdlabel.c:327
-#, c-format
-msgid " ecc"
-msgstr " ecc"
-
-#: fdisk/fdiskbsdlabel.c:329
-#, c-format
-msgid " badsect"
-msgstr " slechte sector"
-
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:333
-#, c-format
-msgid "bytes/sector: %ld\n"
-msgstr "bytes/sector: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:334
-#, c-format
-msgid "sectors/track: %ld\n"
-msgstr "sectoren/spoor: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:335
-#, c-format
-msgid "tracks/cylinder: %ld\n"
-msgstr "sporen/cylinder: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:336
-#, c-format
-msgid "sectors/cylinder: %ld\n"
-msgstr "sectoren/cylinder: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:337
-#, c-format
-msgid "cylinders: %ld\n"
-msgstr "cylinders: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:338
-#, c-format
-msgid "rpm: %d\n"
-msgstr "rpm: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:339
-#, c-format
-msgid "interleave: %d\n"
-msgstr "tussenruimte: %d\n"
-
-# let op: komt vaker voor
-#: fdisk/fdiskbsdlabel.c:340
-#, c-format
-msgid "trackskew: %d\n"
-msgstr "trackskew: %d\n"
-
-# let op: komt vaker voor
-#: fdisk/fdiskbsdlabel.c:341
-#, c-format
-msgid "cylinderskew: %d\n"
-msgstr "cylinderskew: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:342
-#, c-format
-msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "schakelen kop: %ld\t\t# milliseconden\n"
-
-#: fdisk/fdiskbsdlabel.c:344
-#, c-format
-msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr "spoor-tot-spoor zoeken: %ld\t# milliseconden\n"
-
-#: fdisk/fdiskbsdlabel.c:346
-#, c-format
-msgid "drivedata: "
-msgstr "schijfgegevens: "
-
-#: fdisk/fdiskbsdlabel.c:355
-#, c-format
-msgid ""
-"\n"
-"%d partitions:\n"
-msgstr ""
-"\n"
-"%d partities:\n"
-
-#: fdisk/fdiskbsdlabel.c:356
-#, c-format
-msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "#       start       eind     grootte  bestandssysteem [grootte bsize cpg]\n"
-
-#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
-#, c-format
-msgid "Writing disklabel to %s.\n"
-msgstr "Schrijven schijflabel naar %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
-#, c-format
-msgid "%s contains no disklabel.\n"
-msgstr "%s bevat geen schijflabel.\n"
-
-#: fdisk/fdiskbsdlabel.c:427
-msgid "Do you want to create a disklabel? (y/n) "
-msgstr "Wilt u een schijflabel maken? (j/n) "
-
-#: fdisk/fdiskbsdlabel.c:467
-msgid "bytes/sector"
-msgstr "bytes/sector"
-
-#: fdisk/fdiskbsdlabel.c:468
-msgid "sectors/track"
-msgstr "sectoren/spoor"
-
-#: fdisk/fdiskbsdlabel.c:469
-msgid "tracks/cylinder"
-msgstr "sporen/cylinder"
-
-#: fdisk/fdiskbsdlabel.c:477
-msgid "sectors/cylinder"
-msgstr "sectoren/cylinder"
-
-#: fdisk/fdiskbsdlabel.c:481
-#, c-format
-msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
-msgstr "Moet zijn: <= sectoren/spoor * sporen/cylinder (standaard).\n"
-
-#: fdisk/fdiskbsdlabel.c:483
-msgid "rpm"
-msgstr "rpm"
-
-#: fdisk/fdiskbsdlabel.c:484
-msgid "interleave"
-msgstr "tussenruimte"
-
-#: fdisk/fdiskbsdlabel.c:485
-msgid "trackskew"
-msgstr "trackskew"
-
-#: fdisk/fdiskbsdlabel.c:486
-msgid "cylinderskew"
-msgstr "cylinderskew"
-
-#: fdisk/fdiskbsdlabel.c:487
-msgid "headswitch"
-msgstr "schakelen kop"
-
-#: fdisk/fdiskbsdlabel.c:488
-msgid "track-to-track seek"
-msgstr "spoor-tot-spoor zoeken"
-
-#: fdisk/fdiskbsdlabel.c:529
-#, c-format
-msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr "Bootstrap: %sboot -> boot%s (%s): "
-
-#: fdisk/fdiskbsdlabel.c:554
-#, c-format
-msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Bootstrap overlapt met schijflabel!\n"
-
-#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
-#, c-format
-msgid "Bootstrap installed on %s.\n"
-msgstr "Bootstrap geïnstalleerd op %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:599
-#, c-format
-msgid "Partition (a-%c): "
-msgstr "Partitie (a-%c): "
-
-#: fdisk/fdiskbsdlabel.c:630
-#, c-format
-msgid "This partition already exists.\n"
-msgstr "Deze partitie bestaat al.\n"
-
-#: fdisk/fdiskbsdlabel.c:756
-#, c-format
-msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Waarschuwing: teveel partities (%d, maximum is %d).\n"
-
-#: fdisk/fdiskbsdlabel.c:804
-#, c-format
-msgid ""
-"\n"
-"Syncing disks.\n"
-msgstr ""
-"\n"
-"Synchroniseren schijven.\n"
-
 #: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
@@ -3425,15 +3447,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux wisselgeheugen"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux eigen systeem"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3443,8 +3465,12 @@ msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:163
 #, c-format
-msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
-msgstr "Volgens MIPS Computer Systems, Inc mag het Label niet meer dan 512 bytes bevatten\n"
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+"Volgens MIPS Computer Systems, Inc mag het Label niet meer dan 512 bytes "
+"bevatten\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
@@ -3565,7 +3591,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Er is meer dan één schijfingang aanwezig.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Geen partities gedefinieerd\n"
@@ -3650,7 +3676,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tU heeft een ongebruikelijke naam gekozen voor het opstartbestand.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3670,11 +3695,10 @@ msgstr ""
 "Alleen het gehele schijf deel \"SGI volume\" mag dit overtreden.\n"
 "Typ JA als u zeker wilt dat u deze partitie anders wilt noemen.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "JA\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3730,7 +3754,8 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:728
 #, c-format
 msgid ""
-"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
+"d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
 "Waarschuwing:  BLKGETSIZE ioctl mislukt op %s.  Nu wordt cylinder geometrie\n"
@@ -3747,44 +3772,43 @@ msgstr "Proberen om parameters te houden van partitie %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tLENGTE=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Leeg"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS wisselgeheugen"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Gehele schijf"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid auto-detectie"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3797,12 +3821,12 @@ msgstr ""
 "zoals koppen, sectoren, cylinders en partities, of\n"
 "een verse label moeten forceren (s opdracht in hoofdmenu)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Auto-instellen heeft een %s%s%s gevonden\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3815,7 +3839,7 @@ msgstr ""
 "inhoud uiteraard definitief verloren zijn.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3825,72 +3849,72 @@ msgstr ""
 "   ?   auto-instellen\n"
 "   0   aangepast (met gevonden hardware standaardinstellingen)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Selecteer soort (? voor automatisch, 0 voor aangepast): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Auto-instellen mislukt.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sectoren/spoor"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Afwisselende cylinders"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fysieke cylinders"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Rotatiesnelheid (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Tussenruimte factor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Extra sectoren per cylinder"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "U kunt alle schijfparameters wijzigen vanuit het x menu"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" diskette"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux aangepast"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partitie %d eindigt niet op een cylinder grens\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partitie %d overlapt met andere in sectoren %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Ongebruikt gat - sectoren 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ongebruikt gat - sectoren %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3899,7 +3923,7 @@ msgstr ""
 "Andere partities beslaan al de gehele schijf.\n"
 "Verwijder/verklein ze alvorens het opnieuw te proberen.\n"
 
-#: fdisk/fdisksunlabel.c:589
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3910,7 +3934,7 @@ msgstr ""
 "waarde %d %s bedekt al een andere partitie. Uw invoer is gewijzigd\n"
 "tot %d %s\n"
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3919,7 +3943,7 @@ msgstr ""
 "Als u SunOS/Solaris compatibiliteit wilt houden, kunt u deze partitie beter\n"
 "als gehele schijf (5) laten, startend bij 0, met %u sectoren\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3934,7 +3958,7 @@ msgstr ""
 "Typ JA als u erg zeker bent dat u die partitie van soort 82\n"
 "(Linux wisselgeheugen) wilt laten zijn: "
 
-#: fdisk/fdisksunlabel.c:654
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3953,7 +3977,7 @@ msgstr ""
 "Eenheden = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:668
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -3966,16 +3990,16 @@ msgstr ""
 "Eenheden = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Optie   Start       Eind   Blokken  Id  Systeem\n"
 
-#: fdisk/fdisksunlabel.c:698
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Aantal alternatieve cylinders"
 
-#: fdisk/fdisksunlabel.c:731
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Aantal fysieke cylinders"
 
@@ -3999,32 +4023,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Uitgebreid"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX opstartbaar"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4033,7 +4051,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4126,12 +4143,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4152,8 +4167,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4163,7 +4176,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD of SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4184,12 +4196,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Oude Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / oude Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux-swap / Solaris"
@@ -4218,12 +4228,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4232,7 +4240,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4297,30 +4304,22 @@ msgstr "Niet-bestandssysteem gegevens"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS"
@@ -4329,116 +4328,109 @@ msgstr "BeOS"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC opstart"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secundair"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "zoekfout op %s - kan niet zoeken naar %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "zoekfout: verwacht 0x%08x%08x, gekregen 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "geheugentekort - opgeven\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "leesfout op %s - kan sector %lu niet lezen\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FOUT: sector %lu heeft geen msdos ondertekening\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "schrijffout op %s - kan sector %lu niet schrijven\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kan bestand over sectoren van partitie (%s) niet openen\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "schrijffout op %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kan partitie herstelbestand niet vinden (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitie herstelbestand heeft onjuiste grootte - niet herstellen\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "geheugentekort?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan partitie herstelbestand (%s) niet openen\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "fout bij lezen %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan apparaat %s niet openen voor schrijven\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fout bij schrijven sector %lu op %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Schijf %s: kan geometrie niet opvragen\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Schijf %s: kan grootte niet opvragen\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4450,22 +4442,22 @@ msgstr ""
 "waarschijnlijk zinloos.\n"
 "[Gebruik de --force optie als u dit echt wilt doen]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Waarschuwing: HDIO_GETGEO zegt dat er %lu koppen zijn\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Waarschuwing: HDIO_GETGEO zegt dat er %lu sectoren zijn\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Waarschuwing: BLKGETSIZE/HDIO_GETGEO zegt dat er %lu cylinders zijn\n"
 
-#: fdisk/sfdisk.c:521
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4474,7 +4466,7 @@ msgstr ""
 "Waarschuwing: onwaarschijnlijk aantal sectoren (%lu) - meestal hoogstens 63\n"
 "Dit zal problemen geven met alle software die C/H/S adressering gebruikt.\n"
 
-#: fdisk/sfdisk.c:525
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4483,22 +4475,33 @@ msgstr ""
 "\n"
 "Schijf %s: %lu cylinders, %lu koppen, %lu sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:607
+#: fdisk/sfdisk.c:606
 #, c-format
-msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr "%s van partitie %s heeft een onmogelijke waarde voor kop: %lu (moet zijn tussen 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr ""
+"%s van partitie %s heeft een onmogelijke waarde voor kop: %lu (moet zijn "
+"tussen 0-%lu)\n"
 
-#: fdisk/sfdisk.c:612
+#: fdisk/sfdisk.c:611
 #, c-format
-msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
-msgstr "%s van partitie %s heeft onmogelijke waarde voor sector: %lu (moet zijn tussen 1-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
+"lu)\n"
+msgstr ""
+"%s van partitie %s heeft onmogelijke waarde voor sector: %lu (moet zijn "
+"tussen 1-%lu)\n"
 
-#: fdisk/sfdisk.c:617
+#: fdisk/sfdisk.c:616
 #, c-format
-msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
-msgstr "%s van partitie %s heeft onmogelijke waarde voor cylinders: %lu (moet zijn tussen 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
+"lu)\n"
+msgstr ""
+"%s van partitie %s heeft onmogelijke waarde voor cylinders: %lu (moet zijn "
+"tussen 0-%lu)\n"
 
-#: fdisk/sfdisk.c:657
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4507,12 +4510,12 @@ msgstr ""
 "Id  Naam\n"
 "\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Opnieuw inlezen partitietabel ...\n"
 
-#: fdisk/sfdisk.c:819
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4520,45 +4523,46 @@ msgstr ""
 "Het opnieuw lezen van de partitietabel is mislukt\n"
 "Herstart het systeem nu, vóór mkfs te gebruiken\n"
 
-#: fdisk/sfdisk.c:824
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fout bij sluiten %s\n"
 
-#: fdisk/sfdisk.c:862
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: die partitie bestaat niet\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "onbekend formaat - nu sectoren worden gebruikt\n"
 
-#: fdisk/sfdisk.c:924
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitietabel van %s\n"
 
-#: fdisk/sfdisk.c:935
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "niet-geïmplementeerd formaat - nu wordt %s gebruikt\n"
 
-#: fdisk/sfdisk.c:939
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Eenheden = cylinders van %lu bytes, blokken van 1024 bytes, te tellen vanaf %d\n"
+"Eenheden = cylinders van %lu bytes, blokken van 1024 bytes, te tellen vanaf %"
+"d\n"
 "\n"
 
-#: fdisk/sfdisk.c:942
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   ApparaatOpstart Start Eind  #cyls    #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:947
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4567,12 +4571,12 @@ msgstr ""
 "Eenheden = sectoren van 512 bytes, te tellen vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:949
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Apparaat Opstart Start     Eind  #sectoren Id  Systeem\n"
 
-#: fdisk/sfdisk.c:952
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4581,45 +4585,46 @@ msgstr ""
 "Eenheden = blokken van 1024 bytes, te tellen vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:954
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Apparaat Opstart Start    Eind   #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Eenheden = mebibytes van 1048576 bytes, blokken van 1024 bytes, te tellen vanaf %d\n"
+"Eenheden = mebibytes van 1048576 bytes, blokken van 1024 bytes, te tellen "
+"vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:959
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Apparaat Opstart Start Eind MiB   #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:1119
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tstart: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1126
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\teind: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitie eindigt op cylinder %ld, na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1139
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Geen partities gevonden\n"
 
-#: fdisk/sfdisk.c:1143
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4630,51 +4635,52 @@ msgstr ""
 "  is voor C/H/S=*/%ld/%ld (in plaats van %ld/%ld/%ld).\n"
 "Voor deze opsomming neem ik die geometrie aan.\n"
 
-#: fdisk/sfdisk.c:1192
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "geen partitietabel aanwezig.\n"
 
-#: fdisk/sfdisk.c:1194
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "vreemd, slechts %d partities gedefinieerd.\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr "Waarschuwing: partitie %s heeft grootte 0, maar is niet aangegeven als Leeg\n"
+msgstr ""
+"Waarschuwing: partitie %s heeft grootte 0, maar is niet aangegeven als Leeg\n"
 
-#: fdisk/sfdisk.c:1206
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Waarschuwing: partitie %s heeft grootte 0 en is opstartbaar\n"
 
-#: fdisk/sfdisk.c:1209
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Waarschuwing: partitie %s heeft grootte 0 en een niet-nul start\n"
 
-#: fdisk/sfdisk.c:1220
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Waarschuwing: partitie %s "
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "valt niet binnen partitie %s\n"
 
-#: fdisk/sfdisk.c:1232
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Waarschuwing: partities %s "
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "en %s overlappen\n"
 
-#: fdisk/sfdisk.c:1244
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4683,17 +4689,17 @@ msgstr ""
 "Waarschuwing: partitie %s bevat een deel van de partitietabel (sector %lu),\n"
 "en zal die vernielen als zij wordt gevuld\n"
 
-#: fdisk/sfdisk.c:1256
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Waarschuwing: partitie %s start op sector 0\n"
 
-#: fdisk/sfdisk.c:1260
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Waarschuwing: partitie %s loopt tot na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4701,25 +4707,27 @@ msgstr ""
 "Van de primaire partities kan er ten hoogste één uitgebreid\n"
 "zijn (hoewel dit geen probleem is onder Linux)\n"
 
-#: fdisk/sfdisk.c:1293
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Waarschuwing: partitie %s start niet op een cylinder grens\n"
 
-#: fdisk/sfdisk.c:1299
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Waarschuwing: partitie %s eindigt niet op een cylinder grens\n"
 
-#: fdisk/sfdisk.c:1317
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Waarschuwing: meerdere primaire partities zijn aangegeven als opstartbaar (actief)\n"
-"Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf opstarten.\n"
+"Waarschuwing: meerdere primaire partities zijn aangegeven als opstartbaar "
+"(actief)\n"
+"Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
+"opstarten.\n"
 
-#: fdisk/sfdisk.c:1324
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4727,38 +4735,43 @@ msgstr ""
 "Waarschuwing: normaal gesproken kan men alleen van primaire\n"
 "partities opstarten. LILO negeert de `opstartbaar' optie.\n"
 
-#: fdisk/sfdisk.c:1330
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Waarschuwing: er is geen primaire partitie aangegeven als opstartbaar (actief)\n"
-"Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf opstarten.\n"
+"Waarschuwing: er is geen primaire partitie aangegeven als opstartbaar "
+"(actief)\n"
+"Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
+"opstarten.\n"
 
-#: fdisk/sfdisk.c:1344
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "start"
 
-#: fdisk/sfdisk.c:1347
+#: fdisk/sfdisk.c:1346
 #, c-format
-msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "partitie %s: start: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"partitie %s: start: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1353
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "eind"
 
-#: fdisk/sfdisk.c:1356
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "partitie %s: eind: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
+msgstr ""
+"partitie %s: eind: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1359
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitie %s eindigt op cylinder %ld, na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1384
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4767,7 +4780,7 @@ msgstr ""
 "Waarschuwing: start van uitgebreide partitie verschoven van %ld naar %ld\n"
 "(Alleen voor weergave. De inhoud wordt niet gewijzigd.)\n"
 
-#: fdisk/sfdisk.c:1390
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4775,227 +4788,246 @@ msgstr ""
 "Waarschuwing: uitgebreide partitie start niet op een cylinder grens.\n"
 "DOS en Linux zullen de inhoud anders interpreteren.\n"
 
-#: fdisk/sfdisk.c:1408 fdisk/sfdisk.c:1485
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "teveel partities - die na nr (%d) worden genegeerd\n"
 
-#: fdisk/sfdisk.c:1423
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "boom van partities?\n"
 
-#: fdisk/sfdisk.c:1544
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager gevonden - daar kan ik niet mee werken\n"
 
-#: fdisk/sfdisk.c:1551
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 ondertekening gevonden - ik geef het op\n"
 
-#: fdisk/sfdisk.c:1571
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "vreemd..., een uitgebreide partitie met grootte 0?\n"
 
-#: fdisk/sfdisk.c:1578 fdisk/sfdisk.c:1589
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "vreemd..., een BSD partitie met grootte 0?\n"
 
-#: fdisk/sfdisk.c:1623
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "%s: onbekend partitietabeltype\n"
 
-#: fdisk/sfdisk.c:1635
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n optie is gegeven: Niets gewijzigd\n"
 
-#: fdisk/sfdisk.c:1651
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Opslaan oude sectoren mislukt - afbreken\n"
 
-#: fdisk/sfdisk.c:1656
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Partitie schrijven op %s mislukt\n"
 
-#: fdisk/sfdisk.c:1733
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "lange of incomplete invoerregel - afsluiten\n"
 
-#: fdisk/sfdisk.c:1769
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "invoerfout: `=' verwacht na %s veld\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "invoerfout: onverwacht teken %c na %s veld\n"
 
-#: fdisk/sfdisk.c:1782
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "invoer niet herkend: %s\n"
 
-#: fdisk/sfdisk.c:1824
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "getal te groot\n"
 
-#: fdisk/sfdisk.c:1828
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "rotzooi na getal\n"
 
-#: fdisk/sfdisk.c:1951
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "geen ruimte voor partitie beschrijver\n"
 
-#: fdisk/sfdisk.c:1984
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan omgevende uitgebreide partitie niet maken\n"
 
-#: fdisk/sfdisk.c:2035
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "teveel invoervelden\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2069
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Geen ruimte voor meer\n"
 
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Onjuiste soort\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "Waarschuwing: gegeven groote (%lu) is groter dan maximaal toegelaten grootte (%lu)\n"
+msgstr ""
+"Waarschuwing: gegeven groote (%lu) is groter dan maximaal toegelaten grootte "
+"(%lu)\n"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Waarschuwing: lege partitie\n"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Waarschuwing: slechte partitie start (eerste %lu)\n"
 
-#: fdisk/sfdisk.c:2153
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "opstartbaar optie niet herkend - kies - of *\n"
 
-#: fdisk/sfdisk.c:2170 fdisk/sfdisk.c:2183
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "gedeeltelijke c,h,s specificatie?\n"
 
-#: fdisk/sfdisk.c:2194
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Uitgebreide partitie niet waar die verwacht was\n"
 
-#: fdisk/sfdisk.c:2226
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "slechte invoer\n"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "teveel partities\n"
 
-#: fdisk/sfdisk.c:2281
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
-"Invoer in het volgende formaat; afwezige velden krijgen een standaardwaarde.\n"
+"Invoer in het volgende formaat; afwezige velden krijgen een "
+"standaardwaarde.\n"
 "<start> <grootte> <soort [E,S,L,X,hex]> <opstartbaar [-,*]> <c,h,s> <c,h,s>\n"
-"Meestal hoeft u alleen <start> en <grootte> te gebruiken (en mogelijk <soort>).\n"
+"Meestal hoeft u alleen <start> en <grootte> te gebruiken (en mogelijk "
+"<soort>).\n"
 
-#: fdisk/sfdisk.c:2303
-msgid "version"
-msgstr "versie"
-
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Gebruik: %s [opties] apparaat ...\n"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "apparaat: zoiets als /dev/hda of /dev/sda"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "nuttige opties:"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [of --show-size]: grootte van een partitie weergeven"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [of --id]:        partitie Id weergeven of wijzigen"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [of --list]:      partities van elk apparaat opsommen"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr "    -d [of --dump]:      hetzelfde, maar in een formaat geschikt voor latere invoer"
+msgstr ""
+"    -d [of --dump]:      hetzelfde, maar in een formaat geschikt voor latere "
+"invoer"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [of --increment]: aantal cylinders etc. van 1 in plaats van 0"
 
-#: fdisk/sfdisk.c:2317
-msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
-msgstr "    -uS, -uB, -uC, -uM:  accepteren/weergeven in eenheden van sectoren/blokken/cylinders/MB"
+#: fdisk/sfdisk.c:2314
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
+"MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:  accepteren/weergeven in eenheden van sectoren/"
+"blokken/cylinders/MB"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [of --list-types]:bekende partitiesoorten opsommen"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
-msgstr "    -D [of --DOS]:       voor DOS-compatibiliteit: verspil een beetje ruimte"
+msgstr ""
+"    -D [of --DOS]:       voor DOS-compatibiliteit: verspil een beetje ruimte"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr "    -R [of --re-read]:   laat de kernel de partitietabel opnieuw inlezen"
+msgstr ""
+"    -R [of --re-read]:   laat de kernel de partitietabel opnieuw inlezen"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                alleen partitie met nummer # wijzigen"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 niet echt naar de schijf schrijven"
 
-#: fdisk/sfdisk.c:2323
-msgid "    -O file :            save the sectors that will be overwritten to file"
-msgstr "    -O bestand :         de sectoren die overschreven zullen worden, opslaan in bestand"
+#: fdisk/sfdisk.c:2320
+msgid ""
+"    -O file :            save the sectors that will be overwritten to file"
+msgstr ""
+"    -O bestand :         de sectoren die overschreven zullen worden, opslaan "
+"in bestand"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I bestand :         deze sectoren weer herstellen"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [of --version]:   versienummer weergeven"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [of --help]:      dit bericht weergeven"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "gevaarlijke opties:"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
-msgstr "    -g [of --show-geometry]: weergeven hoe de kernel denkt over de geometrie"
+msgstr ""
+"    -g [of --show-geometry]: weergeven hoe de kernel denkt over de geometrie"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2326
+msgid ""
+"    -G [or --show-pt-geometry]: print geometry guessed from the partition "
+"table"
+msgstr ""
+"    -G [of --show-pt-geometry]: weergeven hoe de kernel via de partitietabel "
+"denkt over de geometrie"
+
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5003,113 +5035,117 @@ msgstr ""
 "    -x [of --show-extended]: ook uitgebreide partities opnemen in uitvoer\n"
 "                             of, verwacht beschrijvers voor ze in invoer"
 
-#: fdisk/sfdisk.c:2331
-msgid "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
-msgstr "    -L  [of --Linux]:      niet klagen over dingen die niet relevant zijn voor Linux"
+#: fdisk/sfdisk.c:2329
+msgid ""
+"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgstr ""
+"    -L  [of --Linux]:      niet klagen over dingen die niet relevant zijn "
+"voor Linux"
 
-#: fdisk/sfdisk.c:2332
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [of --quiet]:      waarschuwingen onderdrukken"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    U kunt zo een andere geometrie dan de gevonden forceren:"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [of --cylinders #]:het aantal te gebruiken cylinders instellen"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [of --heads #]:    het aantal te gebruiken koppen instellen"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [of --sectors #]:  het aantal te gebruiken sectoren instellen"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "U kunt alle consistentie controles uit zetten met:"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [of --force]:      doe wat ik zeg, ook al is het dom"
 
-#: fdisk/sfdisk.c:2344
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: fdisk/sfdisk.c:2345
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s apparaat\t\t actieve partities op apparaat weergeven\n"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr "%s apparaat n1 n2 ... partities n1 ... activeren, de rest de-activeren\n"
+msgstr ""
+"%s apparaat n1 n2 ... partities n1 ... activeren, de rest de-activeren\n"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An apparaat\t partitie n activeren, alle andere de-activeren\n"
 
-#: fdisk/sfdisk.c:2511
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "geen opdracht?\n"
 
-#: fdisk/sfdisk.c:2629
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totaal: %llu blokken\n"
 
-#: fdisk/sfdisk.c:2666
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "gebruik: sfdisk --print-id apparaat partitie-nummer\n"
 
-#: fdisk/sfdisk.c:2668
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "gebruik: sfdisk --change-id apparaat partitie-nummer Id\n"
 
-#: fdisk/sfdisk.c:2670
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "gebruik: sfdisk --id apparaat partitie-nummer [Id]\n"
 
-#: fdisk/sfdisk.c:2677
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "kan slechts één apparaat aangeven (behalve met -l of -s)\n"
 
-#: fdisk/sfdisk.c:2703
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan %s niet lezen-schrijven openen\n"
 
-#: fdisk/sfdisk.c:2705
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan %s niet openen om te lezen\n"
 
-#: fdisk/sfdisk.c:2730
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2747
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylinders, %ld koppen, %ld sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:2764
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan grootte van %s niet opvragen\n"
 
-#: fdisk/sfdisk.c:2842
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "slechte actieve byte: 0x%x in plaats van 0x80\n"
 
-#: fdisk/sfdisk.c:2860 fdisk/sfdisk.c:2913 fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5117,7 +5153,7 @@ msgstr ""
 "Klaar\n"
 "\n"
 
-#: fdisk/sfdisk.c:2869
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5126,35 +5162,35 @@ msgstr ""
 "U heeft %d actieve, primaire partities. Dit maakt niets uit voor LILO,\n"
 "maar DOS MBR start alleen op van een schijf met 1 actieve partitie.\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partitie %s heeft id %x en is niet verborgen\n"
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Slechte Id %lx\n"
 
-#: fdisk/sfdisk.c:2955
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Deze schijf is op dit moment in gebruik.\n"
 
-#: fdisk/sfdisk.c:2972
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatale fout: kan %s niet vinden\n"
 
-#: fdisk/sfdisk.c:2975
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Waarschuwing: %s is geen blok-apparaat\n"
 
-#: fdisk/sfdisk.c:2981
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Even controleren of niemand deze schijf nu gebruikt ...\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5162,34 +5198,36 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Deze schijf wordt nu gebruikt - herpartitioneren is waarschijnlijk een slecht idee.\n"
-"Ontkoppel alle bestandssystemen, en schakel alle wisselgeheugen partities op deze schijf uit.\n"
+"Deze schijf wordt nu gebruikt - herpartitioneren is waarschijnlijk een "
+"slecht idee.\n"
+"Ontkoppel alle bestandssystemen, en schakel alle wisselgeheugen partities op "
+"deze schijf uit.\n"
 "Gebruik --no-reread om deze controle te onderdrukken.\n"
 
-#: fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Gebruik --force om alle controles te negeren.\n"
 
-#: fdisk/sfdisk.c:2991
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3000
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Oude situatie:\n"
 
-#: fdisk/sfdisk.c:3004
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partitie %d bestaat niet, kan haar niet veranderen!\n"
 
-#: fdisk/sfdisk.c:3012
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nieuwe situatie:\n"
 
-#: fdisk/sfdisk.c:3017
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5197,21 +5235,21 @@ msgstr ""
 "Deze partities bevallen mij niet echt - er is niets veranderd.\n"
 "(Als u dit echt wilt, kunt u --force gebruiken.)\n"
 
-#: fdisk/sfdisk.c:3020
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Mij bevalt niet niet echt - misschien moet u Nee antwoorden\n"
 
-#: fdisk/sfdisk.c:3025
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bent u hiermee tevreden? [ynq] "
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Wilt u dit naar de schijf schrijven? [ynq] "
 
-#: fdisk/sfdisk.c:3032
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5220,16 +5258,16 @@ msgstr ""
 "\n"
 "sfdisk: vroegtijdig einde van invoer\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Afsluiten - niets veranderd\n"
 
-#: fdisk/sfdisk.c:3040
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Antwoord alstublieft een van y,n,q\n"
 
-#: fdisk/sfdisk.c:3048
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5238,14 +5276,16 @@ msgstr ""
 "Nieuwe partitietabel succesvol weggeschreven\n"
 "\n"
 
-#: fdisk/sfdisk.c:3054
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Als u een DOS partitie gemaakt of gewijzigd heeft, zeg /dev/foo7, gebruiken dan dd(1)\n"
-"om de eerste 512 bytes op nul te zetten:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"Als u een DOS partitie gemaakt of gewijzigd heeft, zeg /dev/foo7, gebruiken "
+"dan dd(1)\n"
+"om de eerste 512 bytes op nul te zetten:  dd if=/dev/zero of=/dev/foo7 "
+"bs=512 count=1\n"
 "(Zie fdisk(8).)\n"
 
 #: getopt/getopt.c:233
@@ -5277,28 +5317,38 @@ msgid "              parameters\n"
 msgstr "              parameters\n"
 
 #: getopt/getopt.c:328
-msgid "  -a, --alternative            Allow long options starting with single -\n"
-msgstr "  -a, --alternative            Lange opties toestaan beginnend met een enkele -\n"
+msgid ""
+"  -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Lange opties toestaan beginnend met een "
+"enkele -\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   Deze kleine gebruikersaanwijzing weergeven\n"
+msgstr ""
+"  -h, --help                   Deze kleine gebruikersaanwijzing weergeven\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr "  -l, --longoptions=langeopts  Lange opties die moeten worden herkend\n"
+msgstr ""
+"  -l, --longoptions=langeopts  Lange opties die moeten worden herkend\n"
 
 #: getopt/getopt.c:331
-msgid "  -n, --name=progname          The name under which errors are reported\n"
-msgstr "  -n, --name=prognaam          De naam waaronder fouten worden gerapporteerd\n"
+msgid ""
+"  -n, --name=progname          The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=prognaam          De naam waaronder fouten worden "
+"gerapporteerd\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
-msgstr "  -o, --options=opttekst       Korte opties die moeten worden herkend\n"
+msgstr ""
+"  -o, --options=opttekst       Korte opties die moeten worden herkend\n"
 
 #: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-msgstr "  -q, --quiet                  Foutrapportage van getopt(3) uit zetten\n"
+msgstr ""
+"  -q, --quiet                  Foutrapportage van getopt(3) uit zetten\n"
 
 #: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
@@ -5333,129 +5383,130 @@ msgstr "getopt (uitgebreid) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "interne fout, neem contact op met de auteur"
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "opgestart vanuit MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffiaanse BCD klok\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "klokpoort aangepast tot 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "cool SPEELTJE!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomische %s 1000 iteraties mislukt!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Kan /dev/port niet openen: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Ik heb geen toestemming gekregen omdat ik het niet probeerde.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s kan geen I/O poort toegang krijgen:  de iopl(3) aanroep mislukte.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Waarschijnlijk heeft u root privileges nodig.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Aangenomen wordt dat de hardware klok staat op %s tijd.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "lokale"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Waarschuwing: derde regel in adjtime bestand niet herkend\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Verwacht: `UTC' of `LOCAL' of niets.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Laatste aanpassing voor verschuiving is %ld seconden na 1969 gedaan\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Laatste calibratie gedaan %ld seconden na 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Hardware klok is op %s tijd\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "onbekende"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Wachten op klok tik...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...klok tik ontvangen\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Onjuiste waarden in hardware klok: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr "Hw klok tijd : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconden sinds 1969\n"
+msgstr ""
+"Hw klok tijd : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconden sinds 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Tijd gelezen van hardware klok: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Instellen hardware klok op %.2d:%.2d:%.2d = %ld seconden sinds 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Klok niet gewijzigd - alleen testen.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5464,27 +5515,32 @@ msgstr ""
 "Verlopen tijd sinds laatste referentietijd is %.6f seconden.\n"
 "Uitstellen tot volgende volle seconde.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
-msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
-msgstr "De hardware klok bevat waarden die ofwel onjuist (bijv. 50de dag van de maand) of buiten het bereik vallen dat wij ondersteunen (bijv. het jaar 2095).\n"
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"De hardware klok bevat waarden die ofwel onjuist (bijv. 50de dag van de "
+"maand) of buiten het bereik vallen dat wij ondersteunen (bijv. het jaar "
+"2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f seconden\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Geen --date optie aangegeven.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date argument te lang\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5493,21 +5549,21 @@ msgstr ""
 "De waarde van de --date optie is geen geldige datum.\n"
 "Het bevat in het bijzonder aanhalingstekens.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Uitvoeren date opdracht: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "Uitvoeren 'date' programma in /bin/sh shell mislukt. popen() mislukt"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "antwoord van date opdracht = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5522,104 +5578,123 @@ msgstr ""
 "Het antwoord was:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
-"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
-"De date opdracht uitgevoerd door %s gaf iets anders dan een heel getal waar de geconverteerde tijdswaarde werd verwacht.\n"
+"De date opdracht uitgevoerd door %s gaf iets anders dan een heel getal waar "
+"de geconverteerde tijdswaarde werd verwacht.\n"
 "De opdracht was:\n"
 "  %s\n"
 "Het antwoord was:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "datumtekst %s is gelijk aan %ld seconden sinds 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
-msgstr "De hardware klok bevat geen geldige tijd, zodat we de systeemtijd er niet mee kunnen instellen.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"De hardware klok bevat geen geldige tijd, zodat we de systeemtijd er niet "
+"mee kunnen instellen.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Aanroepen settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "De systeemklok wordt niet ingesteld, uitvoeren in testmodus.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Moet superuser zijn om de systeemklok in te stellen.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() mislukt"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
-msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
-msgstr "De verchuivingsfactor wordt niet aangepast, omdat de hardware klok eerder rotzooi bevatte.\n"
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+"De verchuivingsfactor wordt niet aangepast, omdat de hardware klok eerder "
+"rotzooi bevatte.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"De verschuivingsfactor wordt niet aangepast, omdat de laatste calibratietijd nul was.\n"
+"De verschuivingsfactor wordt niet aangepast, omdat de laatste calibratietijd "
+"nul was.\n"
 "De geschiedenis is dus slecht, en opnieuw calibreren is nodig.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
-msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
-msgstr "De verschuivingsfactor wordt niet aangepast, omdat het minder dan een dag is sinds de laatste calibratie.\n"
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"De verschuivingsfactor wordt niet aangepast, omdat het minder dan een dag is "
+"sinds de laatste calibratie.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"Klok %.1f seconden verschoven in de laatste %d seconden ondanks een verschuivingsfactor van %f seconden/dag.\n"
+"Klok %.1f seconden verschoven in de laatste %d seconden ondanks een "
+"verschuivingsfactor van %f seconden/dag.\n"
 "De verschuivingsfactor wordt %f seconden/dag aangepast\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Tijd sinds laatste aanpassing is %d seconden\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr "Er moeten %d seconden worden ingevoegd, en er moet worden gekeken naar de tijd %.6f seconden geleden\n"
+msgstr ""
+"Er moeten %d seconden worden ingevoegd, en er moet worden gekeken naar de "
+"tijd %.6f seconden geleden\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Het adjtime bestand wordt niet aangepast - in testmodus.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5628,73 +5703,89 @@ msgstr ""
 "Er zou het volgende worden geschreven naar %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Verschuivingsaanpassing parameters niet bijgewerkt.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr "De hardware klok bevat geen geldige tijd, zodat we die niet kunnen aanpassen.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"De hardware klok bevat geen geldige tijd, zodat we die niet kunnen "
+"aanpassen.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr "Benodigde aanpassing is minder dan een seconden - de klok wordt niet ingesteld.\n"
+msgstr ""
+"Benodigde aanpassing is minder dan een seconden - de klok wordt niet "
+"ingesteld.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "%s wordt gebruikt.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Geen bruikbare klok-interface gevonden.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Instellen systeemklok mislukt.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
-"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
-"De kernel bewaart alleen bij Alpha's een tijdperk-waarde voor de hardware klok.\n"
+"De kernel bewaart alleen bij Alpha's een tijdperk-waarde voor de hardware "
+"klok.\n"
 "Deze versie van hwclock is gemaakt voor een ander systeem dan de Alpha\n"
 "(en werkt nu dus waarschijnlijk niet op een Alpha).  Geen actie genomen.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Verkrijgen tijdperk-waarde van de kernel mislukt.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernel neemt een tijdperk-waarde aan van %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
-msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
-msgstr "Om de tijdperk-waarde in te stellen, dient u de 'epoch' optie te gebruiken om door te geven welke waarde moet worden gebruikt.\n"
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"Om de tijdperk-waarde in te stellen, dient u de 'epoch' optie te gebruiken "
+"om door te geven welke waarde moet worden gebruikt.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Tijdperk niet instellen op %d - alleen testen.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Instellen tijdperk-waarde in kernel mislukt.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s van %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5743,17 +5834,21 @@ msgstr ""
 "  --version     versienummer weergeven\n"
 "\n"
 "Opties: \n"
-"  --utc         de hardware klok wordt gehouden op gecoördineerde universele tijd\n"
+"  --utc         de hardware klok wordt gehouden op gecoördineerde universele "
+"tijd\n"
 "  --localtime   de hardware klok wordt op lokale tijd gehouden\n"
 "  --directisa   directe toegang tot ISA bus in plaats van %s\n"
 "  --badyear     negeer jaartal van rtc, omdat de BIOS stuk is\n"
-"  --date        geeft de tijd aan waarop de hardware klok moet worden ingesteld\n"
-"  --epoch=jaar  geeft het jaartal aan dat het begin is van de tijdperk-waarde van\n"
+"  --date        geeft de tijd aan waarop de hardware klok moet worden "
+"ingesteld\n"
+"  --epoch=jaar  geeft het jaartal aan dat het begin is van de tijdperk-"
+"waarde van\n"
 "                de hardware klok\n"
-"  --noadjfile   gebruik niet /etc/adjtime. Het gebruik van --utc of --localtime\n"
+"  --noadjfile   gebruik niet /etc/adjtime. Het gebruik van --utc of --"
+"localtime\n"
 "                is hiervoor nodig\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5762,12 +5857,12 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                vertel welke soort Alpha u gebruikt (zie hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s heeft geen argumenten zonder opties.  U gaf %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5776,50 +5871,66 @@ msgstr ""
 "U heeft verschillende functies aangegeven.\n"
 "Er kan slechts één functie tegelijkertijd worden gebruikt.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
-msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
-msgstr "%s: De --utc en --localtime opties sluiten elkaar uit.  U heeft beide aangegeven.\n"
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+"%s: De --utc en --localtime opties sluiten elkaar uit.  U heeft beide "
+"aangegeven.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
-msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
-msgstr "%s: De --adjust en --noadjfile opties sluiten elkaar uit.  U heeft beide aangegeven.\n"
+msgid ""
+"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: De --adjust en --noadjfile opties sluiten elkaar uit.  U heeft beide "
+"aangegeven.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Met --noadjfile moet u --utc of --localtime aangeven\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Geen bruikbare insteltijd.  Kan klok niet instellen.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Sorry, alleen de supergebruiker kan de hardware klok instellen.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Sorry, alleen de supergebruiker kan de systeem klok instellen.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
-msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
-msgstr "Sorry, alleen de supergebruiker kan de tijdperk-waarde van de hardware klok in de kernel instellen.\n"
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+"Sorry, alleen de supergebruiker kan de tijdperk-waarde van de hardware klok "
+"in de kernel instellen.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Kan geen toegang krijgen tot hardware klok op een bekende manier.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
-msgid "Use the --debug option to see the details of our search for an access method.\n"
-msgstr "Gebruik de --debug optie om de details te zien over onze zoektocht naar een toegangsmethode.\n"
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr ""
+"Gebruik de --debug optie om de details te zien over onze zoektocht naar een "
+"toegangsmethode.\n"
 
 #: hwclock/kd.c:55
 #, c-format
@@ -5848,7 +5959,6 @@ msgstr "ioctl() mislukt om tijd te lezen van %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "ioctl KDSHWCLK mislukt"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Openen /dev/tty1 of /dev/vc/1 mislukt"
@@ -5900,7 +6010,9 @@ msgstr "ioctl() naar %s om bijwerkingsonderbrekingen uit te zetten, mislukt"
 #: hwclock/rtc.c:271
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr "ioctl() naar %s om bijwerkingsonderbrekingen aan te zetten, onverwacht mislukt"
+msgstr ""
+"ioctl() naar %s om bijwerkingsonderbrekingen aan te zetten, onverwacht "
+"mislukt"
 
 #: hwclock/rtc.c:330
 #, c-format
@@ -5919,8 +6031,14 @@ msgstr "Openen van %s mislukt"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
-msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
-msgstr "Om de tijdperk-waarde in de kernel aan te passen, is toegang tot het 'rtc' stuurprogramma van Linux nodig via het speciale apparaatbestand %s.  Dit bestand bestaat niet op dit systeem.\n"
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"Om de tijdperk-waarde in de kernel aan te passen, is toegang tot het 'rtc' "
+"stuurprogramma van Linux nodig via het speciale apparaatbestand %s.  Dit "
+"bestand bestaat niet op dit systeem.\n"
 
 #: hwclock/rtc.c:388 hwclock/rtc.c:434
 #, c-format
@@ -5949,7 +6067,8 @@ msgstr "tijdperk instellen op %ld met RTC_EPOCH_SET ioctl naar %s.\n"
 
 #: hwclock/rtc.c:444
 #, c-format
-msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgid ""
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "Het kernel stuurprogramma voor %s heeft geen RTC_EPOCH_SET ioctl.\n"
 
 #: hwclock/rtc.c:447
@@ -5961,7 +6080,6 @@ msgstr "ioctl(RTC_EPOCH_SET) naar %s mislukt"
 msgid "calling open_tty\n"
 msgstr "aanroepen open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "aanroepen termio_init\n"
@@ -5970,7 +6088,6 @@ msgstr "aanroepen termio_init\n"
 msgid "writing init string\n"
 msgstr "schrijven init string\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "voor autobaud\n"
@@ -5984,7 +6101,6 @@ msgstr "wachten op cr-lf\n"
 msgid "read %c\n"
 msgstr "gelezen %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "lezen inlognaam\n"
@@ -6038,7 +6154,6 @@ msgstr "/dev: chdir() mislukt: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: geen teken-apparaat"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6053,12 +6168,10 @@ msgstr "/dev/%s: kan niet openen als standaardinvoer: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: niet open voor lezen/schrijven"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "dubbel doen\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6091,36 +6204,35 @@ msgstr "%s: invoer overloop"
 #: login-utils/agetty.c:1195
 #, c-format
 msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
 msgstr ""
-"Gebruik: %s [-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H inlog_host] baud_rate,... lijn [soort terminal]\n"
-"of\t[-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H inlog_host] lijn baud_rate,... [soort terminal]\n"
+"Gebruik: %s [-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H "
+"inlog_host] baud_rate,... lijn [soort terminal]\n"
+"of\t[-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H "
+"inlog_host] lijn baud_rate,... [soort terminal]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: weinig geheugen, inloggen mislukt mogelijk\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "malloc voor ttyclass mislukt"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "malloc voor grplist mislukt"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Inloggen op %s van %s standaard geweigerd.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Inloggen op %s van %s geweigerd.\n"
@@ -6165,8 +6277,8 @@ msgstr "Wijzigen finger informatie voor %s.\n"
 msgid "Password error."
 msgstr "Wachtwoord fout."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Wachtwoord: "
@@ -6244,8 +6356,12 @@ msgstr "%s: %s is niet gerechtigd om de shell van %s te wijzigen\n"
 
 #: login-utils/chsh.c:157
 #, c-format
-msgid "%s: Running UID doesn't match UID of user we're altering, shell change denied\n"
-msgstr "%s: uitvoerende UID komt niet overeen met UID van gebruiker die wordt gewijzigd, shell-wijziging ontzegd\n"
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+"%s: uitvoerende UID komt niet overeen met UID van gebruiker die wordt "
+"gewijzigd, shell-wijziging ontzegd\n"
 
 #: login-utils/chsh.c:163
 #, c-format
@@ -6340,34 +6456,6 @@ msgstr "Gebruik %s -l om de lijst te zien.\n"
 msgid "No known shells.\n"
 msgstr "Geen bekende shells.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "kon /dev/urandom niet openen"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "kon geen willekeurige gegevens lezen van /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "kon %s niet openen om te lezen"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "kan %s niet vinden"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s heeft niet de juiste bestandsinstellingen"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "kan geen gegevens lezen van %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6375,13 +6463,14 @@ msgstr "Kan %s niet lezen, afsluiten."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr "gebruik: last [-#] [-f bestand] [-t tty] [-h hostnaam] [gebruiker ...]\n"
+msgstr ""
+"gebruik: last [-#] [-f bestand] [-t tty] [-h hostnaam] [gebruiker ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  nog ingelogd"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6390,15 +6479,15 @@ msgstr ""
 "\n"
 "wtmp begint %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: malloc fout.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6407,51 +6496,45 @@ msgstr ""
 "\n"
 "onderbroken %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATAAL: kan tty niet opnieuw openen: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "FATAAL: slechte tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h alleen voor supergebruiker.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "gebruik: login [-fp] [gebruikersnaam]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM fout, afbreken: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kon PAM niet initialiseren: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "inlognaam: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "INLOGGEN %d MISLUKT VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6460,17 +6543,17 @@ msgstr ""
 "Inloggegevens onjuist\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TEVEEL INLOGPOGINGEN (%d) VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "INLOGSESSIE MISLUKT VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6479,7 +6562,7 @@ msgstr ""
 "\n"
 "Inloggegevens onjuist\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6488,135 +6571,120 @@ msgstr ""
 "\n"
 "Sessie instelprobleem, afbreken.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL gebruikersnaam in %s:%d. Afbreken."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Onjuiste gebruikersnaam \"%s\" in %s:%d. Afbreken."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Geheugentekort\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Onjuiste gebruikersnaam"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s inloggen geweigerd vanaf deze terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "INLOGGEN %s GEWEIGERD VAN %s OP TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "INLOGGEN %s GEWEIGERD OP TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Inloggegevens onjuist\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Er zijn al teveel gebruikers ingelogd.\n"
-"Probeer het later opnieuw.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "U heeft teveel processen draaien.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "INBELLEN BIJ %s DOOR %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN OP %s VAN %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN OP %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN OP %s DOOR %s VAN %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN OP %s DOOR %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "U heeft nieuwe e-mail.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "U heeft e-mail.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork() mislukt: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY mislukt: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() mislukt"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Geen map %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Inloggen met home = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: geen geheugen voor shell script.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kon shell script niet uitvoeren: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: geen shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6625,65 +6693,65 @@ msgstr ""
 "\n"
 "%s inlognaam: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "inlognaam veel te lang.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NAAM te lang"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "inlognamen mogen niet beginnen met '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "teveel losse witregels.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "EXCESSIEVE witregels"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggen is na %d seconden afgebroken vanwege een time-out\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Laatste keer inloggen: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "van %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "op %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "INLOGGEN MISLUKT VAN %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "INLOGGEN MISLUKT OP %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d INLOG MISLUKKINGEN VAN %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d INLOG MISLUKKINGEN OP %s, %s"
@@ -6703,166 +6771,30 @@ msgstr "is n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "gebruik: mesg [j | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Wie bent u?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Die groep bestaat niet."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Toegang geweigerd"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Geen shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Het wachtwoord moet tenminste 6 tekens lang zijn. Probeer opnieuw.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Het wachtwoord moet uit de volgende categorieen tekens bevatten:\n"
-"hoofd- en kleine letters, cijfers en niet-alfanumerieke tekens.\n"
-"Zie passwd(1) voor meer informatie.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "U kunt niet het oude wachtwoord gebruiken.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Gebruik alstublieft niet iets wat lijkt op uw gebruikersnaam als wachtwoord!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Gebruik alstublieft niet iets wat lijkt op uw echte naam als wachtwoord!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Gebruik: passwd [gebruikersnaam [wachtwoord]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Alleen root mag de een- en twee-argumentsvormen gebruiken.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Gebruik: passwd [-foqsvV] [gebruiker [wachtwoord]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Kan niet uitvoeren %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kan inlognaam niet vinden"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Alleen root kan het wachtwoord van anderen wijzigen.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Teveel argumenten.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Kan de gebruikersnaam nergens vinden. Is `%s' echt een gebruiker?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Sorry, ik kan alleen lokale wachtwoorden wijzigen. Gebruik yppasswd in plaats hiervan."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID en gebruikersnaam komen niet overeen, bedrieger!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Het wachtwoord van %s wordt gewijzigd\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Geef het oude wachtwoord: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Onjuist wachtwoord, bedrieger."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Geef het nieuwe wachtwoord: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Wachtwoord niet gewijzigd."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Geef opnieuw het nieuwe wachtwoord: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "U heeft het verkeerd ingevoerd. Wachtwoord niet gewijzigd."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "wachtwoord gewijzigd, gebruiker %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT WACHTWOORD GEWIJZIGD"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "wachtwoord gewijzigd door root, gebruiker %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "setpwnam aanroepen om wachtwoord in te stellen.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Wachtwoord *NIET* gewijzigd.  Probeer het later opnieuw.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Wachtwoord gewijzigd.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -6909,7 +6841,6 @@ msgstr "opnieuw gestart door %s: %s"
 msgid "halted by %s: %s"
 msgstr "afgesloten door %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -6946,7 +6877,6 @@ msgstr "Het programma \"%s\" wordt uitgevoerd ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Fout bij uitvoeren\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7036,7 +6966,6 @@ msgstr "fout bij instellen sluiten-bij-uitvoeren op /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "fout bij uitvoeren finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "fout bij fork() finalprog\n"
@@ -7065,7 +6994,7 @@ msgstr "openen van map mislukt\n"
 msgid "fork failed\n"
 msgstr "fork() mislukt\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1622
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "uitvoeren mislukt\n"
 
@@ -7214,12 +7143,6 @@ msgstr "onjuiste maandwaarde: gebruik 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "onjuiste jaarwaarde: gebruik 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7230,13 +7153,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "gebruik: cal [-13smjyV] [[maand] jaar]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "gebruik: %s [+formaat] [dag maand jaar]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tibs Dag"
 
@@ -7282,8 +7204,11 @@ msgstr "logger: onbekende prioriteitsnaam: %s.\n"
 
 #: misc-utils/logger.c:287
 #, c-format
-msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr "gebruik: logger [-is] [-f bestand] [-p pri] [-t tag] [-u socket] [ bericht ... ]\n"
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+"gebruik: logger [-is] [-f bestand] [-p pri] [-t tag] [-u socket] "
+"[ bericht ... ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
@@ -7365,7 +7290,7 @@ msgstr "%s: hernoemen %s tot %s mislukt: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "gebruik: %s van naar bestanden...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7376,22 +7301,22 @@ msgstr ""
 "Gebruik `%s [opties] %s' als u het echt wilt gebruiken.\n"
 "Script niet gestart.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "gebruik: script [-a] [-f] [-q] [-t] [bestand]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script gestart, bestand is %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script gestart op %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7400,254 +7325,253 @@ msgstr ""
 "\n"
 "Script gedaan op %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script gedaan, bestand is %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty mislukt\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Tekort aan pty's\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argument fout, gebruik\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_naam ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-AANTAL_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-AANTAL_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dump_bestandsnaam ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "kan stroombesparingsmodus niet instellen\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl fout: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fout bij lezen %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Fout bij schrijven schermafdruk\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "kon %s niet lezen, en ioctl() mislukt voor meer informatie\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM is niet gedefinieerd.\n"
@@ -7707,51 +7631,54 @@ msgstr "Bericht van %s@%s (als %s) op %s bij %s ..."
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Bericht van %s@%s op %s bij %s ..."
 
-#: mount/fstab.c:135
+#: mount/fstab.c:136
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "waarschuwing: fout bij lezen %s: %s"
 
-#: mount/fstab.c:163 mount/fstab.c:188
+#: mount/fstab.c:164 mount/fstab.c:189
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr "waarschuwing: kan %s niet openen: %s"
 
-#: mount/fstab.c:168
+#: mount/fstab.c:169
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kon %s niet openen - gebruik %s in plaats daarvan\n"
 
-#: mount/fstab.c:472
+#: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr "kan het blokkeerbestand %s niet maken: %s (gebruik -n optie om te forceren)"
+msgstr ""
+"kan het blokkeerbestand %s niet maken: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:487
+#: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr "kan blokkeerbestand %s niet koppelen: %s (gebruik -n optie om te forceren)"
+msgstr ""
+"kan blokkeerbestand %s niet koppelen: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:499
+#: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr "kan blokkeerbestand %s niet openen: %s (gebruik -n optie om te forceren)"
+msgstr ""
+"kan blokkeerbestand %s niet openen: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:514
+#: mount/fstab.c:526
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kan blokkeerbestand %s niet blokkeren: %s\n"
 
-#: mount/fstab.c:526
+#: mount/fstab.c:538
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kan blokkeerbestand %s niet blokkeren: %s"
 
-#: mount/fstab.c:528
+#: mount/fstab.c:540
 msgid "timed out"
 msgstr "time-out"
 
-#: mount/fstab.c:535
+#: mount/fstab.c:547
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7760,22 +7687,22 @@ msgstr ""
 "Kan koppeling %s niet maken\n"
 "Mogelijk is er een oud blokkeerbestand?\n"
 
-#: mount/fstab.c:584 mount/fstab.c:622
+#: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kan %s niet openen (%s) - mtab niet bijgewerkt"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:633
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fout bij schrijven %s: %s"
 
-#: mount/fstab.c:640
+#: mount/fstab.c:643
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fout bij wijzigen modus van %s: %s\n"
 
-#: mount/fstab.c:658
+#: mount/fstab.c:661
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan %s niet hernoemen tot %s: %s\n"
@@ -7832,7 +7759,8 @@ msgid ""
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 "%s: Kon geen enkel lus-apparaat vinden. Misschien weet deze kernel niets\n"
-"       over het lus-apparaat? (Als dat zo is kunt u die opnieuw compileren of een\n"
+"       over het lus-apparaat? (Als dat zo is kunt u die opnieuw compileren "
+"of een\n"
 "        `modprobe loop' doen.)"
 
 #: mount/lomount.c:189
@@ -7845,27 +7773,29 @@ msgstr "%s: kon geen enkel vrij lus-apparaat vinden"
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kan niet blokkeren in geheugen, afsluiten.\n"
 
-#: mount/lomount.c:341
+#: mount/lomount.c:340
 #, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): succesvol\n"
 
-#: mount/lomount.c:352
+#: mount/lomount.c:351
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: kan apparaat %s niet verwijderen: %s\n"
 
-#: mount/lomount.c:362
+#: mount/lomount.c:361
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): succes\n"
 
-#: mount/lomount.c:370
+#: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "Deze versie van mount is gecompileerd zonder lus ondersteuning. Hercompileer alstublieft.\n"
+msgstr ""
+"Deze versie van mount is gecompileerd zonder lus ondersteuning. Hercompileer "
+"alstublieft.\n"
 
-#: mount/lomount.c:407
+#: mount/lomount.c:406
 #, c-format
 msgid ""
 "usage:\n"
@@ -7880,16 +7810,17 @@ msgstr ""
 "  %s -f# ongebruikte vinden\n"
 "  %s [ -e codering ] [ -o plaats ] {-f|lus_apparaat} bestand # instellen\n"
 
-#: mount/lomount.c:426 mount/sundries.c:30 mount/sundries.c:41
-#: mount/sundries.c:56 mount/sundries.c:259
+#: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
 msgid "not enough memory"
 msgstr "niet voldoende geheugen"
 
-#: mount/lomount.c:541
+#: mount/lomount.c:540
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr "Er was geen lus-ondersteuning beschikbaar bij het compileren. Hercompileer alstublieft.\n"
+msgstr ""
+"Er was geen lus-ondersteuning beschikbaar bij het compileren. Hercompileer "
+"alstublieft.\n"
 
 #: mount/mntent.c:166
 #, c-format
@@ -7905,166 +7836,186 @@ msgstr "[mntent]: regel %d in %s is slecht%s\n"
 msgid "; rest of file ignored"
 msgstr "; rest van bestand genegeerd"
 
-#: mount/mount.c:381
+#: mount/mount_blkid.c:87
+#, c-format
+msgid "%s: error: the label %s occurs on both %s and %s\n"
+msgstr "%s: fout: het label %s komt voor op %s èn op %s\n"
+
+#: mount/mount_blkid.c:99
+#, c-format
+msgid "mount: going to mount %s by UUID\n"
+msgstr "mount: mounten van %s via UUID\n"
+
+#: mount/mount_blkid.c:103
+#, c-format
+msgid "mount: going to mount %s by label\n"
+msgstr "mount: mounten van %s via label\n"
+
+#: mount/mount_by_label.c:192
+#, c-format
+msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"%s: kon %s niet openen; UUID en LABEL conversie kon dus niet worden gedaan.\n"
+
+#: mount/mount_by_label.c:315
+#, c-format
+msgid "%s: bad UUID"
+msgstr "%s: slechte UUID"
+
+#: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: volgens mtab, is %s al aangekoppeld op %s"
 
-#: mount/mount.c:386
+#: mount/mount.c:387
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: volgens mtab, is %s al aangekoppeld op %s"
 
-#: mount/mount.c:406
+#: mount/mount.c:407
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan %s niet openen om te schrijven: %s"
 
-#: mount/mount.c:423 mount/mount.c:676
+#: mount/mount.c:424 mount/mount.c:677
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fout bij schrijven %s: %s"
 
-#: mount/mount.c:431
+#: mount/mount.c:432
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fout bij wijzigen modus van %s: %s"
 
-#: mount/mount.c:482
+#: mount/mount.c:483
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ziet er uit al wisselgeheugen - niet aangekoppeld"
 
-#: mount/mount.c:569
+#: mount/mount.c:570
 msgid "mount failed"
 msgstr "aankoppelen mislukt"
 
-#: mount/mount.c:571
+#: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: alleen root kan %s aankoppelen op %s"
 
-#: mount/mount.c:599
+#: mount/mount.c:600
 msgid "mount: loop device specified twice"
 msgstr "mount: lus-apparaat twee keer aangegeven"
 
-#: mount/mount.c:604
+#: mount/mount.c:605
 msgid "mount: type specified twice"
 msgstr "mount: soort twee keer aangegeven"
 
-#: mount/mount.c:616
+#: mount/mount.c:617
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: instellen van lus-apparaat wordt overgeslagen\n"
 
-#: mount/mount.c:625
+#: mount/mount.c:626
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: het lus-apparaat %s wordt gebruikt\n"
 
-#: mount/mount.c:630
+#: mount/mount.c:631
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: instellen lus-apparaat mislukt\n"
 
-#: mount/mount.c:634
+#: mount/mount.c:635
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: instellen lus-apparaat succesvol\n"
 
-#: mount/mount.c:671
+#: mount/mount.c:672
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan %s niet openen: %s"
 
-#: mount/mount.c:692
+#: mount/mount.c:693
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument voor -p of --pass-fd moet een getal zijn"
 
-#: mount/mount.c:705
+#: mount/mount.c:706
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kan %s niet openen om snelheid in te stellen"
 
-#: mount/mount.c:708
+#: mount/mount.c:709
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan snelheid niet instellen: %s"
 
-#: mount/mount.c:762 mount/mount.c:1347
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork() mislukt: %s"
 
-#: mount/mount.c:850
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: deze versie is gecompileerd zonder ondersteuning voor de soort `nfs'"
-
-#: mount/mount.c:890
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: mislukt met nfs mount versie 4, probeer nu 3..\n"
 
-#: mount/mount.c:901
-msgid "mount: I could not determine the filesystem type, and none was specified"
+#: mount/mount.c:895
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Kon bestandssysteemsoort niet bepalen, en geen aangegeven"
 
-#: mount/mount.c:904
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: u moet de bestandssysteem soort aangeven"
 
-#. should not happen
-#: mount/mount.c:907
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: aankoppelen mislukt"
 
-#: mount/mount.c:913 mount/mount.c:948
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: aankoppelingspunt %s is geen map"
 
-#: mount/mount.c:915
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: toegang geweigerd"
 
-#: mount/mount.c:917
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: moet supergebruiker zijn om mount te gebruiken"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:921 mount/mount.c:925
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s is bezig"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:927
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc al aangekoppeld"
 
-#: mount/mount.c:929
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s al aangekoppeld of %s bezig"
 
-#: mount/mount.c:935
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: aankoppelingspunt %s bestaat niet"
 
-#: mount/mount.c:937
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount: aankoppelingspunt %s is een symbolische koppeling die nergens naar wijst"
+msgstr ""
+"mount: aankoppelingspunt %s is een symbolische koppeling die nergens naar "
+"wijst"
 
-#: mount/mount.c:940
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speciale apparaat %s bestaat niet"
 
-#: mount/mount.c:950
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8073,12 +8024,12 @@ msgstr ""
 "mount: speciale apparaat %s bestaat niet\n"
 "       (een pad voorvoegsel is geen map)\n"
 
-#: mount/mount.c:963
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s nog niet aangekoppeld, of slechte optie"
 
-#: mount/mount.c:965
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8087,7 +8038,7 @@ msgstr ""
 "mount: slecht soort bestandssysteem, slechte optie, slecht superblok op %s,\n"
 "       ontbrekende codepagina of andere fout"
 
-#: mount/mount.c:975
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8095,7 +8046,7 @@ msgstr ""
 "       (kan dit het IDE-apparaat zijn waar u in feite ide-scsi\n"
 "gebruikt zodat sr0 of sda ofzo nodig is?)"
 
-#: mount/mount.c:981
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8103,7 +8054,7 @@ msgstr ""
 "       (bent u niet aan het proberen een uitgebreide partitie\n"
 "te mounten in plaats van een logische partitie binenin?)"
 
-#: mount/mount.c:998
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8111,50 +8062,51 @@ msgstr ""
 "       In sommige gevallen wordt er nuttige informatie gevonden in syslog\n"
 "- probeer dmesg | tail ofzo\n"
 
-#: mount/mount.c:1004
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "aankoppelingstabel vol"
 
-#: mount/mount.c:1006
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan superblok niet lezen"
 
-#: mount/mount.c:1010
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: onbekend apparaat"
 
-#: mount/mount.c:1015
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: onbekend soort bestanssysteem '%s'"
 
-#: mount/mount.c:1027
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: waarschijnlijk bedoelde u %s"
 
-#: mount/mount.c:1029
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: mogelijk bedoelde u 'iso9660'?"
 
-#: mount/mount.c:1031
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: mogelijk bedoelde u 'vfat'?"
 
-#: mount/mount.c:1034
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr "mount: %s heeft onjuist apparaatnummer of bestandssysteem soort %s niet ondersteund"
+msgstr ""
+"mount: %s heeft onjuist apparaatnummer of bestandssysteem soort %s niet "
+"ondersteund"
 
-#. strange ...
-#: mount/mount.c:1040
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s is geen blok-apparaat, en stat mislukt?"
 
-#: mount/mount.c:1042
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8163,71 +8115,67 @@ msgstr ""
 "mount: de kernel herkent %s niet als een blok-apparaat\n"
 "       (misschien `insmod stuurprogramma'?)"
 
-#: mount/mount.c:1045
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s is geen blok-apparaat (misschien `-o loop' proberen?)"
 
-#: mount/mount.c:1048
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s is geen blok-apparaat"
 
-#: mount/mount.c:1051
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s is geen geldig blok-apparaat"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1054
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blok-apparaat "
 
-#: mount/mount.c:1056
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan %s%s niet alleen-lezen aankoppelen"
 
-#: mount/mount.c:1060
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s is schrijf-beveiligd maar expliciete `-w' optie gegeven"
 
-#: mount/mount.c:1077
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s is schrijf-beveiligd, alleen-lezen aankoppelen"
 
-#: mount/mount.c:1176
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: geen soort gegeven - Ik neem aan nfs, vanwege de dubbele punt\n"
 
-#: mount/mount.c:1182
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
-msgstr "mount: geen soort gegeven - Ik neem aan smbfs, vanwege het // voorvoegsel\n"
+msgstr ""
+"mount: geen soort gegeven - Ik neem aan smbfs, vanwege het // voorvoegsel\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1199
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: op de achtergrond \"%s\"\n"
 
-#: mount/mount.c:1210
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ik geef het op voor \"%s\"\n"
 
-#: mount/mount.c:1292
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s al aangekoppeld op %s\n"
 
-#: mount/mount.c:1425
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8264,7 +8212,8 @@ msgstr ""
 "         mount map             : bekend apparaat hier aankoppelen\n"
 "         mount -t soort apparaat map : standaard mount opdracht\n"
 "Let op dat men niet echt een apparaat aankoppeld, maar eigenlijk een\n"
-"bestandssysteem (van gegeven soort) dat op dat apparaat kan worden gevonden.\n"
+"bestandssysteem (van gegeven soort) dat op dat apparaat kan worden "
+"gevonden.\n"
 "Men kan ook een reeds zichtbare mappenboom ergens anders aankoppelen:\n"
 "       mount --bind oudemap nieuwemap\n"
 "of een subboom verplaatsen:\n"
@@ -8274,47 +8223,38 @@ msgstr ""
 "Andere opties: [-nfFrsvw] [-o opties] [-p wachtwoordfd].\n"
 "Voor meer informatie, zie  man 8 mount .\n"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: alleen root kan dat doen"
 
-#: mount/mount.c:1619
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: geen %s gevonden - nu aanmaken..\n"
 
-#: mount/mount.c:1631
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: die partitie is niet gevonden"
 
-#: mount/mount.c:1633
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: aankoppelen %s\n"
 
-#: mount/mount.c:1642
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "niets aangekoppeld"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kan %s niet vinden in %s"
 
-#: mount/mount.c:1672
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan %s niet vinden in %s of %s"
 
-#: mount/mount_by_label.c:190
-#, c-format
-msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr "mount: kon %s niet openen; UUID en LABEL conversie kon dus niet worden gedaan.\n"
-
-#: mount/mount_by_label.c:313
-msgid "mount: bad UUID"
-msgstr "mount: slechte UUID"
-
 #: mount/mount_guess_fstype.c:489
 #, c-format
 msgid "mount: error while guessing filesystem type\n"
@@ -8345,120 +8285,120 @@ msgstr "       Ik zal soort %s proberen\n"
 msgid "Trying %s\n"
 msgstr "Proberen %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: excessief lang host:map argument\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: waarschuwing: meerdere hostnamen niet ondersteund\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: aan te koppelen map niet in host:map formaat\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: kan geen adres verkrijgen voor %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: slechte hp->h_length gekregen\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: excessief lang optie argument\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Waarschuwing: Niet herkende proto= optie.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Waarschuwing: Optie namlen niet ondersteund.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "onbekend nfs mount parameter: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Waarschuwing: optie nolock niet ondersteund.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "onbekende nfs mount optie: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: slechte hp->h_length gekregen?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS over TCP is niet ondersteund.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs server zei dat de voorziening niet beschikbaar is"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "portmapper gebruikt voor vinden NFS poort\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "gebruiken poort %d voor nfs deamon\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs verbinden"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "onbekende nfs status resultaatwaarde: %d"
 
-#: mount/sundries.c:66
+#: mount/sundries.c:26
 msgid "bug in xstrndup call"
 msgstr "programmeerfout in aanroep xstrndup"
 
-#: mount/swapon.c:54
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
-"       %s [-v] [-p priority] special ...\n"
+"       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
 "gebruik: %s [-hV]\n"
 "         %s -a [-e] [-v]\n"
-"         %s [-v] [-p prioriteit] speciaal ...\n"
+"         %s [-v] [-p prioriteit] speciaal|LABEL=volume_naam ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8469,133 +8409,137 @@ msgstr ""
 "         %s -a [-v]\n"
 "         %s [-v] speciaal ...\n"
 
-#: mount/swapon.c:170 mount/swapon.c:234
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s op %s\n"
 
-#: mount/swapon.c:174
+#: mount/swapon.c:177 mount/swapon.c:243
 #, c-format
-msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon: kan %s niet vinden: %s\n"
+msgid "%s: cannot find the device for %s\n"
+msgstr "%s: kan geen apparaat vinden voor %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, c-format
-msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr "swapon: waarschuwing: %s heeft onveilige toegangsrechten %04o, %04o aangeraden\n"
+msgid "%s: cannot stat %s: %s\n"
+msgstr "%s: kan de status van %s niet opvragen: %s\n"
 
-#: mount/swapon.c:197
+#: mount/swapon.c:195
 #, c-format
-msgid "swapon: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: Overslaan bestand %s - het lijkt gaten te hebben.\n"
+msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
+msgstr ""
+"%s: waarschuwing: %s heeft onveilige toegangsrechten %04o, %04o aangeraden\n"
 
-#: mount/swapon.c:240
+#: mount/swapon.c:207
+#, c-format
+msgid "%s: Skipping file %s - it appears to have holes.\n"
+msgstr "%s: Overslaan bestand %s - het lijkt gaten te hebben.\n"
+
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Geen supergebruiker.\n"
 
-#: mount/swapon.c:304 mount/swapon.c:400
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: niet %s niet openen: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: gecompileerd zonder ondersteuning voor -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan %s niet vorken"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, map: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: kan geen adres krijgen voor %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: slechte hostp->h_length gekregen\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ongeldig blok-apparaat"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: niet aangekoppeld"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan niet schrijven naar superblok"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: apparaat is bezig"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: niet gevonden"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: moet supergebruiker zijn om te ontkoppelen"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blok-apparaten niet toegestaan op bestandssysteem"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "geen umount2, proberen umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kon %s niet ontkoppelen - proberen %s in plaats daarvan\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s bezig - alleen-lezen her-aangekoppeld\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kon %s niet alleen-lezen her-aankoppelen\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ontkoppeld\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan geen lijst vinden met bestandssystemen om te ontkoppelen"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8603,50 +8547,50 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Gebruik: umount [-hV]\n"
-"         umount -a [-f] [-r] [-n] [-v] [-t vbestandssysteensoorten] [-O opties]\n"
+"         umount -a [-f] [-r] [-n] [-v] [-t vbestandssysteensoorten] [-O "
+"opties]\n"
 "         umount [-f] [-r] [-n] [-v] speciaal | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "kan \"\" niet unmounten\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Proberen te ontkoppelen %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kon %s niet vinden in mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s is niet aangekoppeld (volgens mtab)"
 
-#: mount/umount.c:576
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: het lijkt erop dat %s meerdere keren is aangekoppeld"
 
-#: mount/umount.c:589
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s staat niet in fstab (en u bent niet root)"
 
-#: mount/umount.c:593
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s aankoppeling komt niet overeen met fstab"
 
-#: mount/umount.c:634
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: alleen %s kan %s ontkoppelen van %s"
 
-#: mount/umount.c:715
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: alleen root kan dat doen"
 
@@ -8673,10 +8617,12 @@ msgstr ""
 #: sys-utils/cytune.c:126
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Bestand %s, For drempelwaarde %lu en time-out waarde %lu, maximum tekens in fifo was %d,\n"
+"Bestand %s, For drempelwaarde %lu en time-out waarde %lu, maximum tekens in "
+"fifo was %d,\n"
 "en maximale overdrachtssnelheid in tekens/seconde was %f\n"
 
 #: sys-utils/cytune.c:190
@@ -8706,8 +8652,12 @@ msgstr "Onjuiste standaardwaarde tijdsinstelling: %s\n"
 
 #: sys-utils/cytune.c:239
 #, c-format
-msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
-msgstr "Gebruik: %s [-q [-i interval]] ([-s waarde]|[-S waarde]) ([-t waarde]|[-T waarde]) [-g|-G] bestand [bestand...]\n"
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"Gebruik: %s [-q [-i interval]] ([-s waarde]|[-S waarde]) ([-t waarde]|[-T "
+"waarde]) [-g|-G] bestand [bestand...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
 #: sys-utils/cytune.c:340
@@ -8760,8 +8710,10 @@ msgstr "Kan CYGETMON niet uitvoeren op %s: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
-msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ints, %lu/%lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
+msgid ""
+"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ints, %lu/%lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
 
 #: sys-utils/cytune.c:425
 #, c-format
@@ -8770,8 +8722,10 @@ msgstr "   %f int/sec; %f ontvangen, %f verzonden (tekens/sec)\n"
 
 #: sys-utils/cytune.c:430
 #, c-format
-msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ints, %lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ints, %lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
 
 #: sys-utils/cytune.c:436
 #, c-format
@@ -8783,6 +8737,19 @@ msgstr "   %f int/sec; %f ontvangen (tekens/sec)\n"
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Gebruik: %s [-c] [-n niveau] [-s bufgrootte]\n"
 
+#: sys-utils/flock.c:59
+#, c-format
+msgid "flock: unknown option, aborting.\n"
+msgstr "flock: onbekende optie, afbreken.\n"
+
+#: sys-utils/flock.c:77
+#, fuzzy, c-format
+msgid ""
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
+msgstr ""
+"Gebruik flock [--shared | --timeout=seconden] bestandsnaam commando {arg "
+"arg ...}\n"
+
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
@@ -8886,8 +8853,10 @@ msgstr "\t%s -h voor hulp.\n"
 
 #: sys-utils/ipcs.c:129
 #, c-format
-msgid "%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s geeft informatie over ipc voorzieningen waarvoor u leestoegang heeft.\n"
+msgid ""
+"%s provides information on ipc facilities for which you have read access.\n"
+msgstr ""
+"%s geeft informatie over ipc voorzieningen waarvoor u leestoegang heeft.\n"
 
 #: sys-utils/ipcs.c:131
 #, c-format
@@ -8946,8 +8915,6 @@ msgstr "kernel niet ingesteld voor gedeeld geheugen\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Grenzen gedeeld geheugen --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9445,11 +9412,14 @@ msgstr "pid"
 
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "gebruik: rdev [ -rv ] [ -o PLAATS ] [ AFBEELDING [ WAARDE [ PLAATS ] ] ]"
+msgstr ""
+"gebruik: rdev [ -rv ] [ -o PLAATS ] [ AFBEELDING [ WAARDE [ PLAATS ] ] ]"
 
 #: sys-utils/rdev.c:70
-msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (of rdev /linux, etc.) geeft huidige ROOT apparaat aan"
+msgid ""
+"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+"  rdev /dev/fd0  (of rdev /linux, etc.) geeft huidige ROOT apparaat aan"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -9457,7 +9427,8 @@ msgstr "  rdev /dev/fd0 /dev/hda2         stelt ROOT in op /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              stelt de ROOTFLAGS in (alleen-lezen status)"
+msgstr ""
+"  rdev -R /dev/fd0 1              stelt de ROOTFLAGS in (alleen-lezen status)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -9484,12 +9455,17 @@ msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     zelfde als rdev -v"
 
 #: sys-utils/rdev.c:79
-msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr "Let op: video modes zijn: -3=Vraag, -2=Uitgebreid, -1=GewoonVga, 1=sleutel1, 2=sleutel2,..."
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+"Let op: video modes zijn: -3=Vraag, -2=Uitgebreid, -1=GewoonVga, 1=sleutel1, "
+"2=sleutel2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      gebruik -R 1 om root alleen-lezen aan te koppelen, -R 0 voor lezen/schrijven."
+msgstr ""
+"      gebruik -R 1 om root alleen-lezen aan te koppelen, -R 0 voor lezen/"
+"schrijven."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
@@ -9562,8 +9538,11 @@ msgstr "totaal"
 
 #: sys-utils/renice.c:68
 #, c-format
-msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr "gebruik: renice prioriteit [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] gebruikers ]\n"
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr ""
+"gebruik: renice prioriteit [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"gebruikers ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
@@ -9600,7 +9579,8 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"Gebruik: %s <apparaat> [ -i <IRQ> | -t <TIJD> | -c <TEKENS> | -w <WACHTEN> | \n"
+"Gebruik: %s <apparaat> [ -i <IRQ> | -t <TIJD> | -c <TEKENS> | -w <WACHTEN> "
+"| \n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
@@ -9716,20 +9696,23 @@ msgstr "hexdump: slechte waarde voor overslaan.\n"
 
 #: text-utils/hexsyntax.c:131
 #, c-format
-msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr "hexdump: [-bcCdovx] [-e fmt] [-f formaat_bestand] [-n lengte] [-s overslaan] [bestand ...]\n"
+msgid ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcCdovx] [-e fmt] [-f formaat_bestand] [-n lengte] [-s overslaan] "
+"[bestand ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "gebruik: %s [-dflpcsu] [+regelnummer | +/patroon] naam1 naam2 ...\n"
 
-#: text-utils/more.c:485
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: onbekende optie \"'-%c\"\n"
 
-#: text-utils/more.c:517
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9740,8 +9723,7 @@ msgstr ""
 "*** %s: map ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:560
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9752,45 +9734,45 @@ msgstr ""
 "******** %s: Geen tekstbestand ********\n"
 "\n"
 
-#: text-utils/more.c:663
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Gebruik q of Q om af te sluiten]"
 
-#: text-utils/more.c:755
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Meer--"
 
-#: text-utils/more.c:757
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Volgende bestand: %s)"
 
-#: text-utils/more.c:762
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Druk op de spatiebalk om door te gaan, 'q' om af te sluiten.]"
 
-#: text-utils/more.c:1161
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...%d pagina's terug"
 
-#: text-utils/more.c:1163
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...1 pagina terug"
 
-#: text-utils/more.c:1206
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...1 regel overslaan"
 
-#: text-utils/more.c:1208
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...%d regels overslaan"
 
-#: text-utils/more.c:1245
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -9800,17 +9782,19 @@ msgstr ""
 "***Terug***\n"
 "\n"
 
-#: text-utils/more.c:1283
+#: text-utils/more.c:1237
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in "
+"brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"De meeste opdrachten optioneel voorafgegaan door gehele getallen (k).  Standaard tussen haakjes.\n"
+"De meeste opdrachten optioneel voorafgegaan door gehele getallen (k).  "
+"Standaard tussen haakjes.\n"
 "Ster (*) geeft aan dat argument de nieuwe standaardinstelling wordt.\n"
 
-#: text-utils/more.c:1290
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9832,54 +9816,61 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<spatie>                 Geef volgende k regels weer van tekst [huidige schermgrootte]\n"
-"z                       Geef volgende k regels weer van tekst [huidige schermgrootte]*\n"
+"<spatie>                 Geef volgende k regels weer van tekst [huidige "
+"schermgrootte]\n"
+"z                       Geef volgende k regels weer van tekst [huidige "
+"schermgrootte]*\n"
 "<enter>                Geef volgende k regels weer van tekst [1]*\n"
-"d of ctrl-D             Schuif k regels op [huidige schuifgrootte, in het begin 11]*\n"
+"d of ctrl-D             Schuif k regels op [huidige schuifgrootte, in het "
+"begin 11]*\n"
 "q of Q of <interrupt>   Afsluiten voor meer\n"
 "s                       Naar voren k regels overslaan [1]\n"
 "f                       Naar voren k schermen overslaan [1]\n"
 "b of ctrl-B             Naar achteren k schermen overslaan [1]\n"
-"'                       Ga naar de plaats waar de vorige zoekopdracht startte\n"
+"'                       Ga naar de plaats waar de vorige zoekopdracht "
+"startte\n"
 "=                       Geef huidige regelnummer weer\n"
-"/<reguliere uitdrukking>   Zoek de kde overeenkomst van reguliere uitdrukking [1]\n"
-"n                       Zoek de kde overeenkomst van vorige reguliere uitdrukking [1]\n"
+"/<reguliere uitdrukking>   Zoek de kde overeenkomst van reguliere "
+"uitdrukking [1]\n"
+"n                       Zoek de kde overeenkomst van vorige reguliere "
+"uitdrukking [1]\n"
 "!<cmd> of :!<cmd>       Voer <cmd> uit in een subshell\n"
 "v                       Start /usr/bin/vi op de huidige regel\n"
 "ctrl-L                  Teken het scherm opnieuw\n"
 ":n                      Ga naar het kde volgende bestand [1]\n"
 ":p                      Ga naar het kde vorige bestand [1]\n"
-":f                      Geef de huidige bestandsnaam en het regelnummer weer\n"
+":f                      Geef de huidige bestandsnaam en het regelnummer "
+"weer\n"
 ".                       Herhaal de vorige opdracht\n"
 
-#: text-utils/more.c:1359 text-utils/more.c:1364
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Druk op 'h' voor instructies.]"
 
-#: text-utils/more.c:1398
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" regel %d"
 
-#: text-utils/more.c:1400
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Geen bestand] regel %d"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Overloop\n"
 
-#: text-utils/more.c:1531
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...overslaan\n"
 
-#: text-utils/more.c:1560
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Reguliere uitdrukking knoeiwerk"
 
-#: text-utils/more.c:1572
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9887,15 +9878,15 @@ msgstr ""
 "\n"
 "Patroon niet gevonden\n"
 
-#: text-utils/more.c:1575 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Patroon niet gevonden"
 
-#: text-utils/more.c:1636
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "kan niet fork()\n"
 
-#: text-utils/more.c:1675
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -9903,19 +9894,19 @@ msgstr ""
 "\n"
 "...Overslaan "
 
-#: text-utils/more.c:1679
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Overslaan tot bestand "
 
-#: text-utils/more.c:1681
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Overslaan terug naar bestand "
 
-#: text-utils/more.c:1959
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Regels te lang"
 
-#: text-utils/more.c:2002
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Geen vorige opdracht om voor te vervangen"
 
@@ -9968,89 +9959,89 @@ msgstr "hexdump: slecht formaat {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: slecht conversieteken %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
-msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr "%s: Gebruik: %s [-number] [-p tekst] [-cefnrs] [+regel] [+/patroon/] [bestanden]\n"
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+"%s: Gebruik: %s [-number] [-p tekst] [-cefnrs] [+regel] [+/patroon/] "
+"[bestanden]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: optie vereist een argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: onjuiste optie -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...overslaan naar voren\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...overslaan naar achteren\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Geen volgend bestand"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Geen vorig bestand"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Leesfout bestand %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Onverwacht EOF in bestand %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Onbekende fout in bestand %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kan geen tijdelijk bestand maken\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE fout: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Geen onthouden zoektekst"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Kan niet openen "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "opgeslagen"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !opdracht niet toegestaan in rflag modus.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() mislukt, probeer het later opnieuw\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Volgende bestand: "
 
@@ -10064,6 +10055,16 @@ msgstr "Reserveren bufferruimte mislukt\n"
 msgid "usage: rev [file ...]\n"
 msgstr "gebruik: rev [bestand ...]\n"
 
+#: text-utils/tailf.c:53 text-utils/tailf.c:105
+#, c-format
+msgid "Cannot open \"%s\" for read\n"
+msgstr "Kan \"%s\" niet openen voor lezen\n"
+
+#: text-utils/tailf.c:93
+#, c-format
+msgid "Usage: tailf logfile\n"
+msgstr "Gebruik: tailf logbestand\n"
+
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
@@ -10093,3 +10094,159 @@ msgstr "Invoerregel te lang.\n"
 #, c-format
 msgid "Out of memory when growing buffer.\n"
 msgstr "Geheugentekort bij groeiende buffer.\n"
+
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Onjuist getal: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaxis fout: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Zo'n parameter bestaat niet: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] apparaat naam\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] apparaat grootte sect koppen sporen strekken gat ratio spec1 "
+#~ "fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] apparaat\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] apparaat\n"
+
+#~ msgid "version"
+#~ msgstr "versie"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "kon /dev/urandom niet openen"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "kon geen willekeurige gegevens lezen van /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "kon %s niet openen om te lezen"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "kan %s niet vinden"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s heeft niet de juiste bestandsinstellingen"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "kan geen gegevens lezen van %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Er zijn al teveel gebruikers ingelogd.\n"
+#~ "Probeer het later opnieuw.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "U heeft teveel processen draaien.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "Het wachtwoord moet tenminste 6 tekens lang zijn. Probeer opnieuw.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Het wachtwoord moet uit de volgende categorieen tekens bevatten:\n"
+#~ "hoofd- en kleine letters, cijfers en niet-alfanumerieke tekens.\n"
+#~ "Zie passwd(1) voor meer informatie.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "U kunt niet het oude wachtwoord gebruiken.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "Gebruik alstublieft niet iets wat lijkt op uw gebruikersnaam als "
+#~ "wachtwoord!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "Gebruik alstublieft niet iets wat lijkt op uw echte naam als wachtwoord!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Gebruik: passwd [gebruikersnaam [wachtwoord]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Alleen root mag de een- en twee-argumentsvormen gebruiken.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Gebruik: passwd [-foqsvV] [gebruiker [wachtwoord]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Kan niet uitvoeren %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kan inlognaam niet vinden"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Alleen root kan het wachtwoord van anderen wijzigen.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Teveel argumenten.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Kan de gebruikersnaam nergens vinden. Is `%s' echt een gebruiker?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Sorry, ik kan alleen lokale wachtwoorden wijzigen. Gebruik yppasswd in "
+#~ "plaats hiervan."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID en gebruikersnaam komen niet overeen, bedrieger!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Het wachtwoord van %s wordt gewijzigd\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Geef het oude wachtwoord: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Onjuist wachtwoord, bedrieger."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Geef het nieuwe wachtwoord: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Wachtwoord niet gewijzigd."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Geef opnieuw het nieuwe wachtwoord: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "U heeft het verkeerd ingevoerd. Wachtwoord niet gewijzigd."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "wachtwoord gewijzigd, gebruiker %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT WACHTWOORD GEWIJZIGD"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "wachtwoord gewijzigd door root, gebruiker %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "setpwnam aanroepen om wachtwoord in te stellen.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Wachtwoord *NIET* gewijzigd.  Probeer het later opnieuw.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Wachtwoord gewijzigd.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: deze versie is gecompileerd zonder ondersteuning voor de soort "
+#~ "`nfs'"
diff --git a/po/po2tbl.sed b/po/po2tbl.sed
deleted file mode 100644
index b3bcca4d7..000000000
--- a/po/po2tbl.sed
+++ /dev/null
@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# 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, 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.
-#
-1 {
-  i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
-  h
-  s/.*/0/
-  x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
new file mode 100644
index 000000000..5cbc70a0c
--- /dev/null
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e92b25ca4..ed285a8f5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11b\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2001-05-24 16:03-03:00\n"
 "Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -124,7 +124,7 @@ msgstr "%s: erro de leitura em %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Uso:\n"
@@ -168,13 +168,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "Uso: %s [ -n ] dispositivo\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s de %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -199,7 +198,7 @@ msgstr "Dupla"
 msgid "Single"
 msgstr "Simples"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -209,97 +208,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, fuzzy, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: erro de procura em %s\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, fuzzy, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, fuzzy, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: não compilado com suporte a minix v2\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, fuzzy, c-format
 msgid "%s is not a block device or file\n"
 msgstr "mount: %s não é um dispositivo de blocos"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: opção erro de parser\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -777,7 +776,7 @@ msgstr "muitos inodes - máximo é 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "pouco espaço, é necessário pelo menos %lu blocos"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -846,19 +845,19 @@ msgstr "erro gravando .. entrada"
 msgid "error closing %s"
 msgstr "erro fechando %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Uso: mkfs [-V] [-t tipoSistArq] [opções-sistArq] dispositivo [tamanho]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: memória insuficiente!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versão %s (%s)\n"
@@ -901,7 +900,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -954,10 +952,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, fuzzy, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1030,7 +1024,6 @@ msgstr "não foi possível gravar inodes"
 msgid "write failed in write_block"
 msgstr "gravação falhou em write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1066,7 +1059,7 @@ msgstr "busca falhou durante teste de blocos"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores estranhos em do_check: provavelmente erros\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "busca falhou em check_blocks"
 
@@ -1110,107 +1103,107 @@ msgstr "não foi possível stat %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "não será tentado criar sistema de arquivos em '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Tamanho de página especificado pelo usuário %d inválido\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Usando tamanho de página especificado pelo usuário %d, em vez dos valores do "
 "sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Assumindo páginas de tamanho %d (não %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "rótulo"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTamPág] dispositivo [blocos]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "número excessivo de páginas inválidas"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "uma página inválida\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d páginas inválidas\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s - erro: nenhum lugar para ativar permuta (swap)?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: erro - tamanho %ld é maior do que o tamanho do dispositivo %d\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s - erro: versão %d desconhecida\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s - erro: a área de permuta (swap) precisa ter pelo menos %ld kB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s -- aviso: reduzindo área de permuta (swap) para %ld kB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s - erro: nenhum lugar para ativar permuta (swap)?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Não será tentado criar dispositivo de permuta (swap) em '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fatal: primeira página ilegível"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1225,126 +1218,88 @@ msgstr ""
 "dispositivo, use\n"
 "a opção -f para forçar a criação.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Não foi possível configurar espaço de permuta (swap): ilegível"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Configurando espaço de permuta (swap) versão %d, tamanho = %ld bytes\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "Não foi possível rebobinar o dispositivo de permuta (swap)"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "Não foi possível gravar a página de assinatura"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync falhou"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Número inválido: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Erro de sintaxe: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Não há tal parâmetro definido: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, fuzzy, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "Uso: %s [ -p ] dispositivo\n"
-
-#: disk-utils/setfdprm.c:102
-#, fuzzy, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"       %s [ -p ] disp tam set cabeç trilhas ext   interv taxa spec1 "
-"fmt_interv\n"
-
-#: disk-utils/setfdprm.c:105
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "       %s [ -c | -y | -n | -d ] disp\n"
-
-#: disk-utils/setfdprm.c:107
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "       %s [ -c | -y | -n ] disp\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilizável"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Espaço livre"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 #, fuzzy
 msgid "Linux ext3"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 #, fuzzy
 msgid "Linux XFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 #, fuzzy
 msgid "Linux ReiserFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "HPFS do OS/2"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "IFS do OS/2"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "O disco foi alterado.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Reinicialize o sistema para assegurar que a tabela de partições seja "
 "atualizada corretamente.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1357,334 +1312,315 @@ msgstr ""
 "partição DOS 6.x, consulte a página de manual\n"
 "do cfdisk para obter informações adicionais.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERRO FATAL"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Pressione qualquer tecla para sair do cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Não foi possível realizar busca na unidade de disco"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Não foi possível ler a unidade de disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Não foi possível gravar na unidade de disco"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Número excessivo de partições"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "A partição começa antes do setor 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "A partição termina antes do setor 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "A partição começa depois do fim do disco"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "A partição se estende até depois do fim do disco"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "partições lógicas fora da ordem do disco"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "partições lógicas sobrepostas"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "partições lógicas aumentadas sobrepostas"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "!!!! Erro interno ao criar unidade lógica sem partição estendida !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Não é possível criar unidade lógica aqui -- criaria duas partições estendidas"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Item de menu longo demais. O menu pode ficar com aspecto estranho."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu sem direção. Assumindo horizontal como padrão."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Tecla ilegal"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Pressione uma tecla para continuar"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primária"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Cria uma nova partição primária"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Lógica"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Cria uma nova partição lógica"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Não criar uma partição"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Erro interno !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Tamanho (em MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Início"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Adicionar partição no início do espaço livre"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Fim"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Adicionar partição no final do espaço livre"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Espaço insuficiente para criação de partição estendida"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "nenhuma tabela de partições presente.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Assinatura inválida na tabela de partições"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Mostrar somente a tabela de partições"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "nenhuma tabela de partições presente.\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 "Foram especificados mais cilindros do que a quantidade que cabe no disco"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Não foi possível abrir a unidade de disco"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aberto somente para leitura - você não tem permissão para gravar"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Não foi possível obter o tamanho do disco"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partição primária inválida"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partição lógica inválida"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Aviso!! Isto pode destruir dados existentes no disco!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Tem certeza de que deseja gravar a tabela de partições no disco? (sim ou "
 "nao):"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nao"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "A tabela de partições NÃO foi gravada no disco"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "sim"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Responda `sim' ou `nao'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Gravando tabela de partições no disco..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "A tabela de partições foi gravada no disco"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Tabela de partições gravada, mas a releitura da tabela falhou. Reinicialize "
 "para atualizar a tabela."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Não existem partições primárias marcadas como inicializáveis. MBR DOS não "
 "pode inicializar isso."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Mais de uma partição primária está marcada como inicializável. MBR DOS não "
 "pode inicializar isso."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Digite um nome de arquivo ou pressione ENTER para exibir na tela: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Não foi possível abrir o arquivo '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidade de disco: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Setor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Setor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "  Nenhum  "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/lóg"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primária"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Lógica"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Inicializar"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "Concluído"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabela de partições de %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            Prim.    Últ.\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1693,7 +1629,7 @@ msgstr ""
 " # Tipo     Setor    Setor    Desloc. Compr.   Tipo sist. arqs. (ID)  "
 "Opções\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1702,481 +1638,478 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         --- Início ---       ---- Fim ----       Núm. inicial de\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Ops.  Cab. Set. Cil.  ID  Cab. Set. Cil.   Setor   Setores\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Brutos"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Mostrar a tabela usando formato de dados brutos"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Setores"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Mostrar a tabela ordenada por setores"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Mostrar somente a tabela de partições"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Não mostrar a tabela"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Tela de ajuda do cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Este é o cfdisk, um programa de particionamento de disco baseado em funções "
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "curses, que permite criar, excluir e alterar partições na unidade"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "de disco rígido."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Comando      Significado"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Alterna a opção da partição atual como inicializável."
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Exclui a partição atual."
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Altera parâmetros de cilindros, cabeças, setores por trilha"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             AVISO: Esta opção só deve ser usada por pessoas que"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             saibam exatamente o que estão fazendo."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza o uso de disco da partição atual."
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Isto pode tornar a partição incompatível com"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Cria uma nova partição a partir do espaço livre."
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Mostra a tabela de partições na tela ou em um arquivo."
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Pode-se selecionar diversos formatos diferentes para"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             uma partição:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Dados brutos (exatamente o que seria gravado no disco)."
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabela ordenada por setores."
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabela em formato bruto."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sai do programa sem gravar a tabela de partições."
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Altera o tipo de sistema de arquivos."
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Altera unidades de exibição do tamanho das partições."
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, setores e cilindros."
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Grava tabela de partições no disco (é necessário usar W "
 "maiúsculo)."
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Como esta opção pode destruir dados no disco, você deve"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             confirmar ou cancelar a gravação indicando `sim' ou"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `não'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Seta p/ cima  Move o cursor para a partição anterior."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Seta p/ baixo    Move o cursor para a próxima partição."
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Redesenha a tela."
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: Todos os comandos podem ser digitados em letras maiúsculas ou"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "minúsculas (exceto W)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Alterar geometria dos cilindros"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Cabeças"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Alterar geometria das cabeças"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Alterar geometria dos setores"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Concluído"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "A alteração da geometria foi concluída"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Digite o número de cilindros: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros inválido"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Digite o número de cabeças: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Valor de cabeças inválido"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Digite o número de setores por trilha: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Valor de setores inválido"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Digite o tipo do sistema de arquivos: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Não foi possível alterar o tipo de sistema de arquivos para vazio"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Não foi possível alterar o tipo de sistema de arquivos para estendido"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/lóg"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconhecido (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disco: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Cabeças: %d  Setores por Trilha: %d  Cilindros: %d"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Opções"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Tipo Part."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Tipo SA"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Rótulo]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr "  Setores"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Tam. (Mb)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Tam. (Gb)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Iniciali."
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Alterna a opção da partição atual como inicializável"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Excluir"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Excluir a partição atual"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Alterar a geometria do disco (somente para usuários avançados)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Mostrar tela de ajuda"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximize"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximizar o uso de disco para a partição atual (somente para usuários "
 "avançados)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Criar nova partição a partir do espaço livre"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Mostre"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Mostrar tabela de partições na tela ou imprimir em um arquivo"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Sair"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Sair do programa sem gravar a tabela de partições"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Alterar o tipo do sistema de arquivos (DOS, Linux, OS/2 e outros)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Mudar unidades mostradas para o tamanho das partições (MB, setores, "
 "cilindros)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Gravar"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Gravar tabela de partições no disco (isto poderá destruir dados)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Não foi possível tornar esta partição inicializável."
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Não foi possível excluir uma partição vazia"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Não foi possível maximizar esta partição"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Esta partição é inutilizável"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Esta partição já está sendo usada"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Não foi possível alterar o tipo de uma partição vazia"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Sem mais partições"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Comando inválido"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2250,9 +2183,9 @@ msgstr ""
 "\n"
 "Rótulo BSD do dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Comando - ação"
 
@@ -2272,10 +2205,9 @@ msgstr "   i   instala código de inicialização (bootstrap)"
 msgid "   l   list known filesystem types"
 msgstr "   l   lista os tipos de sistemas de arquivos conhecidos"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   mostra este menu"
 
@@ -2287,14 +2219,14 @@ msgstr "   n   cria uma nova partição BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   mostra a tabela de partições BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   sai sem salvar as alterações"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   voltar ao menu principal"
 
@@ -2329,21 +2261,21 @@ msgid "Reading disklabel of %s at sector %d.\n"
 msgstr "Lendo rótulo de disco de %s no setor %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
-#, c-format
+#, fuzzy, c-format
 msgid "There is no *BSD partition on %s.\n"
-msgstr "Não existe partição %BSD em %s.\n"
+msgstr "Não foi possível gravar a partição em %s\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
 msgstr "Comando para rótulo de disco BSD (tecle m para obter ajuda): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Último %s ou +tamanho ou +tamanho M ou  +tamanho K"
@@ -2388,8 +2320,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2490,8 +2420,8 @@ msgstr "setores/trilha"
 msgid "tracks/cylinder"
 msgstr "trilhas/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cilindros"
 
@@ -2548,7 +2478,7 @@ msgstr "Bootstrap (código de inicialização) instalado em %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partição (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "O número máximo de partições foi criado\n"
@@ -2572,7 +2502,7 @@ msgstr ""
 "\n"
 "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 #, fuzzy
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
@@ -2594,7 +2524,7 @@ msgstr ""
 "-u: dá Início e Fim em unidades de setor (em vez de cilindro).\n"
 "-b 2048: (para certas unidades MO) usar setores de  2048 bytes.\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2611,199 +2541,185 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Não foi possível ler %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Não foi possível realizar busca em %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Não foi possível gravar em %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE  falhou em %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Não foi possível alocar mais qualquer memória\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Erro fatal\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   alterna uma opção de somente leitura"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   edita rótulo BSD no disco"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   alterna a opção \"montável\""
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   exclui uma partição"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   lista os tipos de partição conhecidos"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   cria uma nova partição"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   cria uma nova tabela de partições DOS vazia"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   mostra a tabela de partições"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   cria um novo rótulo de disco Sun vazio"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   altera a identificação da partição para o sistema"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   altera as unidades das entradas mostradas"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   verifica a tabela de partições"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   grava a tabela no disco e sai"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   funcionalidade adicional (somente para usuários avançados)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   torna a partição inicializável"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   edita uma entrada de arquivo de inicialização"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   seleciona uma partição de permuta (swap) sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   alterna a opção \"inicializável\""
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   alterna a opção \"compatibilidade\""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   alterar número de cilindros alternativos"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   alterar número de cilindros"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   mostrar os dados sem formatação da tabela de partições"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   alterar número de setores extras por cilindro"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   alterar número de cabeças"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   alterar fator de \"interleave\""
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   alterar velocidade de rotação (RPM)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   alterar número de setores/trilha"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   alterar número de cilindros físicos"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   mover início dos dados em uma partição"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   listar partições estendidas"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 #, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   criar uma tabela de partições IRIX"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   corrige ordem de partição"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Você precisa configurar"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "cabeças"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "setores"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2812,11 +2728,11 @@ msgstr ""
 "%s%s.\n"
 "Você pode fazer isto a partir do menu de funções extras.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2836,29 +2752,29 @@ msgstr ""
 "2) inicialização e programas de particionamento de outros OSs\n"
 "   (p.ex., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Deslocamento inválido em uma partição primária estendida\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Aviso: ponteiro de vínculo extra na tabela de partições %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Aviso: ignorando dados extras na tabela de partições %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2871,24 +2787,24 @@ msgstr ""
 "o conteúdo anterior não poderá mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: o tamanho do setor é %d (não %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Você não poderá gravar a tabela de partições.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2897,17 +2813,17 @@ msgstr ""
 "O dispositivo não contém nem uma tabela de partições DOS válida nem um "
 "rótulo de disco Sun, OSF ou SGI\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Erro interno\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorando partição estendida extra %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2916,7 +2832,7 @@ msgstr ""
 "Aviso: a opção inválida 0x%04x da tabela de partições %d será corrigida por "
 "gravação (w)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2925,83 +2841,83 @@ msgstr ""
 "\n"
 "EOF (fim de arquivo) recebido três vezes - saindo...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Código hexadecimal (digite L para listar os códigos): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, padrão %d):"
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Usando valor padrão %d\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valor fora do intervalo.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Número da partição"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Aviso: a partição %d possui tipo vazio\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignorando partição estendida extra %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nenhuma partição definida\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "setor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Mudando as unidades das entradas mostradas para %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "AVISO: A partição %d é uma partição estendida\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "A opção de compatibilidade DOS está ativada\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "A opção de compatibilidade DOS não está ativada\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "A partição %d ainda não existe!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3014,7 +2930,7 @@ msgstr ""
 "tipo 0 não é recomendável. Você pode excluir\n"
 "uma partição usando o comando `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3023,7 +2939,7 @@ msgstr ""
 "Você não pode alterar uma partição normal para estendida ou vice-versa.\n"
 "Exclua a partição antes.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3034,7 +2950,7 @@ msgstr ""
 "uma vez que o SunOS/Solaris espera isto e até mesmo o Linux gosta disto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3045,59 +2961,59 @@ msgstr ""
 "e a partição 11 como um volume inteiro (6), uma vez que o IRIX espera isto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "O tipo da partição %d foi alterado para %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "A partição %d possui inícios físico/lógico diferentes (não Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fís. = (%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lógico = (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "A partição %d possui fins físico/lógico diferentes:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "A partição %i não inicia em um limite de cilindro:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "deveria ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "A partição %d não termina em um limite de cilindro.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3107,7 +3023,7 @@ msgstr ""
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -3115,19 +3031,19 @@ msgstr ""
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3136,7 +3052,7 @@ msgstr ""
 "Nada a fazer. Ordem já está correta\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3144,16 +3060,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Início      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3162,7 +3078,7 @@ msgstr ""
 "\n"
 "Partições lógicas fora da ordem do disco\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3173,85 +3089,85 @@ msgstr ""
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "No OA  Cb Set  Cil  Cb Set  Cil    Início    Tam  ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Aviso: a partição %d contém o setor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partição %d: a cabeça %d é maior do que o máximo: %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partição %d: o setor %d é maior do que o máximo: %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partição %d: o cilindro %d é maior do que o máximo: %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partição %d: os setores anteriores %d não estão de acordo com o total: %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Aviso: início de dados inválido na partição %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Aviso: a partição %d sobrepõe-se à partição %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Aviso: a partição %d está vazia\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "A partição lógica %d não está completamente na partição %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "O total de setores alocados, %d, é maior do que o máximo: %d\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%d setores não alocados\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "A partição %d já está definida. Exclua essa partição antes de adicioná-la "
 "novamente.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "O setor %d já está alocado\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Não há setores livres disponíveis\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3260,24 +3176,24 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Você precisa excluir alguma partição e adicionar uma partição estendida "
 "antes\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "partições lógicas fora da ordem do disco"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Partição primária inválida"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3288,20 +3204,20 @@ msgstr ""
 "   %s\n"
 "   p   partição primária (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   lógica (5 ou superior)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   estendida"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Número de partição inválido para o tipo `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3310,12 +3226,12 @@ msgstr ""
 "A tabela de partições foi alterada!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chamando ioctl() para reler tabela de partições.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3324,7 +3240,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3337,77 +3253,77 @@ msgstr ""
 "partição DOS 6.x, consulte a página de manual\n"
 "do fdisk para obter informações adicionais.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Erro no fechamento de %s\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "A partição %d não possui área de dados\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Novo início dos dados"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Comando avançado (m para ajuda): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Número de cilindros"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Número de cabeças"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Número de setores"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "O disco %s não contém uma tabela de partições válida\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando desconhecido:\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Este kernel localiza o tamanho de setor por conta própria - opção -b "
 "ignorada\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3416,19 +3332,18 @@ msgstr ""
 "Aviso: a opção -b (configurar tamanho de setor) deve ser usada com um "
 "dispositivo especificado\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Detectado um rótulo OSF/1 em %s, entrando em modo de rótulo.\n"
 "Para retornar ao modo de tabela de partições do DOS, use o comando 'r'.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Comando (m para ajuda): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3437,16 +3352,16 @@ msgstr ""
 "\n"
 "O arquivo de boot atual é: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Informe o nome do novo arquivo de boot: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Arquivo de boot inalterado\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3514,15 +3429,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3601,7 +3516,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s setor %5u tamanho %8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3660,7 +3574,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Mais do que uma entrada de disco inteiro presente.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nenhuma partição definida\n"
@@ -3745,7 +3659,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVocê escolheu um nome de arquivo de inicialização incomum.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3767,11 +3680,10 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja etiquetar esta partição de modo "
 "diferente.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr ""
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3842,44 +3754,43 @@ msgstr "Tentando manter os parâmetros da partição %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tINÍCIO=%d\tCOMPRIMENTO=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Vazia"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "root SunOS"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "permuta SunOS"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "usr SunOS"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disco inteiro"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "stand SunOS"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "var SunOS"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "home SunOS"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Detecção automática de RAID Linux"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3892,12 +3803,12 @@ msgstr ""
 "setores e\n"
 "partições ou forçar um rótulo novo (comando s no menu principal).\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "A configuração automática encontrou um(a) %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3910,7 +3821,7 @@ msgstr ""
 "o conteúdo anterior não poderá mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3920,72 +3831,72 @@ msgstr ""
 "   ?   configuração automática\n"
 "   0   personalizada (com padrões detectados por hardware)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Selecione o tipo (? para automática, 0 para personalizada): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "A configuração automática falhou.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Setores/trilha"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cilindros Alternativos"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cilindros físicos"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Velocidade de rotação (RPM)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Fator de \"Interleave\""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Setores extras por cilindro: "
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Você pode alterar todos os parâmetros do disco a partir do menu x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "Disquete de 3,5 pol."
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "A partição %d não termina em um limite de cilindro\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "A partição %d sobrepõe-se a outras nos setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervalo não utilizado - setores 0 - %d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervalo não utilizado - setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3994,7 +3905,7 @@ msgstr ""
 "Outras partições já cobrem o disco inteiro.\n"
 "Exclua ou reduza algumas antes de tentar novamente.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4005,7 +3916,7 @@ msgstr ""
 "%d %s cobre alguma outra partição. Sua entrada foi alterada\n"
 "para %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4014,7 +3925,7 @@ msgstr ""
 "Se você deseja manter compatibilidade com SunOS/Solaris, considere deixar\n"
 "esta partição como um disco inteiro (5), começando em 0, com %u setores\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4029,7 +3940,7 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja rotular esta partição como 82 "
 "(permuta do Linux): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4048,7 +3959,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4061,16 +3972,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Opção   Início      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Número de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Número de cilindros físicos"
 
@@ -4094,32 +4005,26 @@ msgstr "FAT16 < 32 M"
 msgid "Extended"
 msgstr "Estendida"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS ou NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX inicializável"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "Gerenc. Inicializ. OS/2"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 #, fuzzy
 msgid "W95 FAT32"
@@ -4130,7 +4035,6 @@ msgstr "FAT32 Win95"
 msgid "W95 FAT32 (LBA)"
 msgstr "FAT32 Win95 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 #, fuzzy
 msgid "W95 FAT16 (LBA)"
@@ -4228,12 +4132,10 @@ msgstr "DM OnTrack"
 msgid "OnTrack DM6 Aux1"
 msgstr "DM6 OnTrack Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "DM6 OnTrack Aux3"
@@ -4254,8 +4156,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Edisk Priam"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4265,7 +4165,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD ou SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4286,12 +4185,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Minix antigo"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Linux antigo/Minix"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4322,12 +4219,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "Hibernação IBM Thinkpad"
@@ -4336,7 +4231,6 @@ msgstr "Hibernação IBM Thinkpad"
 msgid "FreeBSD"
 msgstr ""
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4402,31 +4296,23 @@ msgstr "Dados Não-FS"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Utilitário Dell"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 #, fuzzy
 msgid "BootIt"
 msgstr "Inicializar"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "Acesso DOS"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "sist. arq. BeOS"
@@ -4435,119 +4321,112 @@ msgstr "sist. arq. BeOS"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr ""
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secundário"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "erro de busca em %s - não foi possível buscar até %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erro de busca: desejado 0x%08x%08x, obtido 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "memória insuficiente - desistindo\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "erro de leitura em %s - não foi possível ler o setor %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERRO: o setor %lu não possui uma assinatura MS-DOS\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "erro de gravação em %s - não foi possível gravar no setor %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 "não foi possível abrir o arquivo de salvamento de setor da partição (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "erro de gravação em %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "não foi possível stat arquivo de restauração de partição (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "o arquivo de restauração da partição possui tamanho incorreto - não "
 "restaurando\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "memória insuficiente?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "não foi possível abrir o arquivo de restauração de partição (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "erro na leitura de %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "não foi possível abrir o dispositivo %s para gravação\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "erro na gravação do setor %lu em %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: não foi possível obter a geometria\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: não foi possível obter o tamanho\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4558,22 +4437,22 @@ msgstr ""
 "inteiro. Usar fdisk nela provavelmente não trará qualquer resultado\n"
 "(use a opção --force se realmente quiser realizar esta operação).\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Aviso: HDIO_GETGEO informa que há %lu cabeças\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Aviso: HDIO_GETGEO informa que há %lu setores\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Aviso: BLKGETSIZE/HDIO_GETGEO informa que há %lu cilindros\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4583,7 +4462,7 @@ msgstr ""
 "Isto causará problemas a todo software que usar endereçamento Cil/Cab/"
 "Setor.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4592,7 +4471,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabeças, %lu setores/trilha\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4600,7 +4479,7 @@ msgstr ""
 "%s da partição %s possui valor impossível para cabeça: %lu (deveria estar "
 "entre 0 e %lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4609,7 +4488,7 @@ msgstr ""
 "%s da partição %s possui valor impossível para setor: %lu (deveria estar "
 "entre 1 e %lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4618,7 +4497,7 @@ msgstr ""
 "%s da partição %s possui valor impossível para o cilindro: %lu (deveria "
 "estar entre 0 e %lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4627,12 +4506,12 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Relendo a tabela de partições...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4640,31 +4519,31 @@ msgstr ""
 "O comando para reler a tabela de partições falhou.\n"
 "Reinicialize o sistema agora, antes de usar o mkfs.\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erro no fechamento de %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: partição inexistente\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "formato não reconhecido - usando setores\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabela de partição de %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato não implementado - usando %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4674,12 +4553,12 @@ msgstr ""
 "de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp   Boot Início    Fim   Cils    Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4688,12 +4567,12 @@ msgstr ""
 "Unidades = setores de 512 bytes, contando a partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp   Boot    Início      Fim  Setores   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4702,12 +4581,12 @@ msgstr ""
 "Unidades = blocos de 1024 bytes, contando a partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp   Boot   Início      Fim   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4717,33 +4596,33 @@ msgstr ""
 "partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp   Boot Início  Fim     MB   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tinício: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfim: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a partição termina no cilindro %ld, além do final do disco\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Nenhuma partição encontrada\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4754,86 +4633,86 @@ msgstr ""
 " para Cil/Cab/Set = */%ld/%ld (em vez de %ld/%ld/%ld).\n"
 "Para esta listagem será assumida aquela geometria.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "nenhuma tabela de partições presente.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "estranho, somente %d partições estão definidas.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Aviso: a partição %s possui tamanho 0, mas não está marcada como vazia\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Aviso: a partição %s possui tamanho 0 e é inicializável\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Aviso: a partição %s possui tamanho 0 e início diferente de zero\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Aviso: a partição %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "não está contida na partição %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Aviso: as partições %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "e %s se sobrepõem\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Aviso: a partição %s começa no setor 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Aviso: a partição %s se estende além do fim do disco\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 #, fuzzy
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr "Dentre as partições primárias, pelo menos uma pode ser estendida\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Aviso: a partição %s não inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Aviso: a partição %s não termina em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4843,7 +4722,7 @@ msgstr ""
 "Isto não faz diferença para o LILO, mas o MBR DOS não inicializará este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4851,7 +4730,7 @@ msgstr ""
 "Aviso: normalmente o boot pode ser dado somente de partições primárias.\n"
 "O LILO desconsidera o flag `inicializável'.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4860,12 +4739,12 @@ msgstr ""
 "Isto não faz diferença para o LILO, mas o MBR DOS não inicializará este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 #, fuzzy
 msgid "start"
 msgstr "status"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4873,163 +4752,162 @@ msgstr ""
 "partição %s - início: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,"
 "%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "envio"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partição %s - fim: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,%"
 "ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a partição %s termina no cilindro %ld, além do fim do disco\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, fuzzy, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr "Aviso: deslocamento inicia na partição extd de  %ld para %ld\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 #, fuzzy
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr "Aviso: a partição extendida não inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "número excessivo de partições - ignorando aquelas além do nº %d\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "árvore de partições?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gerenciador de disco detectado - não é possível tratar\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "Assinatura DM6 encontrada - desistindo\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estranho... uma partição estendida de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estranho... uma partição BSD de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: partição não reconhecida\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "a opção -n foi fornecida: nada foi alterado\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Não foi possível salvar os setores antigos - abortando\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Não foi possível gravar a partição em %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "linha de entrada longa demais ou incompleta - encerrando\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erro de entrada: `=' esperado após o campo %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "erro de entrada: caractere inesperado %c após o campo %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrada não reconhecida: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "número grande demais\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "lixo após o número\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "sem espaço para o descritor da partição\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "não foi possível criar a partição estendida envoltória\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "número excessivo de campos de entrada\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Não há espaço para mais\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Tipo inválido\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Aviso: tamanho dado (%lu) excede o tamanho máximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Atenção: partição vazia\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Aviso: início de partição inválido (mais adiantado %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "opção de inicialização não reconhecida: selecione - ou *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "especificação cil,cab,set parcial?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Partição estendida não está no lugar esperado\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "entrada inválida\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "Número excessivo de partições\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5041,47 +4919,43 @@ msgstr ""
 "Normalmente só é necessário especificar <início> e <tamanho> (e, talvez, "
 "<tipo>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versão"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opções] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: algo como /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "opções úteis:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ou --show-size]: lista o tamanho de uma partição"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ou --id]:        mostra ou altera a ID da partição"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lista as partições de cada dispositivo"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [ou --dump]:      idem, mas em um formato adequado para entrada "
 "posterior"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [ou --increment]: numera os cilindros, etc. a partir de 1, em vez de 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5089,56 +4963,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  aceita/informa em unidades de setores/blocos/"
 "cilindros/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ou --list-types]:lista os tipos de partição conhecidos"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [ou --DOS]:       para compatibilidade com DOS: desperdiça um pouco "
 "de espaço"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [ou --re-read]:   faz o kernel reler a tabela de partições"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                altera somente a partição de número #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 não grava no disco, realmente"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O arquivo :          salva os setores que serão sobrescritos em arquivo"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I arquivo :         restaura os setores gravados em arquivo"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   mostra a versão"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      mostra esta mensagem"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "opções perigosas:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [ou --show-geometry]: mostra a suposição do kernel sobre a geometria"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
@@ -5146,7 +5020,7 @@ msgid ""
 msgstr ""
 "    -g [ou --show-geometry]: mostra a suposição do kernel sobre a geometria"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5154,119 +5028,119 @@ msgstr ""
 "    -x [ou --show-extended]: também lista partições estendidas na saída\n"
 "                             ou espera descritores para elas na entrada"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [ou --Linux]:      não reclama de coisas irrelevantes para o Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      suprime mensagens de aviso"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Você pode anular a geometria detectada usando:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [ou --cylinders #]:define o número de cilindros a usar"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ou --heads #]:    define o número de cabeças a usar"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [ou --sectors #]:  define o número de setores a usar"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Você pode desativar todas as verificações de consistência com:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [ou --force]:      faça o que eu mandar, mesmo que seja idiota"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\tlista partições as ativas no dispositivo\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositivo n1 n2... ativa as partições n1..., deixando inativas as "
 "demais\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An dispositivo\n"
 " ativa a partição n, desativa as demais\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "nenhum comando?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %d blocos\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id dispositivo número-partição\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Uso: sfdisk --change-id dispositivo número-partição ID\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id dispositivo número-partição [ID]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "pode especificar somente um dispositivo (exceto com -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "não foi possível abrir %s\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "não foi possível abrir %s para leitura"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindros, %ld cabeças, %ld setores/trilha\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Não foi possível obter o tamanho de %s"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte ativo inválido: 0x%x em vez de 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5274,7 +5148,7 @@ msgstr ""
 "Concluído\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5283,35 +5157,35 @@ msgstr ""
 "Você possui %d partições primárias ativas. Isto não faz diferença para o\n"
 "LILO, mas o MBR DOS só inicializará em discos com uma partição ativa.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "a partição %s possui ID %x e não está escondida\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ID inválida: %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Este disco está atualmente sendo usado.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erro fatal: não foi possível encontrar %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Aviso: %s não é um dispositivo de blocos\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Verificando se ninguém está usando este disco no momento...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5324,30 +5198,30 @@ msgstr ""
 "todas as partições de permuta deste disco. Use a opção --no-reread para "
 "suprimir esta verificação.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Use a opção --force para cancelar todas as verificações.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Situação antiga:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "A partição %d não existe; não é possível alterá-la.\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Situação nova:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5355,21 +5229,21 @@ msgstr ""
 "Eu não gosto destas partições: nada foi alterado\n"
 "(se você realmente quiser usá-las, use a opção --force).\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Eu não gosto disto - provavelmente você deveria responder Não\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Você está satisfeito com isto? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Deseja gravar isto no disco? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5378,16 +5252,16 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada prematuro\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Saindo - nada foi alterado\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda y, n ou q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5396,7 +5270,7 @@ msgstr ""
 "Nova tabela de partições gravada com sucesso\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5501,135 +5375,135 @@ msgstr "getopt (melhorado) 1.1.0)\n"
 msgid "internal error, contact the author."
 msgstr "erro interno, entre em contato com o autor."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "boot executado do MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Relógio BCD Ruffian\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "porta do relógio ajustada para 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: %s atômico falhou por 1000 iterações!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Não é possível abrir /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Não consegui obter permissão porque não tentei.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s é incapaz de obter acesso à porta de E/S: a chamada iopl(3) falhou.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Provavelmente são necessários privilégios de root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Pressupondo que o relógio de hardware é mantido na hora %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "local"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Aviso: a terceira linha do arquivo adjtime não foi reconhecida\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Esperado: `UTC', `LOCAL'  ou nada.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, fuzzy, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Último ajuste de variação feito %d segundos após 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, fuzzy, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Última calibração feita %d segundos após 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "O relógio de hardware está na hora %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "desconhecida"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Aguardando tique do relógio...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "... tique do relógio obtido\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Valores inválidos no relógio de hardware: %4d/%.4d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hora do relógio de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos "
 "desde 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Hora lida do relógio de Hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, fuzzy, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Configurando o relógio de hardware para %.2d:%.2d:%.2d = %d segundos desde "
 "1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Relógio não alterado - apenas testando.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5638,7 +5512,7 @@ msgstr ""
 "O tempo decorrido desde o horário de referência foi de %.6f segundos.\n"
 " Atrasando mais para chegar ao próximo segundo cheio.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5648,22 +5522,22 @@ msgstr ""
 "50º dia do mês) ou além do intervalo que podemos manipular (p.ex., ano "
 "2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f segundos\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Não. Opção --date especificada\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, fuzzy, c-format
 msgid "--date argument too long\n"
 msgstr "fsname nome muito longo"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5672,22 +5546,22 @@ msgstr ""
 "O valor da opção --date não é uma data válida.\n"
 "Especificamente, ele contém aspas.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Emitindo comando date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Não foi possível executar o programa 'date' no shell /bin/sh: popen() falhou"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "resposta do comando date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5702,7 +5576,7 @@ msgstr ""
 "A resposta foi:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5719,12 +5593,12 @@ msgstr ""
 "A resposta foi:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, fuzzy, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "String de date %s equivale a %d segundos desde 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5733,37 +5607,37 @@ msgstr ""
 "O relógio de hardware não contém uma hora válida. Em função disso, não é "
 "possível configurar a hora do sistema a partir dele.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Chamando settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "O relógio do sistema não está sendo ajustado: executando em modo de teste.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "É necessário ser superusuário para ajustar o relógio do sistema.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() falhou"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5772,7 +5646,7 @@ msgstr ""
 "O fator de variação não está sendo ajustado porque o relógio de hardware "
 "continha lixo anteriormente.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, fuzzy, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5781,7 +5655,7 @@ msgstr ""
 "O fator de variação não está sendo ajustado porque menos de um dia se passou "
 "desde a última calibração.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5790,7 +5664,7 @@ msgstr ""
 "O fator de variação não está sendo ajustado porque menos de um dia se passou "
 "desde a última calibração.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5801,24 +5675,24 @@ msgstr ""
 "variação de %f segundos/dia.\n"
 "Ajustando o fator de variação em %f segundos/dia.\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "O tempo desde o último ajuste é de %d segundos\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "É necessário inserir %d segundos e referenciar a hora de %.6f segundos "
 "atrás\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "O arquivo adjtime não está sendo atualizado: modo de teste.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5827,12 +5701,12 @@ msgstr ""
 "Teria gravado o seguinte em %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Parâmetros de ajuste de variação não atualizados.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5840,29 +5714,29 @@ msgstr ""
 "O relógio de hardware não contém uma hora válida, portanto não é possível "
 "ajustá-lo.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "O ajuste necessário é menor do que um segundo, portanto o relógio não será "
 "ajustado.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Usando %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Não foi encontrada uma interface de relógio utilizável.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Não é possível ajustar o relógio do sistema.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5876,17 +5750,17 @@ msgstr ""
 "assim, supõe-se que não está sendo executada em uma Alpha no momento).  "
 "Nenhuma ação foi realizada.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Não foi possível obter o valor de epoch do kernel.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "O kernel está pressupondo um valor de epoch de %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5895,17 +5769,22 @@ msgstr ""
 "Para configurar o valor de epoch, é necessário usar a opção 'epoch' para "
 "informar para que valor configurá-lo.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Epoch não configurado para %d; apenas testando.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Não é possível configurar o valor de epoch no kernel.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s de %s\n"
+
+#: hwclock/hwclock.c:1196
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5968,7 +5847,7 @@ msgstr ""
 "  --epoch=ano  Especifica o ano inicial do valor \n"
 "                de epoch do relógio de hardware.\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5978,12 +5857,12 @@ msgstr ""
 "                informa a hwclock o tipo de Alpha que você tem (consulte "
 "hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s não aceita argumentos que não sejam de opção. Você forneceu %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5992,7 +5871,7 @@ msgstr ""
 "Você especificou múltiplas opções de função.\n"
 "Você só pode executar uma função por vez.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6001,7 +5880,7 @@ msgstr ""
 "%s: As opções --utc e --localtime são mutuamente exclusivas. Você "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6010,28 +5889,28 @@ msgstr ""
 "%s: As opções --utc e --localtime são mutuamente exclusivas. Você "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "Não há um horário para ajuste utilizável. Não é possível ajustar o relógio.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Somente o superusuário pode alterar o relógio de hardware.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Somente o superusuário pode alterar o relógio de hardware.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6040,13 +5919,13 @@ msgstr ""
 "Somente o superusuário pode alterar o epoch do relógio de hardware no "
 "kernel.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "Não é possível acessar o Relógio de Hardware por nenhum método conhecido.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6082,7 +5961,6 @@ msgstr "ioctl() não conseguiu ler a hora de /dev/tty1"
 msgid "ioctl KDSHWCLK failed"
 msgstr "ioctl KDSHWCLK falhou"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 #, fuzzy
 msgid "Can't open /dev/tty1 or /dev/vc/1"
@@ -6179,9 +6057,6 @@ msgstr "ioctl(RTC_EPOCH_READ) para %s falhou"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "lemos epoch %ld de %s com ioctl RTC_EPOCH_READ.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6208,7 +6083,6 @@ msgstr "ioctl(RTC_EPOCH_SET) para %s falhou"
 msgid "calling open_tty\n"
 msgstr "calling open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "calling termio_init\n"
@@ -6217,7 +6091,6 @@ msgstr "calling termio_init\n"
 msgid "writing init string\n"
 msgstr "writing string init\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "before autobaud\n"
@@ -6231,7 +6104,6 @@ msgstr "waiting for cr-lf\n"
 msgid "read %c\n"
 msgstr "read %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "reading login name\n"
@@ -6285,7 +6157,6 @@ msgstr "/dev: chdir() falhou: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s não é um dispositivo de caracteres"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6300,12 +6171,10 @@ msgstr "/dev/%s: não foi possível abrir como entrada padrão: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: não está aberto para leitura/gravação"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duping\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6348,30 +6217,25 @@ msgstr ""
 "ou\t[-hiLmw] [-l programa_login] [-t tempo_limite] [-I string_inic] [-H "
 "host_login] linha taxa_baud,... [tipo_term]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: pouca memória; o login pode falhar\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "não foi possível malloc para ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "não foi possível malloc para grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login em %s de %s negado como padrão.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login em %s de %s negado.\n"
@@ -6416,8 +6280,8 @@ msgstr "Alterando informações de finger de %s.\n"
 msgid "Password error."
 msgstr "Erro de senha."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Senha:"
@@ -6596,34 +6460,6 @@ msgstr "Use %s -l para ver a lista.\n"
 msgid "No known shells.\n"
 msgstr "Nenhum interpretador de comandos conhecido.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "não foi possível abrir /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "não foi possível ler dados aleatórios de /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "não foi possível abrir %s para leitura"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "não foi possível stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s não possui os modos de arquivo corretos"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "não foi possível ler dados de %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6633,11 +6469,11 @@ msgstr "Não foi possível ler %s; saindo."
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "Uso: last [-#] [-f arquivo] [-t tty] [-h nome_host] [usuário ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  ainda conectado"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6646,15 +6482,15 @@ msgstr ""
 "\n"
 "wtmp inicia %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: falha de malloc.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6663,51 +6499,45 @@ msgstr ""
 "\n"
 "interrompido %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: não foi possível abrir %s: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h somente pode ser especificado pelo superusuário.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Uso: login [-fp] [nome_usuário]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: falha de PAM; abortando: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Não foi possível inicializar o PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "LOGIN FALHOU: %d A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6716,18 +6546,18 @@ msgstr ""
 "Login incorreto\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 "NÚMERO EXCESSIVO DE TENTATIVAS DE LOGIN (%d) A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "SESSÃO DE LOGIN FALHOU: A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6736,143 +6566,128 @@ msgstr ""
 "\n"
 "Login incorreto\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, fuzzy, c-format
 msgid "login: Out of memory\n"
 msgstr "%s: memória insuficiente!\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Nome de usuário inválido"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s: login recusado neste terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s: LOGIN RECUSADO A PARTIR DE %s NO TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s: LOGIN RECUSADO NO TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorreto\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Número máximo de usuários já conectados.\n"
-"Tente novamente mais tarde.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Número excessivo de processos em execução.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DISCAGEM EM %s POR %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN COMO ROOT EM %s A PARTIR DE %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN COMO ROOT EM %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN EM %s POR %s A PARTIR DE %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN EM %s POR %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, fuzzy, c-format
 msgid "You have new mail.\n"
 msgstr "Você tem mensagens %s na caixa de correio.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, fuzzy, c-format
 msgid "You have mail.\n"
 msgstr "Você tem mensagens %s na caixa de correio.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: falha em fork: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() falhou"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "O diretório %s não existe!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Fazendo login com home = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: não há memória para script de interpretador de comandos.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 "login: não foi possível executar o script do interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: não existe interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6881,65 +6696,65 @@ msgstr ""
 "\n"
 "%s usuário: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "nome de login longo demais.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NOME longo demais"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "nomes de login não podem iniciar com '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "Número excessivo de saltos de linha.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "Saltos de linha EXCESSIVOS"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Tempo de login esgotado após %d segundos\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Último login: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "a partir de %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "em: %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "FALHA DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "FALHA DE LOGIN EM %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALHAS DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALHAS DE LOGIN EM %s, %s"
@@ -6959,165 +6774,30 @@ msgstr "é n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Uso: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Quem é você?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: grupo inexistente."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: permissão negada"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Interpretador de comandos inexistente"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "A senha deve ter pelo menos 6 caracteres; tente novamente.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Você não pode reutilizar a senha antiga.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Não use algo como seu nome de usuário como senha!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Não use algo como seu nome real como senha!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Uso: passwd [nome_usuário [senha]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Somente root pode usar os formatos de um e dois argumentos.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Uso: passwd [-foqsvV] [nome_usuário [senha]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Não foi possível exec %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Não foi possível localizar o nome de login"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Somente root pode alterar senhas de terceiros.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Número excessivo de argumentos.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"Não foi possível encontrar o nome de usuário em nenhum lugar. `%s' realmente "
-"é um nome de usuário?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Eu só posso alterar senhas locais. Use yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "Nome de usuário e UID não correspondem, impostor!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Alterando a senha para o usuário %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Informe a senha anterior: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Senha incorreta, impostor."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Informe a nova senha: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "A senha NÃO foi alterada."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Redigite a nova senha: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Você não a informou corretamente. A senha não foi alterada."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "senha alterada, usuário %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "A SENHA DO ROOT FOI ALTERADA"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "senha alterada pelo root, usuário %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "chamando setpwnam para definir a senha.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "A senha *NÃO* foi alterada. Tente novamente mais tarde.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Senha alterada.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7164,7 +6844,6 @@ msgstr "%s por %s: %s"
 msgid "halted by %s: %s"
 msgstr "%s por %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7201,7 +6880,6 @@ msgstr "Executando o programa \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Erro ao executar\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7291,7 +6969,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr "erro executando fnalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "erro fazendo fork finalprog\n"
@@ -7320,7 +6997,7 @@ msgstr "abertura do diretório falhou\n"
 msgid "fork failed\n"
 msgstr "o fork falhou\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "exec falhou\n"
 
@@ -7470,12 +7147,6 @@ msgstr "valor de mês inválido: use 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "valor de ano inválido: use 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7486,13 +7157,12 @@ msgstr ""
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "Uso: cal [-mjyV] [[mês] ano]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Uso: %s [+formato] [dia mês ano]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Dia de São Tib"
 
@@ -7624,7 +7294,7 @@ msgstr "%s: não foi possível renomear %s para %s. falha: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "chamada: %s de para arquivos...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7635,22 +7305,22 @@ msgstr ""
 "Use `%s [opções] %s' se você realmente quer usar isto.\n"
 "Script não iniciado.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, fuzzy, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Uso: script [-a] [-f] [-q] [arquivo]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado, o arquivo é %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado em %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7659,254 +7329,253 @@ msgstr ""
 "\n"
 "Script concluído em %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script concluído, o arquivo é %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty falhou\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "ptys esgotados\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: erro de argumento; uso\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nome_terminal ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NUM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file arquivo_descarga ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq num_freq ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "não é possível alterar o estado do modo de conservação de energia\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "erro de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Erro ao ler %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Erro ao gravar descarga de tela\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "não foi possível ler %s e não é possível realizar ioctl da descarga\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM indefinido.\n"
@@ -7981,10 +7650,6 @@ msgstr "Aviso: não foi possível abrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: não foi possível abrir %s - usando %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8289,85 +7954,76 @@ msgstr "mount: não foi possível abrir %s para configuração da velocidade"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: não foi possível configurar velocidade: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: não foi possível realizar fork: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: esta versão foi compilada sem suporte ao tipo `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 "mount: falhou com o mount do nfs versão 4, tentando com o 3..\n"
 " \n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: não foi possível determinar o tipo do sistema de arquivos e nenhum "
 "foi especificado"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: você precisa especificar o tipo do sistema de arquivos"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: a montagem falhou"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: o ponto de montagem %s não é um diretório"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: permissão negada"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: é necessário ser superusuário para montar"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s está ocupado"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc já montado"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s já montado ou %s ocupado"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: o ponto de montagem %s não existe"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: o ponto de montagem %s é um vínculo simbólico para lugar algum"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: o dispositivo especial %s não existe"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8376,12 +8032,12 @@ msgstr ""
 "mount: o dispositivo especial %s não existe\n"
 "       (um prefixo de caminho não é um diretório)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s já não está montado ou opção inválida"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8391,72 +8047,71 @@ msgstr ""
 "inválido em %s,\n"
 "       ou número excessivo de sistemas de arquivos montados"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "tabela de montagem cheia"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: não foi possível ler o superbloco"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: dispositivo de blocos desconhecido"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   lista os tipos de sistemas de arquivos conhecidos"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: provavelmente você queria dizer %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: talvez você quisesse dizer iso9660?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: talvez você quisesse dizer iso9660?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s possui número de dispositivo incorreto ou o tipo de sistema de "
 "arquivos %s não é suportado"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s não é um dispositivo de blocos e stat falha?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8465,72 +8120,67 @@ msgstr ""
 "mount: o kernel não reconhece %s como dispositivo de blocos\n"
 "       (talvez `insmod driver'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s não é um dispositivo de blocos (talvez tentar `-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s não é um dispositivo de blocos"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s não é um dispositivo de blocos válido"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "dispositivo de blocos "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: não foi possível montar %s%s somente para leitura"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s é protegido contra gravação mas a opção -w foi passada"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s é protegido contra gravação; montando somente para leitura"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr "mount: nenhum tipo foi fornecido - supondo smbfs por causa xxx\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: tentando montar em segundo plano \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: desistindo de \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s já montado em %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8577,34 +8227,34 @@ msgstr ""
 "Outras opções: [-nfFrsvw] [-o opções].\n"
 "Para mais detalhes, consulte `man 8 mount'.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: operação exclusiva de root"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: tal partição não foi encontrada"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: não foi possível localizar %s em %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: não foi possível localizar %s em %s ou %s"
@@ -8639,98 +8289,98 @@ msgstr "       experimentarei o tipo %s\n"
 msgid "Trying %s\n"
 msgstr "Experimentando %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argumento host:dir excessivamente longo\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: aviso: nomes de host múltiplos não são suportados\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: diretório a montar não está no formato host:dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: não é possível obter endereço para %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: obtido hp->h_length inválido\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argumento de opção excessivamente longo\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Aviso: opção proto= não reconhecida.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Aviso: a opção namlen não é suportada.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "parâmetro de montagem de nfs desconhecido: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Aviso: a opção nolock não é suportada.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "opção de montagem de nfs desconhecida: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: obtido hp->h_length inválido?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sobre TCP não é suportado.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "usado portmapper para localizar porta NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "usando porta %d para o daemon do nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valor de retorno de status de nfs desconhecido: %d"
@@ -8739,7 +8389,7 @@ msgstr "valor de retorno de status de nfs desconhecido: %d"
 msgid "bug in xstrndup call"
 msgstr "erro na chamada a xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8752,7 +8402,7 @@ msgstr ""
 "       %s [-v] [-p prioridade] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8764,141 +8414,139 @@ msgstr ""
 "       %s [-v] [-p prioridade] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s em %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: não foi possível localizar \"_stext\" em %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: não foi possível stat %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: aviso: %s possui permissões inseguras %04o; sugere-se 0600\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: ignorando arquivo %s - ele parece ter buracos.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: não foi possível abrir %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sem suporte a -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: não foi possível realizar fork: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, diretório: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: não foi possível obter endereço de %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: obtido hostp->h_length inválido\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de blocos inválido"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: não montado"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: não foi possível gravar superbloco"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: o dispositivo está ocupado"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: não encontrado"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: precisa ser superusuário para desmontar"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: dispositivos de blocos não permitidos no sistema de arquivos"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "não existe umount2, tentando umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "não foi possível efetuar umount em %s - tentando %s em vez dele\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s está ocupado - remontado somente para leitura\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: não foi possível remontar %s somente para leitura\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmontado\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: não foi possível localizar a lista de sistemas de arquivos a "
 "desmontar"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, fuzzy, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8909,48 +8557,47 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t tipos_sist_arq_virt]\n"
 "       umount [-f] [-r] [-n] [-v] especial | nó...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentando desmontar %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Não foi possível localizar %s em mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s não está montado (de acordo com mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s está montado múltiplas vezes"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s não está na fstab (e você não é root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: a montagem de %s não está de acordo com a fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: somente %s pode desmontar %s de %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: operação exclusiva de root"
 
@@ -9108,7 +8755,7 @@ msgstr "%s: sinal desconhecido %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9277,8 +8924,6 @@ msgstr "o kernel não está configurado para memória compartilhada\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "- Limites da memória compartilhada -\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
@@ -10065,17 +9710,17 @@ msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f arq_fmt] [-n compr] [-s pular] "
 "[arquivo ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "Uso: %s [-dflpcsu] [+número_da_linha | +/padrão] nome1 nome2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: sinal desconhecido %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10086,8 +9731,7 @@ msgstr ""
 "*** %s: diretório ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10098,47 +9742,47 @@ msgstr ""
 "******** %s: não é um arquivo de texto ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Use q ou Q para sair]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Mais--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Próximo arquivo: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Pressione espaço para continuar, 'q' para sair.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, fuzzy, c-format
 msgid "...back %d pages"
 msgstr "...voltar %d página(s)"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 #, fuzzy
 msgid "...back 1 page"
 msgstr "...voltar %d página(s)"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 #, fuzzy
 msgid "...skipping one line"
 msgstr "... pulando %d linha(s)"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "... pulando %d linha(s)"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10148,7 +9792,7 @@ msgstr ""
 "***Voltar***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10156,7 +9800,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10179,34 +9823,34 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pressione 'h' para obter instruções.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linha %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Não é um arquivo] linha %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Estouro\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...pulando\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Expressão regular malformada"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10214,15 +9858,15 @@ msgstr ""
 "\n"
 "Padrão não encontrado\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Padrão não encontrado"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "não foi possível realizar fork\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10230,21 +9874,21 @@ msgstr ""
 "\n"
 "...Pulando "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 #, fuzzy
 msgid "...Skipping to file "
 msgstr "...Pulando "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 #, fuzzy
 msgid "...Skipping back to file "
 msgstr "de volta ao arquivo"
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Linha longa demais"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Não há comando anterior para ser substituído"
 
@@ -10297,98 +9941,95 @@ msgstr "hexdump: formato inválido{%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: caractere de conversão inválido %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "a opção `%s' exige um argumento\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "Tecla ilegal"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...pulando\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...pulando\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 #, fuzzy
 msgid "No next file"
 msgstr "(Próximo arquivo: %s)"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 #, fuzzy
 msgid "No previous file"
 msgstr "Nenhuma partição definida\n"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: erro de leitura em %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: erro de procura em %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: não foi possível ler arquivo temporário.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 #, fuzzy
 msgid "RE error: "
 msgstr ", erro"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 #, fuzzy
 msgid "Cannot open "
 msgstr "Não foi possível abrir %s\n"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 #, fuzzy
 msgid "saved"
 msgstr "envio"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "A senha *NÃO* foi alterada. Tente novamente mais tarde.\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 #, fuzzy
 msgid "(Next file: "
 msgstr "(Próximo arquivo: %s)"
@@ -10443,6 +10084,151 @@ msgstr "Linha de entrada longa demais.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Falta memória quando o buffer cresce.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Número inválido: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Erro de sintaxe: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Não há tal parâmetro definido: '%s'\n"
+
+#, fuzzy
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "Uso: %s [ -p ] dispositivo\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "       %s [ -p ] disp tam set cabeç trilhas ext   interv taxa spec1 "
+#~ "fmt_interv\n"
+
+#, fuzzy
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "       %s [ -c | -y | -n | -d ] disp\n"
+
+#, fuzzy
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "       %s [ -c | -y | -n ] disp\n"
+
+#~ msgid "version"
+#~ msgstr "versão"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "não foi possível abrir /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "não foi possível ler dados aleatórios de /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "não foi possível abrir %s para leitura"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "não foi possível stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s não possui os modos de arquivo corretos"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "não foi possível ler dados de %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Número máximo de usuários já conectados.\n"
+#~ "Tente novamente mais tarde.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Número excessivo de processos em execução.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "A senha deve ter pelo menos 6 caracteres; tente novamente.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Você não pode reutilizar a senha antiga.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Não use algo como seu nome de usuário como senha!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Não use algo como seu nome real como senha!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Uso: passwd [nome_usuário [senha]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Somente root pode usar os formatos de um e dois argumentos.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Uso: passwd [-foqsvV] [nome_usuário [senha]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Não foi possível exec %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Não foi possível localizar o nome de login"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Somente root pode alterar senhas de terceiros.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Número excessivo de argumentos.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Não foi possível encontrar o nome de usuário em nenhum lugar. `%s' "
+#~ "realmente é um nome de usuário?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr "Eu só posso alterar senhas locais. Use yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "Nome de usuário e UID não correspondem, impostor!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Alterando a senha para o usuário %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Informe a senha anterior: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Senha incorreta, impostor."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Informe a nova senha: "
+
+#~ msgid "Password not changed."
+#~ msgstr "A senha NÃO foi alterada."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Redigite a nova senha: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Você não a informou corretamente. A senha não foi alterada."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "senha alterada, usuário %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "A SENHA DO ROOT FOI ALTERADA"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "senha alterada pelo root, usuário %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "chamando setpwnam para definir a senha.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "A senha *NÃO* foi alterada. Tente novamente mais tarde.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Senha alterada.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: esta versão foi compilada sem suporte ao tipo `nfs'"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Aviso: excluindo partições após %d\n"
diff --git a/po/quot.sed b/po/quot.sed
new file mode 100644
index 000000000..0122c4631
--- /dev/null
+++ b/po/quot.sed
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/“\1�/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“�/""/g
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
new file mode 100644
index 000000000..2436c49e7
--- /dev/null
+++ b/po/remove-potcdate.sin
@@ -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
+}
diff --git a/po/ru.gmo b/po/ru.gmo
new file mode 100644
index 000000000..65b143623
--- /dev/null
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index f09d14307..2ec7ba0c3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,14 +1,15 @@
+# Translation of util-linux-2.12q.po to Russian
 # Translation of util-linux-2.12m.po to Russian
 # Copyright (C) 2003 Free Software Foundation Inc.
 # This file is put in the public domain.
-# Pavel Maryanov <acid_jack@ukr.net>, 2003, 2004.
+# Pavel Maryanov <acid_jack@ukr.net>, 2003, 2004, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-21 18:46-0500\n"
-"PO-Revision-Date: 2004-12-22 12:42+0200\n"
+"Project-Id-Version: util-linux-2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-25 15:41+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -114,7 +115,7 @@ msgstr "%s: ÏÛÉÂËÁ ÕÐÒÁ×ÌÅÎÉÑ ××ÏÄÏÍ-×Ù×ÏÄÏÍ ÎÁ %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "þÔ    úÐ   óËÔ   âÌË   îÁÞóÅËÔ     òÁÚÍÅÒ    õÓÔÒÏÊÓÔ×Ï\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
@@ -158,13 +159,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ -n ] ÕÓÔÒÏÊÓÔ×Ï\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s ÉÚ %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -189,7 +189,7 @@ msgstr "ä×ÏÊÎÏÊ"
 msgid "Single"
 msgstr "ïÄÉÎÁÒÎÙÊ"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -204,97 +204,99 @@ msgstr ""
 " -v         ÐÏÄÒÏÂÎÙÊ ÒÅÖÉÍ\n"
 " ÆÁÊÌ       ÆÁÊÌ ÄÌÑ ÐÒÏ×ÅÒËÉ\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: ÏÛÉÂËÁ %d ÐÒÉ ÒÁÓÐÁËÏ×ËÅ! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: ÏÛÉÂËÁ ÒÁÚÍÅÒÁ × ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÅ `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  ÒÁÓÐÁËÏ×Ù×ÁÅÔÓÑ ÂÌÏË %ld × %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: ÆÉËÔÉ×ÎÙÊ ÒÅÖÉÍ ÎÁ `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  'ÄÙÒÁ' × %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: îÅÂÌÏÞÎÙÅ (%ld) ÂÁÊÔÙ\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: âÅÚÒÁÚÍÅÒÎÙÅ (%ld ÐÒÏÔÉ× %ld) ÂÁÊÔÙ\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂÏÞÎÁÑ ÄÌÉÎÁ ÐÕÔÉ\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: ÏÔËÏÍÐÉÌÉÒÏ×ÁÎ ÂÅÚ ÐÏÄÄÅÒÖËÉ -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ - ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÒÁÚÍÅÒ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ ÉÌÉ ÆÁÊÌÏÍ\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÒÁÚÍÅÒ ÆÁÊÌÁ ÓÌÉÛËÏÍ ÍÁÌ\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂÏÞÎÙÊ magic\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ - ÒÁÚÍÅÒ ÆÁÊÌÁ ÓÌÉÛËÏÍ ×ÅÌÉË. ÒÁÚÄÕ×ÛÉÊÓÑ ÏÂÒÁÚ?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂËÁ crc\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ - ÓÔÁÒÙÊ ÏÂÒÁÚ cramfs, ÎÅÔ CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂÏÞÎÙÊ ÓÕÐÅÒÂÌÏË\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
-msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ËÏÎÅà ÄÁÎÎÙÈ ËÁÔÁÌÏÇÁ (%ld) != ÎÁÞÁÌÏ ÄÁÎÎÙÈ ÆÁÊÌÁ (%ld)\n"
+msgstr ""
+"%s: ÎÅ×ÅÒÎÙÊ cramfs - ËÏÎÅà ÄÁÎÎÙÈ ËÁÔÁÌÏÇÁ (%ld) != ÎÁÞÁÌÏ ÄÁÎÎÙÈ ÆÁÊÌÁ (%"
+"ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂÏÞÎÏÅ ÓÍÅÝÅÎÉÅ ÄÁÎÎÙÈ ÆÁÊÌÁ\n"
@@ -770,7 +772,7 @@ msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ inode'Ï×, ÍÁËÓÉÍÕÍ - 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "ÎÅ È×ÁÔÁÅÔ ÍÅÓÔÁ, ÎÕÖÎÏ ËÁË ÍÉÎÉÍÕÍ %lu ÂÌÏËÏ×"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "õÓÔÒÏÊÓÔ×Ï: %s\n"
@@ -839,18 +841,18 @@ msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ .. ÜÌÅÍÅÎÔÁ"
 msgid "error closing %s"
 msgstr "ÏÛÉÂËÁ ÚÁËÒÙÔÉÑ %s"
 
-#: disk-utils/mkfs.c:76
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: mkfs [-V] [-t ÔÉÐ_ÆÓ] [ÏÐÃÉÉ_ÆÓ] ÕÓÔÒÏÊÓÔ×Ï [ÒÁÚÍÅÒ]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:347 getopt/getopt.c:89
-#: getopt/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
+#: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ!\n"
 
-#: disk-utils/mkfs.c:99
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs ×ÅÒÓÉÉ %s (%s)\n"
@@ -858,7 +860,8 @@ msgstr "mkfs ×ÅÒÓÉÉ %s (%s)\n"
 #: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
-"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
+"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
+"outfile\n"
 " -h         print this help\n"
 " -v         be verbose\n"
 " -E         make all warnings errors (non-zero exit status)\n"
@@ -872,16 +875,20 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-h] [-v] [-b ÒÚÍ_ÂÌË] [-e ÉÚÄÁÎÉÅ] [-i ÆÁÊÌ] [-n ÉÍÑ] ÉÍÑ_ËÁÔ ×ÙÈ_ÆÁÊÌ\n"
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-h] [-v] [-b ÒÚÍ_ÂÌË] [-e ÉÚÄÁÎÉÅ] [-i ÆÁÊÌ] [-n ÉÍÑ] "
+"ÉÍÑ_ËÁÔ ×ÙÈ_ÆÁÊÌ\n"
 " -h         ×Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ\n"
 " -v         ÐÏÄÒÏÂÎÙÊ ÒÅÖÉÍ\n"
-" -E         ÓÏÚÄÁÎÉÅ ×ÓÅÈ ÏÛÉÂÏË Ó ÐÒÅÄÕÐÒÅÖÄÅÎÉÅÍ (ÎÅÎÕÌÅ×ÏÊ ÓÔÁÔÕÓ ×ÙÈÏÄÁ)\n"
-" -b ÒÚÍ_ÂÌË ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÏÇÏ ÒÁÚÍÅÒÁ ÂÌÏËÁ, ÄÏÌÖÅÎ ÒÁ×ÎÑÔØÓÑ ÒÁÚÍÅÒÕ ÓÔÒÁÎÉÃÙ\n"
+" -E         ÓÏÚÄÁÎÉÅ ×ÓÅÈ ÏÛÉÂÏË Ó ÐÒÅÄÕÐÒÅÖÄÅÎÉÅÍ (ÎÅÎÕÌÅ×ÏÊ ÓÔÁÔÕÓ "
+"×ÙÈÏÄÁ)\n"
+" -b ÒÚÍ_ÂÌË ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÏÇÏ ÒÁÚÍÅÒÁ ÂÌÏËÁ, ÄÏÌÖÅÎ ÒÁ×ÎÑÔØÓÑ ÒÁÚÍÅÒÕ "
+"ÓÔÒÁÎÉÃÙ\n"
 " -e ÉÚÄÁÎÉÅ ÕÓÔÁÎÏ×ËÁ ÎÏÍÅÒÁ ÉÚÄÁÎÉÑ (ÞÁÓÔØ fsid)\n"
 " -i ÆÁÊÌ    ×ÓÔÁ×ËÁ ÆÁÊÌÁ ÏÂÒÁÚÁ × ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ (ÔÒÅÂÕÅÔÓÑ >= 2.4.0)\n"
 " -n ÉÍÑ     ÕÓÔÁÎÏ×ËÁ ÉÍÅÎÉ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ cramfs\n"
 " -p         ÚÁÐÏÌÎÅÎÉÅ %d ÂÁÊÔÁÍÉ ÄÌÑ ÚÁÇÒÕÚÏÞÎÏÇÏ ËÏÄÁ\n"
-" -s         ÓÏÒÔÉÒÏ×ËÁ ÓÏÄÅÒÖÉÍÏÇÏ ËÁÔÁÌÏÇÁ (ÕÓÔÁÒÅ×ÛÁÑ ÏÐÃÉÑ, ÉÇÎÏÒÉÒÕÅÔÓÑ)\n"
+" -s         ÓÏÒÔÉÒÏ×ËÁ ÓÏÄÅÒÖÉÍÏÇÏ ËÁÔÁÌÏÇÁ (ÕÓÔÁÒÅ×ÛÁÑ ÏÐÃÉÑ, "
+"ÉÇÎÏÒÉÒÕÅÔÓÑ)\n"
 " -z         ÓÏÚÄÁÎÉÅ Ñ×ÎÙÈ ÄÙÒ (ÔÒÅÂÕÅÔÓÑ >= 2.3.39)\n"
 " ÉÍÑ_ËÁÔ    ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÓÖÉÍÁÅÍÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ\n"
 " ×ÙÈ_ÆÁÊÌ   ×ÙÈÏÄÎÏÊ ÆÁÊÌ\n"
@@ -893,7 +900,8 @@ msgid ""
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 "îÁÊÄÅÎÏ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ (%u ÂÁÊÔ) ÉÍÑ ÆÁÊÌÁ `%s'.\n"
-" ðÏÖÁÌÕÊÓÔÁ, Õ×ÅÌÉÞØÔÅ MAX_INPUT_NAMELEN × mkcramfs.c É ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ.  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
+" ðÏÖÁÌÕÊÓÔÁ, Õ×ÅÌÉÞØÔÅ MAX_INPUT_NAMELEN × mkcramfs.c É ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ.  "
+"úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
@@ -902,8 +910,12 @@ msgstr "ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ ÓÌÉÛËÏÍ ×ÅÌÉËÁ.  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
-msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
-msgstr "ðÒÅ×ÙÛÅÎ MAXENTRIES.  õ×ÅÌÉÞØÔÅ ÜÔÏ ÚÎÁÞÅÎÉÅ × mkcramfs.c É ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ.  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
+msgid ""
+"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
+"Exiting.\n"
+msgstr ""
+"ðÒÅ×ÙÛÅÎ MAXENTRIES.  õ×ÅÌÉÞØÔÅ ÜÔÏ ÚÎÁÞÅÎÉÅ × mkcramfs.c É "
+"ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ.  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
@@ -917,8 +929,13 @@ msgstr "%6.2f%% (%+d ÂÁÊÔ)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:819
 #, c-format
-msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
-msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÉÂÌÉÚÉÔÅÌØÎÏ ÔÒÅÂÕÅÍÙÊ ÒÁÚÍÅÒ (×ÅÒÈÎÑÑ ÇÒÁÎÉÃÁ) ÓÏÓÔÁ×ÌÑÅÔ %Ldíâ, Á ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÏÂÒÁÚÁ - %uíâ.  ÷ÏÚÍÏÖÎÏ ÐÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB.  We might die prematurely.\n"
+msgstr ""
+"ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÉÂÌÉÚÉÔÅÌØÎÏ ÔÒÅÂÕÅÍÙÊ ÒÁÚÍÅÒ (×ÅÒÈÎÑÑ ÇÒÁÎÉÃÁ) ÓÏÓÔÁ×ÌÑÅÔ "
+"%Ldíâ, Á ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÏÂÒÁÚÁ - %uíâ.  ÷ÏÚÍÏÖÎÏ ÐÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ "
+"ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
 #, c-format
@@ -948,21 +965,19 @@ msgstr "CRC: %x\n"
 #: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
-msgstr "ÎÅ È×ÁÔÁÅÔ ÍÅÓÔÁ, ×ÙÄÅÌÅÎÎÏÇÏ ÄÌÑ ROM-ÏÂÒÁÚÁ (%Ld ×ÙÄÅÌÅÎÏ, %d ÉÓÐÏÌØÚÕÅÔÓÑ)\n"
+msgstr ""
+"ÎÅ È×ÁÔÁÅÔ ÍÅÓÔÁ, ×ÙÄÅÌÅÎÎÏÇÏ ÄÌÑ ROM-ÏÂÒÁÚÁ (%Ld ×ÙÄÅÌÅÎÏ, %d "
+"ÉÓÐÏÌØÚÕÅÔÓÑ)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "úÁÐÉÓØ ROM-ÏÂÒÁÚÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÍÅÎÁ ÆÁÊÌÏ× ÕËÏÒÏÞÅÎÙ ÄÏ 255 ÂÁÊÔ.\n"
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÍÅÎÁ ÆÁÊÌÏ× ÕÍÅÎØÛÅÎÙ ÄÏ 255 ÂÁÊÔ.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 #, c-format
@@ -976,13 +991,19 @@ msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÍÅÒÙ ÆÁÊÌÏ× ÕÍÅÎØÛÅÎÙ ÄÏ %luíâ (ÍÉÎÕÓ 1 ÂÁÊÔ).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
-msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: uid'Ù ÕËÏÒÏÞÅÎÙ ÄÏ %u ÂÉÔ.  (üÔÏ ÍÏÖÅÔ ËÁÓÁÔØÓÑ ÂÅÚÏÐÁÓÎÏÓÔÉ.)\n"
+msgid ""
+"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: uid'Ù ÕÍÅÎØÛÅÎÙ ÄÏ %u ÂÉÔ.  (üÔÏ ÍÏÖÅÔ ËÁÓÁÔØÓÑ "
+"ÂÅÚÏÐÁÓÎÏÓÔÉ.)\n"
 
 #: disk-utils/mkfs.cramfs.c:928
 #, c-format
-msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: gid'Ù ÕËÏÒÏÞÅÎÙ ÄÏ %u ÂÉÔ.  (üÔÏ ÍÏÖÅÔ ËÁÓÁÔØÓÑ ÂÅÚÏÐÁÓÎÏÓÔÉ.)\n"
+msgid ""
+"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: gid'Ù ÕÍÅÎØÛÅÎÙ ÄÏ %u ÂÉÔ.  (üÔÏ ÍÏÖÅÔ ËÁÓÁÔØÓÑ "
+"ÂÅÚÏÐÁÓÎÏÓÔÉ.)\n"
 
 #: disk-utils/mkfs.cramfs.c:933
 #, c-format
@@ -1031,7 +1052,6 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ inode'Ù"
 msgid "write failed in write_block"
 msgstr "ÚÁÐÉÓØ × write_block ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1067,7 +1087,7 @@ msgstr "ÐÏÉÓË ×Ï ×ÒÅÍÑ ÐÒÏ×ÅÒËÉ ÂÌÏËÏ× ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "îÅÐÏÎÑÔÎÙÅ ÚÎÁÞÅÎÉÑ × do_check: ×ÏÚÍÏÖÎÏ ÓÂÏÊ\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "ÐÏÉÓË × check_blocks ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
@@ -1109,80 +1129,109 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "ÐÏÐÙÔËÁ ÓÏÚÄÁÔØ ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ ÎÁ '%s' ×ÙÐÏÌÎÅÎÁ ÎÅ ÂÕÄÅÔ"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "îÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ ÓÔÒÁÎÉÃÙ %d, ÕËÁÚÁÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌÅÍ\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÚÁÄÁÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÒÁÚÍÅÒ ÓÔÒÁÎÉÃÙ %d, ×ÍÅÓÔÏ ÓÉÓÔÅÍÎÙÈ ÚÎÁÞÅÎÉÊ %d/%d\n"
+msgstr ""
+"éÓÐÏÌØÚÕÅÔÓÑ ÚÁÄÁÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÒÁÚÍÅÒ ÓÔÒÁÎÉÃÙ %d, ×ÍÅÓÔÏ ÓÉÓÔÅÍÎÙÈ "
+"ÚÎÁÞÅÎÉÊ %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "ðÏÄÒÁÚÕÍÅ×ÁÅÍÙÊ ÒÁÚÍÅÒ ÓÔÒÁÎÎÉà %d (ÎÅ %d)\n"
+msgstr "ðÏÄÒÁÚÕÍÅ×ÁÅÍÙÊ ÒÁÚÍÅÒ ÓÔÒÁÎÉà %d (ÎÅ %d)\n"
+
+#: disk-utils/mkswap.c:233
+#, c-format
+msgid "Bad swap header size, no label written.\n"
+msgstr "îÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ swap-ÚÁÇÏÌÏ×ËÁ, ÍÅÔËÁ ÎÅ ÚÁÐÉÓÁÎÁ.\n"
+
+#: disk-utils/mkswap.c:243
+#, c-format
+msgid "Label was truncated.\n"
+msgstr "íÅÔËÁ ÂÙÌÏ ÕËÏÒÏÞÅÎÁ.\n"
 
-#: disk-utils/mkswap.c:326
+#: disk-utils/mkswap.c:249
 #, c-format
-msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/ÉÍÑ [ÂÌÏËÉ]\n"
+msgid "no label, "
+msgstr "ÂÅÚ ÍÅÔËÉ, "
+
+#: disk-utils/mkswap.c:257
+#, c-format
+msgid "no uuid\n"
+msgstr "ÎÅÔ uuid\n"
+
+#: disk-utils/mkswap.c:381
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
+msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-c] [-v0|-v1] [-pPAGESZ] [-L ÍÅÔËÁ] /dev/ÉÍÑ [ÂÌÏËÉ]\n"
 
-#: disk-utils/mkswap.c:349
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÌÏÈÉÈ ÓÔÒÁÎÉÃ"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1975 text-utils/more.c:1986
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ"
 
-#: disk-utils/mkswap.c:380
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "ÏÄÎÁ ÐÌÏÈÁÑ ÓÔÒÁÎÉÃÁ\n"
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu ÐÌÏÈÉÈ ÓÔÒÁÎÉÃ\n"
 
-#: disk-utils/mkswap.c:502
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: ÏÛÉÂËÁ: îÉÇÄÅ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ ÆÁÊÌ Ó×ÏÐÉÎÇÁ?\n"
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: ÏÛÉÂËÁ: ÒÁÚÍÅÒ %lu ÂÏÌØÛÅ, ÞÅÍ ÒÁÚÍÅÒ ÕÓÔÒÏÊÓÔ×Á %lu\n"
 
-#: disk-utils/mkswap.c:539
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: ÏÛÉÂËÁ: ÎÅÉÚ×ÅÓÔÎÁÑ ×ÅÒÓÉÑ %d\n"
 
-#: disk-utils/mkswap.c:546
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr "%s: ÏÛÉÂËÁ: ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ÄÏÌÖÎÏ ÂÙÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ %ldËâ\n"
+msgstr ""
+"%s: ÏÛÉÂËÁ: ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ÄÏÌÖÎÏ ÂÙÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ %ldËâ\n"
 
-#: disk-utils/mkswap.c:563
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ÕÍÅÎØÛÁÅÔÓÑ ÄÏ %ldËâ\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:644
+#, c-format
+msgid "%s: error: label only with v1 swap area\n"
+msgstr "%s: ÏÛÉÂËÁ: ÍÅÔËÁ ÔÏÌØËÏ ÎÁ Ó×ÏÐ-ÐÒÏÓÔÒÁÎÓÔ×Å v1\n"
+
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "ðÏÐÙÔËÁ ÓÏÚÄÁÔØ ÕÓÔÒÏÊÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ÎÁ '%s' ×ÙÐÏÌÎÅÎÁ ÎÅ ÂÕÄÅÔ"
 
-#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "ÈÒÅÎÏ×Ï: ÐÅÒ×ÁÑ ÓÔÒÁÎÉÃÁ ÎÅÞÉÔÁÂÅÌØÎÁ"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1195,115 +1244,83 @@ msgstr ""
 "ÒÁÚÄÅÌÏ×. ó×ÏÐ ÎÅ ÓÏÚÄÁÎ. åÓÌÉ ×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÓÏÚÄÁÔØ Ó×ÏÐ v0\n"
 "ÎÁ ÜÔÏÍ ÕÓÔÒÏÊÓÔ×Å, ÉÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ -f ÄÌÑ ÐÒÉÎÕÄÉÔÅÌØÎÏÇÏ ÓÏÚÄÁÎÉÑ.\n"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ: ÎÅÞÉÔÁÅÍÙÊ"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ×ÅÒÓÉÉ %d, ÒÁÚÍÅÒ = %llu Ëâ\n"
+msgstr ""
+"õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ×ÅÒÓÉÉ %d, ÒÁÚÍÅÒ = %llu Ëâ\n"
 
-#: disk-utils/mkswap.c:623
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÏÔÁÔØ ÕÓÔÒÏÊÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÔÒÁÎÉÃÕ Ó ÓÉÇÎÁÔÕÒÏÊ"
 
-#: disk-utils/mkswap.c:634
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "îÅ×ÅÒÎÏÅ ÞÉÓÌÏ: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "ïÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "îÅÔ ÔÁËÏÇÏ ÎÁÂÏÒÁ ÐÁÒÁÍÅÔÒÏ×: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] dev ÉÍÑ\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr "   %s [ -p ] dev ÉÍÑ ÓÅËÔÏÒ ÇÏÌÏ×ËÉ ÄÏÒÏÖËÉ ÕÞÁÓÔÏË ÐÒÏÍÅÖÕÔÏË ÞÁÓÔÏÔÁ ÓÐÅà 1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] dev\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] dev\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2053
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "îÅÉÓÐÏÌØÚÕÅÍÙÊ"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2055
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "ó×ÏÂÏÄÎÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "äÉÓË ÂÙÌ ÉÚÍÅÎÅÎ.\n"
 
-#: fdisk/cfdisk.c:408
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr "ÐÅÒÅÚÁÇÒÕÚÉÔÅ ÓÉÓÔÅÍÕ, ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ × ÔÏÍ, ÞÔÏ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ËÏÒÒÅËÔÎÏ ÏÂÎÏ×ÌÅÎÁ.\n"
+msgstr ""
+"ÐÅÒÅÚÁÇÒÕÚÉÔÅ ÓÉÓÔÅÍÕ, ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ × ÔÏÍ, ÞÔÏ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ËÏÒÒÅËÔÎÏ "
+"ÏÂÎÏ×ÌÅÎÁ.\n"
 
 #: fdisk/cfdisk.c:411
 #, c-format
@@ -1371,724 +1388,734 @@ msgstr "ÌÏÇÉÞÅÓËÉÅ ÒÁÚÄÅÌÙ ÉÄÕÔ ÎÅ ÐÏ ÐÏÒÑÄËÕ ÄÉÓËÏ×"
 msgid "logical partitions overlap"
 msgstr "ÌÏÇÉÞÅÓËÉÅ ÒÁÚÄÅÌÙ ÐÅÒÅËÒÙ×ÁÀÔÓÑ"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "Õ×ÅÌÉÞÅÎÎÙÅ ÌÏÇÉÞÅÓËÉÅ ÄÉÓËÉ ÐÅÒÅËÒÙ×ÁÀÔÓÑ"
 
-#: fdisk/cfdisk.c:991
-msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr "!!!! ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÓÏÚÄÁÎÉÉ ÌÏÇÉÞÅÓËÏÇÏ ÄÉÓËÁ ÂÅÚ ÒÁÓÛÉÒÅÎÎÏÇÏ ÒÁÚÄÅÌÁ !!!!"
+#: fdisk/cfdisk.c:993
+msgid ""
+"!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr ""
+"!!!! ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÓÏÚÄÁÎÉÉ ÌÏÇÉÞÅÓËÏÇÏ ÄÉÓËÁ ÂÅÚ ÒÁÓÛÉÒÅÎÎÏÇÏ "
+"ÒÁÚÄÅÌÁ !!!!"
 
-#: fdisk/cfdisk.c:1002 fdisk/cfdisk.c:1014
-msgid "Cannot create logical drive here -- would create two extended partitions"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÚÄÅÓØ ÌÏÇÉÞÅÓËÉÊ ÄÉÓË -- ÂÙÌÉ ÂÙ ÓÏÚÄÁÎÙ Ä×Á ÒÁÓÛÉÒÅÎÎÙÈ ÒÁÚÄÅÌÁ"
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÚÄÅÓØ ÌÏÇÉÞÅÓËÉÊ ÄÉÓË -- ÂÙÌÉ ÂÙ ÓÏÚÄÁÎÙ Ä×Á ÒÁÓÛÉÒÅÎÎÙÈ "
+"ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:1162
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "ðÕÎËÔ ÍÅÎÀ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ. íÅÎÀ ÍÏÖÅÔ ×ÙÇÌÑÄÅÔØ ÎÅÞÅÔËÏ."
 
-#: fdisk/cfdisk.c:1218
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "íÅÎÀ ÂÅÚ ÎÁÐÒÁ×ÌÅÎÉÑ. ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ÇÏÒÉÚÏÎÔÁÌØÎÏÅ."
 
-#: fdisk/cfdisk.c:1349
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ"
 
-#: fdisk/cfdisk.c:1372
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "îÁÖÍÉÔÅ ËÌÁ×ÉÛÕ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:2024 fdisk/cfdisk.c:2556
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "ïÓÎÏ×ÎÏÊ"
 
-#: fdisk/cfdisk.c:1419
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1420 fdisk/cfdisk.c:2024 fdisk/cfdisk.c:2555
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "ìÏÇÉÞÅÓËÉÊ"
 
-#: fdisk/cfdisk.c:1420
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ÌÏÇÉÞÅÓËÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1421 fdisk/cfdisk.c:1476 fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "ïÔÍÅÎÁ"
 
-#: fdisk/cfdisk.c:1421 fdisk/cfdisk.c:1476
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "îÅ ÓÏÚÄÁ×ÁÔØ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1437
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ !!!"
 
-#: fdisk/cfdisk.c:1440
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "òÁÚÍÅÒ (× íâ): "
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "îÁÞÁÌÏ"
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "äÏÂÁ×ÉÔØ ÒÁÚÄÅÌ × ÎÁÞÁÌÏ Ó×ÏÂÏÄÎÏÇÏ ÐÒÏÓÔÒÁÎÓÔ×Á"
 
-#: fdisk/cfdisk.c:1475
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "ëÏÎÅÃ"
 
-#: fdisk/cfdisk.c:1475
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "äÏÂÁ×ÉÔØ ÒÁÚÄÅÌ × ËÏÎÅà Ó×ÏÂÏÄÎÏÇÏ ÐÒÏÓÔÒÁÎÓÔ×Á"
 
-#: fdisk/cfdisk.c:1493
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "îÅÔ ÍÅÓÔÁ ÄÌÑ ÓÏÚÄÁÎÉÑ ÒÁÓÛÉÒÅÎÎÏÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:1555
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "îÅÔ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×.\n"
 
-#: fdisk/cfdisk.c:1559
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "îÅÔ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×. îÁÞÉÎÁÅÍ ÔÁÂÌÉÃÕ Ó ÎÕÌÑ."
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "îÅ×ÅÒÎÁÑ ÓÉÇÎÁÔÕÒÁ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:1573
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:1575
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "èÏÔÉÔÅ ÎÁÞÁÔØ ÔÁÂÌÉÃÕ Ó ÎÕÌÑ [Ä/î] ?"
 
-#: fdisk/cfdisk.c:1623
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "÷Ù ÕËÁÚÁÌÉ ÃÉÌÉÎÄÒÏ× ÂÏÌØÛÅ, ÞÅÍ ÍÏÖÅÔ ÂÙÔØ ÎÁ ÄÉÓËÅ"
 
-#: fdisk/cfdisk.c:1655
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÄÉÓËÏ×ÙÊ ÎÁËÏÐÉÔÅÌØ"
 
-#: fdisk/cfdisk.c:1657 fdisk/cfdisk.c:1837
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "äÉÓË ÏÔËÒÙÔ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ - Õ ×ÁÓ ÎÅÔ ÒÁÚÒÅÛÅÎÉÑ ÎÁ ÚÁÐÉÓØ"
 
-#: fdisk/cfdisk.c:1678
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ ÄÉÓËÁ"
 
-#: fdisk/cfdisk.c:1704
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "ðÌÏÈÏÊ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1734
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "ðÌÏÈÏÊ ÌÏÇÉÞÅÓËÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1849
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ!!  üÔÏ ÍÏÖÅÔ ÕÎÉÞÔÏÖÉÔØ ÄÁÎÎÙÅ ÎÁ ×ÁÛÅÍ ÄÉÓËÅ!"
 
-#: fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr "÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÚÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË? (ÄÁ ÉÌÉ ÎÅÔ): "
+msgstr ""
+"÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÚÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË? (ÄÁ ÉÌÉ ÎÅÔ): "
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ÎÅÔ"
 
-#: fdisk/cfdisk.c:1860
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÎÅ ÚÁÐÉÓÁÎÁ ÎÁ ÄÉÓË"
 
-#: fdisk/cfdisk.c:1862
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ÄÁ"
 
-#: fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ `ÄÁ' ÉÌÉ `ÎÅÔ'"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÚÁÐÉÓÙ×ÁÅÔÓÑ ÎÁ ÄÉÓË..."
 
-#: fdisk/cfdisk.c:1894 fdisk/cfdisk.c:1898
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÚÁÐÉÓÁÎÁ ÎÁ ÄÉÓË"
 
-#: fdisk/cfdisk.c:1896
-msgid "Wrote partition table, but re-read table failed.  Reboot to update table."
-msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÚÁÐÉÓÁÎÁ, ÎÏ ÐÏ×ÔÏÒÎÏÅ ÞÔÅÎÉÅ ÔÁÂÌÉÃÙ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ.  ðÅÒÅÚÁÇÒÕÚÉÔÅÓØ, ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÔÁÂÌÉÃÕ."
+#: fdisk/cfdisk.c:1904
+msgid ""
+"Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr ""
+"ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÚÁÐÉÓÁÎÁ, ÎÏ ÐÏ×ÔÏÒÎÏÅ ÞÔÅÎÉÅ ÔÁÂÌÉÃÙ ÚÁ×ÅÒÛÉÌÏÓØ "
+"ÎÅÕÄÁÞÅÊ.  ðÅÒÅÚÁÇÒÕÚÉÔÅÓØ, ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÔÁÂÌÉÃÕ."
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr "îÅÔ ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÏ×, ÐÏÍÅÞÅÎÎÙÈ ËÁË ÚÁÇÒÕÚÏÞÎÙÅ. DOS'Ï×ÓËÉÊ MBR ÎÅ ÍÏÖÅÔ ×ÙÐÏÌÎÉÔØ ÚÁÇÒÕÚËÕ."
+msgstr ""
+"îÅÔ ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÏ×, ÐÏÍÅÞÅÎÎÙÈ ËÁË ÚÁÇÒÕÚÏÞÎÙÅ. DOS'Ï×ÓËÉÊ MBR ÎÅ ÍÏÖÅÔ "
+"×ÙÐÏÌÎÉÔØ ÚÁÇÒÕÚËÕ."
 
-#: fdisk/cfdisk.c:1908
-msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr "âÏÌÅÅ, ÞÅÍ ÏÄÉÎ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ ÐÏÍÅÞÅÎ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ. DOS'Ï×ÓËÉÊ MBR ÎÅ ÍÏÖÅÔ ×ÙÐÏÌÎÉÔØ ÚÁÇÒÕÚËÕ."
+#: fdisk/cfdisk.c:1916
+msgid ""
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"âÏÌÅÅ, ÞÅÍ ÏÄÉÎ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ ÐÏÍÅÞÅÎ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ. DOS'Ï×ÓËÉÊ MBR ÎÅ "
+"ÍÏÖÅÔ ×ÙÐÏÌÎÉÔØ ÚÁÇÒÕÚËÕ."
 
-#: fdisk/cfdisk.c:1966 fdisk/cfdisk.c:2085 fdisk/cfdisk.c:2169
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÉÌÉ ÎÁÖÍÉÔÅ RETURN, ÞÔÏÂÙ ×Ù×ÅÓÔÉ ÎÁ ÜËÒÁÎ: "
 
-#: fdisk/cfdisk.c:1975 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ '%s'"
 
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "äÉÓËÏ×ÙÊ ÎÁËÏÐÉÔÅÌØ: %s\n"
 
-#: fdisk/cfdisk.c:1988
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "óÅËÔÏÒ 0:\n"
 
-#: fdisk/cfdisk.c:1995
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "óÅËÔÏÒ %d:\n"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   îÅÔ   "
 
-#: fdisk/cfdisk.c:2017
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   ïÓÎ/ìÏÇ"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   ïÓÎÏ×ÎÏÊ"
 
-#: fdisk/cfdisk.c:2021
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   ìÏÇÉÞÅÓËÉÊ"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2059 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:650
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ"
 
-#: fdisk/cfdisk.c:2065 fdisk/cfdisk.c:2533 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "úÁÇÒÕÚÏÞÎÙÊ"
 
-#: fdisk/cfdisk.c:2067
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2069
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "îÅÔ"
 
-#: fdisk/cfdisk.c:2104 fdisk/cfdisk.c:2188
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÄÌÑ %s\n"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "              ðÅÒ×ÙÊ   ðÏÓÌÅÄÎ.\n"
 
-#: fdisk/cfdisk.c:2107
-msgid " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) Flag\n"
-msgstr " # ôÉÐ        óÅËÔÏÒ      óÅËÔÏÒ   óÍÅÝ.     äÌÉÎÁ    ôÉÐ ÆÁÊÌ.ÓÉÓÔ.  (ID) æÌÁÇ\n"
+#: fdisk/cfdisk.c:2115
+msgid ""
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+msgstr ""
+" # ôÉÐ        óÅËÔÏÒ      óÅËÔÏÒ   óÍÅÝ.     äÌÉÎÁ    ôÉÐ ÆÁÊÌ.ÓÉÓÔ.  (ID) "
+"æÌÁÇ\n"
 
-#: fdisk/cfdisk.c:2108
-msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
-msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+#: fdisk/cfdisk.c:2116
+msgid ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2191
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----îÁÞÁÌÏ----      ----ëÏÎÅÃ-----    ðÅÒ×ÙÊ    þÉÓÌÏ\n"
 
-#: fdisk/cfdisk.c:2192
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # æÌÁÇÉ çÏÌ. óÅËÔ ãÉÌ   ID  çÏÌ. óÅËÔ ãÉÌ     ÓÅËÔÏÒ    ÓÅËÔÏÒÏ×\n"
 
-#: fdisk/cfdisk.c:2193
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "óÙÒÏÊ"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "÷Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ, ÉÓÐÏÌØÚÕÑ ÆÏÒÍÁÔ ÓÙÒÙÈ ÄÁÎÎÙÈ"
 
-#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "óÅËÔÏÒÙ"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "÷Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ, ÕÐÏÒÑÄÏÞÅÎÎÕÀ ÐÏ ÓÅËÔÏÒÁÍ"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "ôÁÂÌÉÃÁ"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "ðÒÏÓÔÏ ×Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "îÅ ×Ù×ÏÄÉÔØ ÔÁÂÌÉÃÕ"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "üËÒÁÎ ÓÐÒÁ×ËÉ ÄÌÑ cfdisk"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "üÔÏ cfdisk - ÐÒÏËÌÑÔÁÑ ÐÒÏÇÒÁÍÍÁ ÄÌÑ ÒÁÚÍÅÔËÉ ÄÉÓËÁ, ËÏÔÏÒÁÑ"
 
-#: fdisk/cfdisk.c:2260
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ÓÏÚÄÁ×ÁÔØ, ÕÄÁÌÑÔØ É ÉÚÍÅÎÑÔØ ÒÁÚÄÅÌÙ ÎÁ"
 
-#: fdisk/cfdisk.c:2261
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "Ó×ÏÅÍ ÎÁËÏÐÉÔÅÌÅ ÎÁ ÖÅÓÔËÏÍ ÄÉÓËÅ."
 
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2265
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "ëÏÍÁÎÄÁ      úÎÁÞÅÎÉÅ"
 
-#: fdisk/cfdisk.c:2266
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          ðÅÒÅËÌÀÞÅÎÉÅ ÚÁÇÒÕÚÏÞÎÏÇÏ ÆÌÁÇÁ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2268
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          õÄÁÌÅÎÉÅ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          óÍÅÎÁ ÐÁÒÁÍÅÔÒÏ× ÃÉÌÉÎÄÒÏ×, ÇÏÌÏ×ÏË, ÓÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ðòåäõðòåöäåîéå: üÔÁ ÏÐÃÉÑ ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÔÏÌØËÏ"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             ÔÅÍÉ, ËÔÏ ÚÎÁÅÔ, ÞÔÏ ÏÎ ÄÅÌÁÅÔ."
 
-#: fdisk/cfdisk.c:2272
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          ÷Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ"
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          äÏ×ÅÓÔÉ ÄÏ ÍÁËÓÉÍÕÍÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2274
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             ðÒÉÍÅÞÁÎÉÅ: üÔÏ ÍÏÖÅÔ ÓÄÅÌÁÔØ ÒÁÚÄÅÌ ÎÅÓÏ×ÍÅÓÔÉÍÙÍ Ó "
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          óÏÚÄÁÎÉÅ ÎÏ×ÏÇÏ ÒÁÚÄÅÌÁ ÎÁ Ó×ÏÂÏÄÎÏÍ ÐÒÏÓÔÒÁÎÓÔ×Å"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          ÷Ù×ÏÄ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÎÁ ÜËÒÁÎ ÉÌÉ × ÆÁÊÌ"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             óÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÒÁÚÌÉÞÎÙÈ ÆÏÒÍÁÔÏ×"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             ÄÌÑ ÒÁÚÄÅÌÏ×, ÉÚ ËÏÔÏÒÙÈ ×Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ:"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr "                r - óÙÒÙÅ ÄÁÎÎÙÅ (ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ, ÞÔÏ ÂÕÄÅÔ ÚÁÐÉÓÁÎÏ ÎÁ ÄÉÓË)"
+msgstr ""
+"                r - óÙÒÙÅ ÄÁÎÎÙÅ (ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ, ÞÔÏ ÂÕÄÅÔ ÚÁÐÉÓÁÎÏ ÎÁ "
+"ÄÉÓË)"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - ôÁÂÌÉÃÁ, ÕÐÏÒÑÄÏÞÅÎÎÁÑ ÐÏ ÓÅËÔÏÒÁÍ"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - ôÁÂÌÉÃÁ × ÆÏÒÍÁÔÅ ÓÙÒÙÈ ÄÁÎÎÙÈ"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          ÷ÙÈÏÄ ÉÚ ÐÒÏÇÒÁÍÍÙ ÂÅÚ ÚÁÐÉÓÉ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          óÍÅÎÁ ÔÉÐÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          éÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃÙ ÉÚÍÅÒÅÎÉÑ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÒÁÚÍÅÒÁ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             þÅÒÅÄÕÅÔÓÑ ÞÅÒÅÚ íâ, ÓÅËÔÏÒÙ É ÃÉÌÉÎÄÒÙ"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr "  W          úÁÐÉÓØ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË (ÔÒÅÂÕÅÔÓÑ ××ÅÓÔÉ ÚÁÇÌÁ×ÎÕÀ W)"
+msgstr ""
+"  W          úÁÐÉÓØ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË (ÔÒÅÂÕÅÔÓÑ ××ÅÓÔÉ ÚÁÇÌÁ×ÎÕÀ W)"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             ô.Ë. ÜÔÏ ÍÏÖÅÔ ÒÁÚÒÕÛÉÔØ ÄÁÎÎÙÅ ÎÁ ÄÉÓËÅ, ×Ù ÄÏÌÖÎÙ"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             ÐÏÄÔ×ÅÒÄÉÔØ ÉÌÉ ÏÔÍÅÎÉÔØ ÚÁÐÉÓØ, ÎÁÂÒÁ× `ÄÁ' ÉÌÉ"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `ÎÅÔ'"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "óÔÒÅÌËÁ ××ÅÒÈ ðÅÒÅÍÅÝÅÎÉÅ ËÕÒÓÏÒÁ ÎÁ ÐÒÅÄÙÄÕÝÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "óÔÒÅÌËÁ ×ÎÉÚ ðÅÒÅÍÅÝÅÎÉÅ ËÕÒÓÏÒÁ ÎÁ ÓÌÅÄÕÀÝÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       ðÅÒÅÒÉÓÏ×Ù×ÁÎÉÅ ÜËÒÁÎÁ"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          ÷Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "ðÒÉÍÅÞÁÎÉÅ: ÷ÓÅ ËÏÍÁÎÄÙ ÍÏÇÕÔ ÂÙÔØ ××ÅÄÅÎÙ × ×ÅÒÈÎÅÍ"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "ÉÌÉ ÎÉÖÎÅÍ ÒÅÇÉÓÔÒÅ (ÚÁ ÉÓËÌÀÞÅÎÉÅÍ ÚÁÐÉÓÉ)."
 
-#: fdisk/cfdisk.c:2328 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "ãÉÌÉÎÄÒÙ"
 
-#: fdisk/cfdisk.c:2328
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "éÚÍÅÎÉÔØ ÇÅÏÍÅÔÒÉÀ ÃÉÌÉÎÄÒÁ"
 
-#: fdisk/cfdisk.c:2329 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "çÏÌÏ×ËÉ"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "éÚÍÅÎÉÔØ ÇÅÏÍÅÔÒÉÀ ÇÏÌÏ×ËÉ"
 
-#: fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "éÚÍÅÎÉÔØ ÇÅÏÍÅÔÒÉÀ ÓÅËÔÏÒÁ"
 
-#: fdisk/cfdisk.c:2331
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "çÏÔÏ×Ï"
 
-#: fdisk/cfdisk.c:2331
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "çÏÔÏ×Ï Ó ÉÚÍÅÎÅÎÉÅÍ ÇÅÏÍÅÔÒÉÉ"
 
-#: fdisk/cfdisk.c:2344
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "÷×ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÃÉÌÉÎÄÒÏ×:"
 
-#: fdisk/cfdisk.c:2355 fdisk/cfdisk.c:2926
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "÷×ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÇÏÌÏ×ÏË:"
 
-#: fdisk/cfdisk.c:2368 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÇÏÌÏ×ÏË"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "÷×ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÓÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ:"
 
-#: fdisk/cfdisk.c:2381 fdisk/cfdisk.c:2943
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÓÅËÔÏÒÏ×"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "÷×ÅÄÉÔÅ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ:"
 
-#: fdisk/cfdisk.c:2502
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÔÉÐ æó ÎÁ ÐÕÓÔÕÀ"
 
-#: fdisk/cfdisk.c:2504
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÔÉÐ æó ÎÁ ÒÁÓÛÉÒÅÎÎÕÀ"
 
-#: fdisk/cfdisk.c:2535
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2538 fdisk/cfdisk.c:2541
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "ïÓÎ/ìÏÇ"
 
-#: fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ (%02X)"
 
-#: fdisk/cfdisk.c:2633
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "äÉÓËÏ×ÙÊ ÎÁËÏÐÉÔÅÌØ: %s"
 
-#: fdisk/cfdisk.c:2640
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "òÁÚÍÅÒ: %lld ÂÁÊÔ, %lld íâ"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "òÁÚÍÅÒ: %lld ÂÁÊÔ, %lld.%lld çâ"
 
-#: fdisk/cfdisk.c:2647
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "çÏÌÏ×ÏË: %d   óÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ: %d   ãÉÌÉÎÄÒÏ×: %lld"
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "éÍÑ"
 
-#: fdisk/cfdisk.c:2652
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "æÌÁÇÉ"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "ôÉÐ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2654
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "ôÉÐ æó"
 
-#: fdisk/cfdisk.c:2655
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[íÅÔËÁ]"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    óÅËÔÏÒÙ"
 
-#: fdisk/cfdisk.c:2659
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  ãÉÌÉÎÄÒÙ"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  òÁÚÍÅÒ (íâ)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  òÁÚÍÅÒ (çâ)"
 
-#: fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "úÁÇÒÕÚ."
 
-#: fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "ðÅÒÅËÌÀÞÉÔØ ÚÁÇÒÕÚÏÞÎÙÊ ÆÌÁÇ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "õÄÁÌÉÔØ"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "õÄÁÌÉÔØ ÔÅËÕÝÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2719
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "çÅÏÍÅÔÒÉÑ"
 
-#: fdisk/cfdisk.c:2719
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "éÚÍÅÎÉÔØ ÇÅÏÍÅÔÒÉÀ ÄÉÓËÁ (ÔÏÌØËÏ ÄÌÑ ÜËÓÐÅÒÔÏ×)"
 
-#: fdisk/cfdisk.c:2720
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "óÐÒÁ×ËÁ"
 
-#: fdisk/cfdisk.c:2720
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "÷Ù×ÅÓÔÉ ÜËÒÁÎ ÓÐÒÁ×ËÉ"
 
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "íÁËÓ."
 
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "äÏ×ÅÓÔÉ ÄÏ ÍÁËÓÉÍÕÍÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ (ÔÏÌØËÏ ÄÌÑ ÜËÓÐÅÒÔÏ×)"
+msgstr ""
+"äÏ×ÅÓÔÉ ÄÏ ÍÁËÓÉÍÕÍÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ (ÔÏÌØËÏ ÄÌÑ ÜËÓÐÅÒÔÏ×)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "îÏ×ÙÊ"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ÒÁÚÄÅÌ ÎÁ Ó×ÏÂÏÄÎÏÍ ÐÒÏÓÔÒÁÎÓÔ×Å"
 
-#: fdisk/cfdisk.c:2723
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "÷Ù×ÅÓÔÉ"
 
-#: fdisk/cfdisk.c:2723
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "÷Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÜËÒÁÎ ÉÌÉ × ÆÁÊÌ"
 
-#: fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "÷ÙÊÔÉ ÉÚ ÐÒÏÇÒÁÍÍÙ ÂÅÚ ÚÁÐÉÓÉ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:2725
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "ôÉÐ"
 
-#: fdisk/cfdisk.c:2725
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "éÚÍÅÎÉÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ (DOS, Linux, OS/2 É Ô.Ä.)"
 
-#: fdisk/cfdisk.c:2726
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "åÄ. ÉÚÍ."
 
-#: fdisk/cfdisk.c:2726
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "éÚÍÅÎÉÔØ ÅÄÉÎÉÃÙ ÉÚÍÅÒÅÎÉÑ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÒÁÚÍÅÒÁ ÒÁÚÄÅÌÁ (íâ, ÓÅËÔ., ÃÉÌ.)"
+msgstr ""
+"éÚÍÅÎÉÔØ ÅÄÉÎÉÃÙ ÉÚÍÅÒÅÎÉÑ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÒÁÚÍÅÒÁ ÒÁÚÄÅÌÁ (íâ, ÓÅËÔ., ÃÉÌ.)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "úÁÐÉÓØ"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "úÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË (ÜÔÏ ÍÏÖÅÔ ÒÁÚÒÕÛÉÔØ ÄÁÎÎÙÅ)"
 
-#: fdisk/cfdisk.c:2773
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÜÔÏÔ ÒÁÚÄÅÌ ÚÁÇÒÕÚÏÞÎÙÍ"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÕÓÔÏÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2803 fdisk/cfdisk.c:2805
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÍÁËÓÉÍÉÚÉÒÏ×ÁÔØ ÜÔÏÔ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "üÔÏÔ ÒÁÚÄÅÌ ÎÅÉÓÐÏÌØÚÕÅÍÙÊ"
 
-#: fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "üÔÏÔ ÒÁÚÄÅÌ ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
 
-#: fdisk/cfdisk.c:2832
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÔÉÐ ÐÕÓÔÏÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2859 fdisk/cfdisk.c:2865
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "òÁÚÄÅÌÏ× ÂÏÌØÛÅ ÎÅÔ"
 
-#: fdisk/cfdisk.c:2872
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "îÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2889
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2123,7 +2150,366 @@ msgstr ""
 "                ÇÏÌÏ×ÏË É ÞÉÓÌÅ ÓÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ.\n"
 "\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdiskaixlabel.c:27
+msgid ""
+"\n"
+"\tThere is a valid AIX label on this disk.\n"
+"\tUnfortunately Linux cannot handle these\n"
+"\tdisks at the moment.  Nevertheless some\n"
+"\tadvice:\n"
+"\t1. fdisk will destroy its contents on write.\n"
+"\t2. Be sure that this disk is NOT a still vital\n"
+"\t   part of a volume group. (Otherwise you may\n"
+"\t   erase the other disks as well, if unmirrored.)\n"
+"\t3. Before deleting this physical volume be sure\n"
+"\t   to remove the disk logically from your AIX\n"
+"\t   machine.  (Otherwise you become an AIXpert)."
+msgstr ""
+"\n"
+"\tîÁ ÜÔÏÍ ÄÉÓËÅ ÅÓÔØ ×ÅÒÎÁÑ ÍÅÔËÁ AIX.\n"
+"\të ÓÏÖÁÌÅÎÉÀ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ Linux ÎÅ\n"
+"\tÍÏÖÅÔ ÏÂÒÁÂÁÔÙ×ÁÔØ ÜÔÉ ÄÉÓËÉ. ôÅÍ ÎÅ\n"
+"\tÍÅÎÅÅ ×ÏÔ ÎÅÓËÏÌØËÏ ÓÏ×ÅÔÏ×:\n"
+"\t1. ðÒÉ ÚÁÐÉÓÉ fdisk ÒÁÚÒÕÛÉÔ ×ÓÅ ÄÁÎÎÙÅ\n"
+"\t   ÎÁ ÄÉÓËÅ.\n"
+"\t2. õÂÅÄÉÔÅÓØ, ÞÔÏÂÙ ÜÔÏÔ ÄÉÓË îå Ñ×ÌÑÌÓÑ\n"
+"\t   ×ÁÖÎÏÊ ÞÁÓÔØÀ ÇÒÕÐÐÙ ÔÏÍÏ×. (éÎÁÞÅ ×Ù\n"
+"\t   ÍÏÖÅÔÅ ÓÔÅÒÅÔØ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÄÉÓËÉ,\n"
+"\t   ÅÓÌÉ ÏÎÉ ÎÅ ÏÔÚÅÒËÁÌÅÎÙ.)\n"
+"\t3. ðÅÒÅÄ ÕÄÁÌÅÎÉÅÍ ÜÔÏÇÏ ÆÉÚÉÞÅÓËÏÇÏ\n"
+"\t   ÔÏÍÁ ÕÂÅÄÉÔÅÓØ, ÞÔÏ ÌÏÇÉÞÅÓËÉ ÕÄÁÌÉÌÉ\n"
+"\t   ÄÉÓË ÉÚ AIX Ó×ÏÅÊ ÍÁÛÉÎÙ. (éÎÁÞÅ, ×Ù\n"
+"]\t   ÓÔÁÎÅÔÅ AIXpert'ÏÍ)."
+
+#: fdisk/fdiskbsdlabel.c:122
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+"\n"
+"íÅÔËÁ BSD ÄÌÑ ÕÓÔÒÏÊÓÔ×Á: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
+msgid "Command action"
+msgstr "äÅÊÓÔ×ÉÅ ËÏÍÁÎÄÙ"
+
+#: fdisk/fdiskbsdlabel.c:130
+msgid "   d   delete a BSD partition"
+msgstr "   d   ÕÄÁÌÅÎÉÅ ÒÁÚÄÅÌÁ BSD"
+
+#: fdisk/fdiskbsdlabel.c:131
+msgid "   e   edit drive data"
+msgstr "   e   ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÄÁÎÎÙÈ ÄÉÓËÁ"
+
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   i   install bootstrap"
+msgstr "   i   ÕÓÔÁÎÏ×ËÁ bootstrap"
+
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   l   list known filesystem types"
+msgstr "   l   ÓÐÉÓÏË ÔÉÐÏ× ÉÚ×ÅÓÔÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ"
+
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+msgid "   m   print this menu"
+msgstr "   m   ×Ù×ÏÄ ÜÔÏÇÏ ÍÅÎÀ"
+
+#: fdisk/fdiskbsdlabel.c:135
+msgid "   n   add a new BSD partition"
+msgstr "   n   ÄÏÂÁ×ÌÅÎÉÅ ÎÏ×ÏÇÏ ÒÁÚÄÅÌÁ BSD"
+
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   p   print BSD partition table"
+msgstr "   p   ×Ù×ÏÄ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× BSD"
+
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
+msgid "   q   quit without saving changes"
+msgstr "   q   ×ÙÈÏÄ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ"
+
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
+msgid "   r   return to main menu"
+msgstr "   r   ×ÏÚ×ÒÁÔ × ÇÌÁ×ÎÏÅ ÍÅÎÀ"
+
+#: fdisk/fdiskbsdlabel.c:139
+msgid "   s   show complete disklabel"
+msgstr "   s   ÏÔÏÂÒÁÖÅÎÉÅ ÐÏÌÎÏÊ ÍÅÔËÉ ÄÉÓËÁ"
+
+#: fdisk/fdiskbsdlabel.c:140
+msgid "   t   change a partition's filesystem id"
+msgstr "   t   ÉÚÍÅÎÅÎÉÅ id ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ ÒÁÚÄÅÌÁ"
+
+#: fdisk/fdiskbsdlabel.c:141
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   ÉÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃ ÉÚÍÅÒÅÎÉÑ (ÃÉÌÉÎÄÒÙ/ÓÅËÔÏÒÙ)"
+
+#: fdisk/fdiskbsdlabel.c:142
+msgid "   w   write disklabel to disk"
+msgstr "   w   ÚÁÐÉÓØ ÍÅÔËÉ ÄÉÓËÁ ÎÁ ÄÉÓË"
+
+#: fdisk/fdiskbsdlabel.c:144
+msgid "   x   link BSD partition to non-BSD partition"
+msgstr "   x   Ó×ÑÚÙ×ÁÎÉÅ ÒÁÚÄÅÌÁ BSD Ó ÒÁÚÄÅÌÏÍ ÎÅ-BSD"
+
+#: fdisk/fdiskbsdlabel.c:176
+#, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "òÁÚÄÅÌ %s ÓÏÄÅÒÖÉÔ ÎÅ×ÅÒÎÙÊ ÎÁÞÁÌØÎÙÊ ÎÕÌÅ×ÏÊ ÓÅËÔÏÒ.\n"
+
+#: fdisk/fdiskbsdlabel.c:180
+#, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "þÉÔÁÅÔÓÑ ÍÅÔËÁ ÄÉÓËÁ %s Ó ÓÅËÔÏÒÁ %d.\n"
+
+#: fdisk/fdiskbsdlabel.c:190
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr "îÁ %s ÎÅÔ ÒÁÚÄÅÌÁ *BSD.\n"
+
+#: fdisk/fdiskbsdlabel.c:204
+msgid "BSD disklabel command (m for help): "
+msgstr "ëÏÍÁÎÄÁ ÍÅÔËÉ ÄÉÓËÁ BSD (m ÄÌÑ ÓÐÒÁ×ËÉ): "
+
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
+#, c-format
+msgid "First %s"
+msgstr "ðÅÒ×ÙÊ %s"
+
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "ðÏÓÌÅÄÎÉÊ %s ÉÌÉ +size ÉÌÉ +sizeM ÉÌÉ +sizeK"
+
+#: fdisk/fdiskbsdlabel.c:318
+#, c-format
+msgid "type: %s\n"
+msgstr "ÔÉÐ: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:320
+#, c-format
+msgid "type: %d\n"
+msgstr "ÔÉÐ: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:321
+#, c-format
+msgid "disk: %.*s\n"
+msgstr "ÄÉÓË: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:322
+#, c-format
+msgid "label: %.*s\n"
+msgstr "ÍÅÔËÁ: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:323
+#, c-format
+msgid "flags:"
+msgstr "ÆÌÁÇÉ:"
+
+#: fdisk/fdiskbsdlabel.c:325
+#, c-format
+msgid " removable"
+msgstr " ÓßÅÍÎÙÊ"
+
+#: fdisk/fdiskbsdlabel.c:327
+#, c-format
+msgid " ecc"
+msgstr " ecc"
+
+#: fdisk/fdiskbsdlabel.c:329
+#, c-format
+msgid " badsect"
+msgstr " bad-ÓÅËÔÏÒ"
+
+#: fdisk/fdiskbsdlabel.c:333
+#, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "ÂÁÊÔ/ÓÅËÔÏÒ: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:334
+#, c-format
+msgid "sectors/track: %ld\n"
+msgstr "ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:335
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr "ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:336
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr "ÓÅËÔÏÒÙ/ÃÉÌÉÎÄÒ: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:337
+#, c-format
+msgid "cylinders: %ld\n"
+msgstr "ÃÉÌÉÎÄÒÙ: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:338
+#, c-format
+msgid "rpm: %d\n"
+msgstr "ÏÂ/ÍÉÎ: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:339
+#, c-format
+msgid "interleave: %d\n"
+msgstr "ÞÅÒÅÄÏ×ÁÎÉÅ: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:340
+#, c-format
+msgid "trackskew: %d\n"
+msgstr "ÐÅÒÅËÏÓ ÄÏÒÏÖËÉ: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:341
+#, c-format
+msgid "cylinderskew: %d\n"
+msgstr "ÐÅÒÅËÏÓ ÃÉÌÉÎÄÒÁ: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:342
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr "ÐÅÒÅËÌÀÞÅÎÉÅ ÇÏÌÏ×ËÉ: %ld\t\t# ÍÉÌÌÉÓÅËÕÎÄ\n"
+
+#: fdisk/fdiskbsdlabel.c:344
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr "ÐÏÉÓË ÄÏÒÏÖËÉ: %ld\t# ÍÉÌÌÉÓÅËÕÎÄ\n"
+
+#: fdisk/fdiskbsdlabel.c:346
+#, c-format
+msgid "drivedata: "
+msgstr "ÄÁÎÎÙÅ ÄÉÓËÁ: "
+
+#: fdisk/fdiskbsdlabel.c:355
+#, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
+msgstr ""
+"\n"
+"%d ÒÁÚÄÅÌÙ:\n"
+
+#: fdisk/fdiskbsdlabel.c:356
+#, c-format
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr "#      ÎÁÞÁÌÏ     ËÏÎÅÃ      ÒÁÚÍÅÒ   ÔÉÐ ÆÓ   [fsize bsize   cpg]\n"
+
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
+#, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "íÅÔËÁ ÄÉÓËÁ ÚÁÐÉÓÙ×ÁÅÔÓÑ ÎÁ %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr "%s ÎÅ ÓÏÄÅÒÖÉÔ ÍÅÔËÉ ÄÉÓËÁ.\n"
+
+#: fdisk/fdiskbsdlabel.c:427
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr "èÏÔÉÔÅ ÓÏÚÄÁÔØ ÍÅÔËÕ ÄÉÓËÁ? (Ä/Î) "
+
+#: fdisk/fdiskbsdlabel.c:467
+msgid "bytes/sector"
+msgstr "ÂÁÊÔ/ÓÅËÔÏÒ"
+
+#: fdisk/fdiskbsdlabel.c:468
+msgid "sectors/track"
+msgstr "ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ"
+
+#: fdisk/fdiskbsdlabel.c:469
+msgid "tracks/cylinder"
+msgstr "ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ"
+
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
+msgid "cylinders"
+msgstr "ÃÉÌÉÎÄÒÙ"
+
+#: fdisk/fdiskbsdlabel.c:477
+msgid "sectors/cylinder"
+msgstr "ÓÅËÔÏÒÙ/ÃÉÌÉÎÄÒ"
+
+#: fdisk/fdiskbsdlabel.c:481
+#, c-format
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr "äÏÌÖÎÏ ÂÙÔØ <= ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ * ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ (ÐÏ ÕÍÏÌÞÁÎÉÀ).\n"
+
+#: fdisk/fdiskbsdlabel.c:483
+msgid "rpm"
+msgstr "ÏÂ/ÍÉÎ"
+
+#: fdisk/fdiskbsdlabel.c:484
+msgid "interleave"
+msgstr "ÞÅÒÅÄÏ×ÁÎÉÅ"
+
+#: fdisk/fdiskbsdlabel.c:485
+msgid "trackskew"
+msgstr "ÐÅÒÅËÏÓ ÄÏÒÏÖËÉ"
+
+#: fdisk/fdiskbsdlabel.c:486
+msgid "cylinderskew"
+msgstr "ÐÅÒÅËÏÓ ÃÉÌÉÎÄÒÁ"
+
+#: fdisk/fdiskbsdlabel.c:487
+msgid "headswitch"
+msgstr "ÐÅÒÅËÌÀÞÅÎÉÅ ÇÏÌÏ×ËÉ"
+
+#: fdisk/fdiskbsdlabel.c:488
+msgid "track-to-track seek"
+msgstr "ÐÏÉÓË ÄÏÒÏÖËÉ"
+
+#: fdisk/fdiskbsdlabel.c:529
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr "Bootstrap: %sboot -> boot%s (%s): "
+
+#: fdisk/fdiskbsdlabel.c:554
+#, c-format
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Bootstrap ÐÅÒÅËÒÙ×ÁÅÔÓÑ Ó ÍÅÔËÏÊ ÄÉÓËÁ!\n"
+
+#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Bootstrap ÕÓÔÁÎÏ×ÌÅÎ ÎÁ %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:599
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "òÁÚÄÅÌ (a-%c): "
+
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
+#, c-format
+msgid "The maximum number of partitions has been created\n"
+msgstr "âÙÌÏ ÓÏÚÄÁÎÏ ÍÁËÓÉÍÁÌØÎÏ ×ÏÚÍÏÖÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÒÁÚÄÅÌÏ×\n"
+
+#: fdisk/fdiskbsdlabel.c:630
+#, c-format
+msgid "This partition already exists.\n"
+msgstr "üÔÏÔ ÒÁÚÄÅÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
+
+#: fdisk/fdiskbsdlabel.c:756
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÄÅÌÏ× (%d, ÍÁËÓÉÍÕÍ - %d).\n"
+
+#: fdisk/fdiskbsdlabel.c:804
+#, c-format
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+"\n"
+"óÉÎÈÒÏÎÉÚÉÒÕÀÔÓÑ ÄÉÓËÉ.\n"
+
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2143,7 +2529,7 @@ msgstr ""
 "-u: ÏÐÒÅÄÅÌÑÅÔ îÁÞÁÌÏ É ëÏÎÅÃ × ÅÄÉÎÉÃÁÈ ÓÅËÔÏÒÁ (×ÍÅÓÔÏ ÃÉÌÉÎÄÒÁ)\n"
 "-b 2048: (ÄÌÑ ÎÅËÏÔÏÒÙÈ MO-ÄÉÓËÏ×) ÉÓÐÏÌØÚÏ×ÁÎÉÅ 2048-ÂÁÊÔÏ×ÙÈ ÓÅËÔÏÒÏ×\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2159,227 +2545,184 @@ msgstr ""
 "  ÉÌÉ: fdisk /dev/rd/c0d0  ÉÌÉ: fdisk /dev/ida/c0d0  (ÄÌÑ RAID-ÕÓÔÒÏÊÓÔ×)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÁ %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÎÁ %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÅÝÅ ÐÁÍÑÔÉ\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "îÅÉÓÐÒÁ×ÉÍÁÑ ÏÛÉÂËÁ\n"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:367 fdisk/fdisk.c:374
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
-msgid "Command action"
-msgstr "äÅÊÓÔ×ÉÅ ËÏÍÁÎÄÙ"
-
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   ÐÅÒÅËÌÀÞÅÎÉÅ ÆÌÁÇÁ ÚÁÇÒÕÚËÉ"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÍÅÔËÉ ÄÉÓËÁ bsd"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   ÐÅÒÅËÌÀÞÅÎÉÅ ÆÌÁÇÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   ÕÄÁÌÅÎÉÅ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   ÓÐÉÓÏË ÉÚ×ÅÓÔÎÙÈ ÔÉÐÏ× ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ"
 
-#. sun
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:368 fdisk/fdisk.c:380
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
-#: fdisk/fdiskbsdlabel.c:134
-msgid "   m   print this menu"
-msgstr "   m   ×Ù×ÏÄ ÜÔÏÇÏ ÍÅÎÀ"
-
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   ÄÏÂÁ×ÌÅÎÉÅ ÎÏ×ÏÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   ÓÏÚÄÁÎÉÅ ÎÏ×ÏÊ ÐÕÓÔÏÊ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× DOS"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   ×Ù×ÏÄ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:370 fdisk/fdisk.c:384
-#: fdisk/fdisk.c:407 fdisk/fdisk.c:424 fdisk/fdisk.c:440 fdisk/fdisk.c:457
-#: fdisk/fdiskbsdlabel.c:137
-msgid "   q   quit without saving changes"
-msgstr "   q   ×ÙÈÏÄ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ"
-
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ÓÏÚÄÁÎÉÅ ÎÏ×ÏÊ ÞÉÓÔÏÊ ÍÅÔËÉ ÄÉÓËÁ Sun"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   ÉÚÍÅÎÅÎÉÅ id ÓÉÓÔÅÍÙ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   ÉÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃ ÉÚÍÅÒÅÎÉÑ ÜËÒÁÎÁ/ÓÏÄÅÒÖÉÍÏÇÏ"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   ÐÒÏ×ÅÒËÁ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   ÚÁÐÉÓØ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË É ×ÙÈÏÄ"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ (ÔÏÌØËÏ ÄÌÑ ÜËÓÐÅÒÔÏ×)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   ×ÙÂÏÒ ÚÁÇÒÕÚÏÞÎÏÇÏ ÒÁÚÄÅÌÁ"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ ÚÁÇÒÕÚÏÞÎÏÇÏ ÆÁÊÌÁ"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   ×ÙÂÏÒ ÒÁÚÄÅÌÁ ÄÌÑ Ó×ÏÐÉÎÇÁ sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   ÐÅÒÅËÌÀÞÅÎÉÅ ÆÌÁÇÁ ÚÁÇÒÕÚËÉ"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   ÐÅÒÅËÌÀÞÅÎÉÅ ÆÌÁÇÁ dos-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÁÌØÔÅÒÎÁÔÉ×ÎÙÈ ÃÉÌÉÎÄÒÏ×"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   ×Ù×ÏÄ ÓÙÒÙÈ ÄÁÎÎÙÈ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÓÅËÔÏÒÏ× ÎÁ ÃÉÌÉÎÄÒ"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÇÏÌÏ×ÏË"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   ÉÚÍÅÎÅÎÉÅ ËÏÜÆÆÉÃÉÅÎÔÁ ÞÅÒÅÄÏ×ÁÎÉÑ"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ÉÚÍÅÎÅÎÉÅ ÓËÏÒÏÓÔÉ ×ÒÁÝÅÎÉÑ (ÏÂ/ÍÉÎ)"
 
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
-#: fdisk/fdiskbsdlabel.c:138
-msgid "   r   return to main menu"
-msgstr "   r   ×ÏÚ×ÒÁÔ × ÇÌÁ×ÎÏÅ ÍÅÎÀ"
-
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÓÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÆÉÚÉÞÅÓËÉÈ ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   ÐÅÒÅÍÅÝÅÎÉÅ ÎÁÞÁÌÁ ÄÁÎÎÙÈ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   ÓÐÉÓÏË ÒÁÓÛÉÒÅÎÎÙÈ ÒÁÚÄÅÌÏ×"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   ÓÏÚÄÁÎÉÅ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   ÚÁËÒÅÐÌÅÎÉÅ ÐÏÒÑÄËÁ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "ÇÏÌÏ×ËÉ"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:936
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "ÓÅËÔÏÒÙ"
 
-#: fdisk/fdisk.c:591 fdisk/fdisk.c:1260 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:936
-msgid "cylinders"
-msgstr "ÃÉÌÉÎÄÒÙ"
-
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2388,11 +2731,11 @@ msgstr ""
 "%s%s.\n"
 "÷Ù ÍÏÖÅÔÅ ÓÄÅÌÁÔØ ÜÔÏ ÉÚ ÍÅÎÀ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÆÕÎËÃÉÊ.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " É "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2411,12 +2754,12 @@ msgstr ""
 "2) ÚÁÇÒÕÚËÏÊ É ÐÒÏÇÒÁÍÍÁÍÉ ÒÁÚÍÅÔËÉ ÉÚ ÄÒÕÇÉÈ ïó\n"
 "   (ÎÁÐÒ., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "îÅ×ÅÒÎÏÅ ÓÍÅÝÅÎÉÅ × ÏÓÎÏ×ÎÏÍ ÒÁÓÛÉÒÅÎÎÏÍ ÒÁÚÄÅÌÅ\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2425,17 +2768,19 @@ msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÏÐÕÓËÁÀÔÓÑ ÒÁÚÄÅÌÙ ÐÏÓÌÅ #%d.\n"
 "ïÎÉ ÂÕÄÕÔ ÕÄÁÌÅÎÙ, ÅÓÌÉ ×Ù ÓÏÈÒÁÎÉÔÅ ÜÔÕ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕËÁÚÁÔÅÌØ ÎÁ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÓÓÙÌËÕ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ× %d\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕËÁÚÁÔÅÌØ ÎÁ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÓÓÙÌËÕ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ× %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÇÎÏÒÉÒÕÀÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÄÁÎÎÙÅ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ× %d\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÇÎÏÒÉÒÕÀÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÄÁÎÎÙÅ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ× %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2449,17 +2794,17 @@ msgstr ""
 "×ÏÓÓÔÁÎÏ×ÉÔØ.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "ðÒÉÍÅÞÁÎÉÅ: ÒÁÚÍÅÒ ÓÅËÔÏÒÁ - %d (ÎÅ %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "÷Ù ÂÕÄÅÔÅ ÎÅ × ÓÏÓÔÏÑÎÉÉ ÚÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2468,27 +2813,35 @@ msgstr ""
 "îÁ ÜÔÏÍ ÄÉÓËÅ ÉÍÅÀÔÓÑ ÍÜÄÖÉËÉ DOS É BSD.\n"
 "úÁÄÁÊÔÅ ËÏÍÁÎÄÕ  'b' ÄÌÑ ÐÅÒÅÈÏÄÁ × ÒÅÖÉÍ BSD.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
-msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
-msgstr "õÓÔÒÏÊÓÔ×Ï ÎÅ ÓÏÄÅÒÖÉÔ ÎÉ ×ÅÒÎÏÊ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× DOS, ÎÉ ÍÅÔËÉ ÄÉÓËÁ Sun, SGI ÉÌÉ OSF\n"
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
+msgstr ""
+"õÓÔÒÏÊÓÔ×Ï ÎÅ ÓÏÄÅÒÖÉÔ ÎÉ ×ÅÒÎÏÊ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× DOS, ÎÉ ÍÅÔËÉ ÄÉÓËÁ Sun, "
+"SGI ÉÌÉ OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "éÇÎÏÒÉÒÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
-msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÙÊ ÆÌÁÇ 0x%04x ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× %d ÂÕÄÅÔ ÉÓÐÒÁ×ÌÅÎ ÚÁÐÉÓØÀ\n"
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
+"(rite)\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÙÊ ÆÌÁÇ 0x%04x ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× %d ÂÕÄÅÔ ÉÓÐÒÁ×ÌÅÎ "
+"ÚÁÐÉÓØÀ\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2497,83 +2850,83 @@ msgstr ""
 "\n"
 "ÔÒÉÖÄÙ ÐÏÌÕÞÅÎ EOF - ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "ûÅÓÔÎÁÄÃÁÔÅÒÉÞÎÙÊ ËÏÄ (××ÅÄÉÔÅ L ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÉÓËÁ ËÏÄÏ×): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, ÐÏ ÕÍÏÌÞÁÎÉÀ %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "úÎÁÞÅÎÉÅ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "îÏÍÅÒ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %d ÉÍÅÅÔ ÐÕÓÔÏÊ ÔÉÐ\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "÷ÙÂÒÁÎÎÙÊ ÒÁÚÄÅÌ %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "òÁÚÄÅÌÙ ÅÝÅ ÎÅ ÏÐÒÅÄÅÌÅÎÙ!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "÷ÓÅ ÏÓÎÏ×ÎÙÅ ÒÁÚÄÅÌÙ ÕÖÅ ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "ÃÉÌÉÎÄÒ"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "ÓÅËÔÏÒ"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "éÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃ ÉÚÍÅÒÅÎÉÑ ÜËÒÁÎÁ/ÓÏÄÅÒÖÉÍÏÇÏ ÎÁ %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ðòåäõðòåöäåîéå: òÁÚÄÅÌ %d ÎÅ Ñ×ÌÑÅÔÓÑ ÒÁÓÛÉÒÅÎÎÙÍ ÒÁÚÄÅÌÏÍ\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "æÌÁÇ DOS-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "æÌÁÇ DOS-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "òÁÚÄÅÌ %d ÅÝÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2587,7 +2940,7 @@ msgstr ""
 "ÎÅÒÁÚÕÍÎÏ. ÷Ù ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÒÁÚÄÅÌ,\n"
 "ÉÓÐÏÌØÚÕÑ ËÏÍÁÎÄÕ `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2596,7 +2949,7 @@ msgstr ""
 "÷Ù ÎÅ ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÒÁÚÄÅÌ ÎÁ ÒÁÓÛÉÒÅÎÎÙÊ ÉÌÉ ÎÁÏÂÏÒÏÔ\n"
 "óÎÁÞÁÌÁ ÕÄÁÌÉÔÅ ÅÇÏ.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2607,7 +2960,7 @@ msgstr ""
 "ËÁË ÔÏÇÏ ÏÖÉÄÁÅÔ SunOS/Solaris, É ËÏÔÏÒÙÊ ÇÏÄÉÔÓÑ ÄÁÖÅ ÄÌÑ Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -2618,52 +2971,52 @@ msgstr ""
 "Á ÒÁÚÄÅÌ 11 × ×ÉÄÅ ÃÅÌÏÇÏ ÔÏÍÁ (6), ËÁË ÔÏÇÏ ÏÖÉÄÁÅÔ IRIX.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "óÉÓÔÅÍÎÙÊ ÔÉÐ ÒÁÚÄÅÌÁ %d ÉÚÍÅÎÅÎ ÎÁ %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "òÁÚÄÅÌ %d ÉÍÅÅÔ ÒÁÚÌÉÞÎÙÅ ÆÉÚÉÞÅÓËÉÅ/ÌÏÇÉÞÅÓËÉÅ ÎÁÞÁÌÁ (ÎÅ-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     ÆÉÚ=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "ÌÏÇÉÞ=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "òÁÚÄÅÌ %d ÉÍÅÅÔ ÒÁÚÌÉÞÎÙÅ ÆÉÚÉÞÅÓËÉÅ/ÌÏÇÉÞÅÓËÉÅ ÏËÏÎÞÁÎÉÑ:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "òÁÚÄÅÌ %i ÎÁÞÉÎÁÅÔÓÑ ÎÅ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "ÄÏÌÖÅÎ ÂÙÔØ (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "òÁÚÄÅÌ %i ÎÅ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "ÄÏÌÖÅÎ ÂÙÔØ (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -2672,7 +3025,7 @@ msgstr ""
 "\n"
 "äÉÓË %s: %ld íâ, %lld ÂÁÊÔ\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -2681,17 +3034,17 @@ msgstr ""
 "\n"
 "äÉÓË %s: %ld.%ld çâ, %lld ÂÁÊÔ\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d ÇÏÌÏ×ÏË, %d ÓÅËÔÏÒÏ×/ÄÏÒÏÖËÕ, %d ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", ×ÓÅÇÏ %llu ÓÅËÔÏÒÏ×"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2700,7 +3053,7 @@ msgstr ""
 "åÄÉÎÉÃÙ = %s ÐÏ %d * %d = %d ÂÁÊÔ\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -2709,7 +3062,7 @@ msgstr ""
 "îÅÞÅÇÏ ×ÙÐÏÌÎÑÔØ. ïÞÅÒÅÄÎÏÓÔØ ÕÖÅ × ÐÏÒÑÄËÅ.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -2720,16 +3073,16 @@ msgstr ""
 "÷ÏÚÍÏÖÎÏ, ×Ù ×ÙÂÒÁÌÉ ÎÅ×ÅÒÎÏÅ ÕÓÔÒÏÊÓÔ×Ï.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s úÁÇÒ     îÁÞÁÌÏ       ëÏÎÅà       âÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "õÓÔÒ-×Ï"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -2738,7 +3091,7 @@ msgstr ""
 "\n"
 "ðÕÎËÔÙ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÒÁÓÐÏÌÏÖÅÎÙ ÎÅ × ÄÉÓËÏ×ÏÍ ÐÏÒÑÄËÅ\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -2749,93 +3102,84 @@ msgstr ""
 "äÉÓË %s: %d ÇÏÌÏ×ÏË, %d ÓÅËÔÏÒÏ×, %d ÃÉÌÉÎÄÒÏ×\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "#  AF çÏÌ óÅË  ãÉÌ çÏÌ óÅË  ãÉÌ    îÁÞÁÌÏ      òÁÚÍ ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %d ÓÏÄÅÒÖÉÔ ÎÕÌÅ×ÏÊ ÓÅËÔÏÒ\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "òÁÚÄÅÌ %d: ÇÏÌÏ×ËÁ %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "òÁÚÄÅÌ %d: ÓÅËÔÏÒ %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "òÁÚÄÅÌ %d: ÃÉÌÉÎÄÒ %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "òÁÚÄÅÌ %d: ÐÒÅÄÙÄÕÝÉÅ ÓÅËÔÏÒÙ %d ÐÒÏÔÉ×ÏÒÅÞÁÔ ÓÕÍÍÁÒÎÏÍÕ ÚÎÁÞÅÎÉÀ %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÏÅ ÎÁÞÁÌÏ ÄÁÎÎÙÈ × ÒÁÚÄÅÌÅ %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %d ÐÅÒÅËÒÙ×ÁÅÔ ÒÁÚÄÅÌ %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %d ÐÕÓÔ\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "ìÏÇÉÞÅÓËÉÊ ÒÁÚÄÅÌ %d ÎÅ ÎÁÈÏÄÉÔÓÑ ÃÅÌÉËÏÍ × ÒÁÚÄÅÌÅ %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
-msgstr "óÕÍÍÁÒÎÏÅ ËÏÌÉÞÅÓÔ×Ï ×ÙÄÅÌÅÎÎÙÈ ÓÅËÔÏÒÏ× %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %lld\n"
+msgstr ""
+"óÕÍÍÁÒÎÏÅ ËÏÌÉÞÅÓÔ×Ï ×ÙÄÅÌÅÎÎÙÈ ÓÅËÔÏÒÏ× %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld ÎÅÚÁÎÑÔÙÈ ÓÅËÔÏÒÏ×\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr "òÁÚÄÅÌ %d ÕÖÅ ÏÐÒÅÄÅÌÅÎ.  õÄÁÌÉÔÅ ÅÇÏ ÐÅÒÅÄ ÔÅÍ, ËÁË ÓÎÏ×Á ÄÏÂÁ×ÉÔØ ÅÇÏ.\n"
-
-#: fdisk/fdisk.c:1945 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
-#, c-format
-msgid "First %s"
-msgstr "ðÅÒ×ÙÊ %s"
+msgstr ""
+"òÁÚÄÅÌ %d ÕÖÅ ÏÐÒÅÄÅÌÅÎ.  õÄÁÌÉÔÅ ÅÇÏ ÐÅÒÅÄ ÔÅÍ, ËÁË ÓÎÏ×Á ÄÏÂÁ×ÉÔØ ÅÇÏ.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "óÅËÔÏÒ %d ÕÖÅ ×ÙÄÅÌÅÎ\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "ïÔÓÕÔÓÔ×ÕÀÔ ÄÏÓÔÕÐÎÙÅ Ó×ÏÂÏÄÎÙÅ ÓÅËÔÏÒÙ\n"
 
-#: fdisk/fdisk.c:2005 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
-#, c-format
-msgid "Last %s or +size or +sizeM or +sizeK"
-msgstr "ðÏÓÌÅÄÎÉÊ %s ÉÌÉ +size ÉÌÉ +sizeM ÉÌÉ +sizeK"
-
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -2850,27 +3194,23 @@ msgstr ""
 "\tðòåäõðòåöäåîéå: ðÒÉ ÜÔÏÍ ÓÏÄÅÒÖÉÍÏÅ ÎÁ\n"
 "\tÄÁÎÎÏÍ ÄÉÓËÅ ÂÕÄÅÔ ÒÁÚÒÕÛÅÎÏ.\n"
 
-#: fdisk/fdisk.c:2082 fdisk/fdiskbsdlabel.c:618
-#, c-format
-msgid "The maximum number of partitions has been created\n"
-msgstr "âÙÌÏ ÓÏÚÄÁÎÏ ÍÁËÓÉÍÁÌØÎÏ ×ÏÚÍÏÖÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÒÁÚÄÅÌÏ×\n"
-
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr "óÎÁÞÁÌÁ ×Ù ÄÏÌÖÎÙ ÕÄÁÌÉÔØ ÎÅËÏÔÏÒÙÅ ÒÁÚÄÅÌÙ É ÄÏÂÁ×ÉÔØ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ\n"
+msgstr ""
+"óÎÁÞÁÌÁ ×Ù ÄÏÌÖÎÙ ÕÄÁÌÉÔØ ÎÅËÏÔÏÒÙÅ ÒÁÚÄÅÌÙ É ÄÏÂÁ×ÉÔØ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "úÁÄÅÊÓÔ×Ï×ÁÎÙ ×ÓÅ ÌÏÇÉÞÅÓËÉÅ ÒÁÚÄÅÌÙ\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "äÏÂÁ×ÌÑÅÔÓÑ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -2881,20 +3221,20 @@ msgstr ""
 "   %s\n"
 "   p   ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   ÌÏÇÉÞÅÓËÉÊ (5 ÉÌÉ ÂÏÌÅÅ)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   ÒÁÓÛÉÒÅÎÎÙÊ"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÒÁÚÄÅÌÁ ÄÌÑ ÔÉÐÁ `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -2903,12 +3243,12 @@ msgstr ""
 "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÂÙÌÁ ÉÚÍÅÎÅÎÁ!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "÷ÙÚÙ×ÁÅÔÓÑ ioctl() ÄÌÑ ÐÅÒÅÞÉÔÙ×ÁÎÉÑ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -2917,11 +3257,12 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 "\n"
-"ðòåäõðòåöäåîéå: ðÅÒÅÞÉÔÙ×ÁÎÉÅ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ Ó ÏÛÉÂËÏÊ %d: %s.\n"
+"ðòåäõðòåöäåîéå: ðÅÒÅÞÉÔÙ×ÁÎÉÅ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ Ó "
+"ÏÛÉÂËÏÊ %d: %s.\n"
 "ñÄÒÏ ×ÓÅ ÅÝÅ ÉÓÐÏÌØÚÕÅÔ ÓÔÁÒÕÀ ÔÁÂÌÉÃÕ.\n"
 "îÏ×ÁÑ ÔÁÂÌÉÃÁ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÐÒÉ ÓÌÅÄÕÀÝÅÊ ÐÅÒÅÚÁÇÒÕÚËÅ.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -2935,7 +3276,7 @@ msgstr ""
 "ÓÔÒÁÎÉÃÕ ÒÕËÏ×ÏÄÓÔ×Á fdisk ÄÌÑ ÐÏÌÕÞÅÎÉÑ\n"
 "ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -2944,81 +3285,88 @@ msgstr ""
 "\n"
 "ïÛÉÂËÁ ÚÁËÒÙÔÉÑ ÆÁÊÌÁ\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "óÉÎÈÒÏÎÉÚÉÒÕÀÔÓÑ ÄÉÓËÉ.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "òÁÚÄÅÌ %d ÎÅ ÉÍÅÅÔ ÏÂÌÁÓÔÉ Ó ÄÁÎÎÙÍÉ\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "îÏ×ÏÅ ÎÁÞÁÌÏ ÄÁÎÎÙÈ"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "ëÏÍÁÎÄÙ ÜËÓÐÅÒÔÁ (m ÄÌÑ ÓÐÒÁ×ËÉ): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "ëÏÌÉÞÅÓÔ×Ï ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "ëÏÌÉÞÅÓÔ×Ï ÇÏÌÏ×ÏË"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "ëÏÌÉÞÅÓÔ×Ï ÓÅËÔÏÒÏ×"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÍÅÝÅÎÉÅ ÓÅËÔÏÒÁ ÄÌÑ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó DOS\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÍÅÝÅÎÉÅ ÓÅËÔÏÒÁ ÄÌÑ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "îÁ ÄÉÓËÅ %s ÏÔÓÕÔÓÔ×ÕÅÔ ×ÅÒÎÁÑ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ×\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2454
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ÎÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "üÔÏ ÑÄÒÏ ÓÁÍÏ ÎÁÈÏÄÉÔ ÒÁÚÍÅÒ ÓÅËÔÏÒÁ - ÏÐÃÉÑ -b ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÁ\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
-msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÐÃÉÑ -b (ÕÓÔÁÎÏ×ËÁ ÒÁÚÍÅÒÁ ÓÅËÔÏÒÁ) ÄÏÌÖÎÁ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ Ó ÏÄÎÉÍ ÕËÁÚÁÎÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ\n"
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÐÃÉÑ -b (ÕÓÔÁÎÏ×ËÁ ÒÁÚÍÅÒÁ ÓÅËÔÏÒÁ) ÄÏÌÖÎÁ ÂÙÔØ "
+"ÉÓÐÏÌØÚÏ×ÁÎÁ Ó ÏÄÎÉÍ ÕËÁÚÁÎÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ\n"
 
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-msgstr "ïÂÎÁÒÕÖÅÎÁ ÍÅÔËÁ ÄÉÓËÁ OSF/1 ÎÁ %s, ×ÙÐÏÌÎÑÅÔÓÑ ÐÅÒÅÈÏÄ × ÒÅÖÉÍ ÍÅÔËÉ ÄÉÓËÁ.\n"
+msgstr ""
+"ïÂÎÁÒÕÖÅÎÁ ÍÅÔËÁ ÄÉÓËÁ OSF/1 ÎÁ %s, ×ÙÐÏÌÎÑÅÔÓÑ ÐÅÒÅÈÏÄ × ÒÅÖÉÍ ÍÅÔËÉ "
+"ÄÉÓËÁ.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "ëÏÍÁÎÄÁ (m ÄÌÑ ÓÐÒÁ×ËÉ): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3027,16 +3375,16 @@ msgstr ""
 "\n"
 "ôÅËÕÝÉÊ boot-ÆÁÊÌ: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÎÏ×ÏÇÏ boot-ÆÁÊÌÁ: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot-ÆÁÊÌ ÎÅ ÉÚÍÅÎÅÎ\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3047,323 +3395,6 @@ msgstr ""
 "\të ÓÏÖÁÌÅÎÉÀ ÍÅÎÀ ÜËÓÐÅÒÔÁ ÄÌÑ ÔÁÂÌÉà ÒÁÚÄÅÌÏ× SGI ÎÅ ÄÏÓÔÕÐÎÏ.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:27
-msgid ""
-"\n"
-"\tThere is a valid AIX label on this disk.\n"
-"\tUnfortunately Linux cannot handle these\n"
-"\tdisks at the moment.  Nevertheless some\n"
-"\tadvice:\n"
-"\t1. fdisk will destroy its contents on write.\n"
-"\t2. Be sure that this disk is NOT a still vital\n"
-"\t   part of a volume group. (Otherwise you may\n"
-"\t   erase the other disks as well, if unmirrored.)\n"
-"\t3. Before deleting this physical volume be sure\n"
-"\t   to remove the disk logically from your AIX\n"
-"\t   machine.  (Otherwise you become an AIXpert)."
-msgstr ""
-"\n"
-"\tîÁ ÜÔÏÍ ÄÉÓËÅ ÅÓÔØ ×ÅÒÎÁÑ ÍÅÔËÁ AIX.\n"
-"\të ÓÏÖÁÌÅÎÉÀ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ Linux ÎÅ\n"
-"\tÍÏÖÅÔ ÏÂÒÁÂÁÔÙ×ÁÔØ ÜÔÉ ÄÉÓËÉ. ôÅÍ ÎÅ\n"
-"\tÍÅÎÅÅ ×ÏÔ ÎÅÓËÏÌØËÏ ÓÏ×ÅÔÏ×:\n"
-"\t1. ðÒÉ ÚÁÐÉÓÉ fdisk ÒÁÚÒÕÛÉÔ ×ÓÅ ÄÁÎÎÙÅ\n"
-"\t   ÎÁ ÄÉÓËÅ.\n"
-"\t2. õÂÅÄÉÔÅÓØ, ÞÔÏÂÙ ÜÔÏÔ ÄÉÓË îå Ñ×ÌÑÌÓÑ\n"
-"\t   ×ÁÖÎÏÊ ÞÁÓÔØÀ ÇÒÕÐÐÙ ÔÏÍÏ×. (éÎÁÞÅ ×Ù\n"
-"\t   ÍÏÖÅÔÅ ÓÔÅÒÅÔØ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÄÉÓËÉ,\n"
-"\t   ÅÓÌÉ ÏÎÉ ÎÅ ÏÔÚÅÒËÁÌÅÎÙ.)\n"
-"\t3. ðÅÒÅÄ ÕÄÁÌÅÎÉÅÍ ÜÔÏÇÏ ÆÉÚÉÞÅÓËÏÇÏ\n"
-"\t   ÔÏÍÁ ÕÂÅÄÉÔÅÓØ, ÞÔÏ ÌÏÇÉÞÅÓËÉ ÕÄÁÌÉÌÉ\n"
-"\t   ÄÉÓË ÉÚ AIX Ó×ÏÅÊ ÍÁÛÉÎÙ. (éÎÁÞÅ, ×Ù\n"
-"]\t   ÓÔÁÎÅÔÅ AIXpert'ÏÍ)."
-
-#: fdisk/fdiskbsdlabel.c:122
-#, c-format
-msgid ""
-"\n"
-"BSD label for device: %s\n"
-msgstr ""
-"\n"
-"íÅÔËÁ BSD ÄÌÑ ÕÓÔÒÏÊÓÔ×Á: %s\n"
-
-#: fdisk/fdiskbsdlabel.c:130
-msgid "   d   delete a BSD partition"
-msgstr "   d   ÕÄÁÌÅÎÉÅ ÒÁÚÄÅÌÁ BSD"
-
-#: fdisk/fdiskbsdlabel.c:131
-msgid "   e   edit drive data"
-msgstr "   e   ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÄÁÎÎÙÈ ÄÉÓËÁ"
-
-#: fdisk/fdiskbsdlabel.c:132
-msgid "   i   install bootstrap"
-msgstr "   i   ÕÓÔÁÎÏ×ËÁ bootstrap"
-
-#: fdisk/fdiskbsdlabel.c:133
-msgid "   l   list known filesystem types"
-msgstr "   l   ÓÐÉÓÏË ÔÉÐÏ× ÉÚ×ÅÓÔÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ"
-
-#: fdisk/fdiskbsdlabel.c:135
-msgid "   n   add a new BSD partition"
-msgstr "   n   ÄÏÂÁ×ÌÅÎÉÅ ÎÏ×ÏÇÏ ÒÁÚÄÅÌÁ BSD"
-
-#: fdisk/fdiskbsdlabel.c:136
-msgid "   p   print BSD partition table"
-msgstr "   p   ×Ù×ÏÄ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× BSD"
-
-#: fdisk/fdiskbsdlabel.c:139
-msgid "   s   show complete disklabel"
-msgstr "   s   ÏÔÏÂÒÁÖÅÎÉÅ ÐÏÌÎÏÊ ÍÅÔËÉ ÄÉÓËÁ"
-
-#: fdisk/fdiskbsdlabel.c:140
-msgid "   t   change a partition's filesystem id"
-msgstr "   t   ÉÚÍÅÎÅÎÉÅ id ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ ÒÁÚÄÅÌÁ"
-
-#: fdisk/fdiskbsdlabel.c:141
-msgid "   u   change units (cylinders/sectors)"
-msgstr "   u   ÉÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃ ÉÚÍÅÒÅÎÉÑ (ÃÉÌÉÎÄÒÙ/ÓÅËÔÏÒÙ)"
-
-#: fdisk/fdiskbsdlabel.c:142
-msgid "   w   write disklabel to disk"
-msgstr "   w   ÚÁÐÉÓØ ÍÅÔËÉ ÄÉÓËÁ ÎÁ ÄÉÓË"
-
-#: fdisk/fdiskbsdlabel.c:144
-msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x   Ó×ÑÚÙ×ÁÎÉÅ ÒÁÚÄÅÌÁ BSD Ó ÒÁÚÄÅÌÏÍ ÎÅ-BSD"
-
-#: fdisk/fdiskbsdlabel.c:176
-#, c-format
-msgid "Partition %s has invalid starting sector 0.\n"
-msgstr "òÁÚÄÅÌ %s ÓÏÄÅÒÖÉÔ ÎÅ×ÅÒÎÙÊ ÎÁÞÁÌØÎÙÊ ÎÕÌÅ×ÏÊ ÓÅËÔÏÒ.\n"
-
-#: fdisk/fdiskbsdlabel.c:180
-#, c-format
-msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "þÉÔÁÅÔÓÑ ÍÅÔËÁ ÄÉÓËÁ %s Ó ÓÅËÔÏÒÁ %d.\n"
-
-#: fdisk/fdiskbsdlabel.c:190
-#, c-format
-msgid "There is no *BSD partition on %s.\n"
-msgstr "îÁ %s ÎÅÔ ÒÁÚÄÅÌÁ *BSD.\n"
-
-#: fdisk/fdiskbsdlabel.c:204
-msgid "BSD disklabel command (m for help): "
-msgstr "ëÏÍÁÎÄÁ ÍÅÔËÉ ÄÉÓËÁ BSD (m ÄÌÑ ÓÐÒÁ×ËÉ): "
-
-#: fdisk/fdiskbsdlabel.c:318
-#, c-format
-msgid "type: %s\n"
-msgstr "ÔÉÐ: %s\n"
-
-#: fdisk/fdiskbsdlabel.c:320
-#, c-format
-msgid "type: %d\n"
-msgstr "ÔÉÐ: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:321
-#, c-format
-msgid "disk: %.*s\n"
-msgstr "ÄÉÓË: %.*s\n"
-
-#: fdisk/fdiskbsdlabel.c:322
-#, c-format
-msgid "label: %.*s\n"
-msgstr "ÍÅÔËÁ: %.*s\n"
-
-#: fdisk/fdiskbsdlabel.c:323
-#, c-format
-msgid "flags:"
-msgstr "ÆÌÁÇÉ:"
-
-#: fdisk/fdiskbsdlabel.c:325
-#, c-format
-msgid " removable"
-msgstr " ÓßÅÍÎÙÊ"
-
-#: fdisk/fdiskbsdlabel.c:327
-#, c-format
-msgid " ecc"
-msgstr " ecc"
-
-#: fdisk/fdiskbsdlabel.c:329
-#, c-format
-msgid " badsect"
-msgstr " bad-ÓÅËÔÏÒ"
-
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:333
-#, c-format
-msgid "bytes/sector: %ld\n"
-msgstr "ÂÁÊÔ/ÓÅËÔÏÒ: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:334
-#, c-format
-msgid "sectors/track: %ld\n"
-msgstr "ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:335
-#, c-format
-msgid "tracks/cylinder: %ld\n"
-msgstr "ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:336
-#, c-format
-msgid "sectors/cylinder: %ld\n"
-msgstr "ÓÅËÔÏÒÙ/ÃÉÌÉÎÄÒ: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:337
-#, c-format
-msgid "cylinders: %ld\n"
-msgstr "ÃÉÌÉÎÄÒÙ: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:338
-#, c-format
-msgid "rpm: %d\n"
-msgstr "ÏÂ/ÍÉÎ: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:339
-#, c-format
-msgid "interleave: %d\n"
-msgstr "ÞÅÒÅÄÏ×ÁÎÉÅ: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:340
-#, c-format
-msgid "trackskew: %d\n"
-msgstr "ÐÅÒÅËÏÓ ÄÏÒÏÖËÉ: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:341
-#, c-format
-msgid "cylinderskew: %d\n"
-msgstr "ÐÅÒÅËÏÓ ÃÉÌÉÎÄÒÁ: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:342
-#, c-format
-msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "ÐÅÒÅËÌÀÞÅÎÉÅ ÇÏÌÏ×ËÉ: %ld\t\t# ÍÉÌÌÉÓÅËÕÎÄ\n"
-
-#: fdisk/fdiskbsdlabel.c:344
-#, c-format
-msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr "ÐÏÉÓË ÄÏÒÏÖËÉ: %ld\t# ÍÉÌÌÉÓÅËÕÎÄ\n"
-
-#: fdisk/fdiskbsdlabel.c:346
-#, c-format
-msgid "drivedata: "
-msgstr "ÄÁÎÎÙÅ ÄÉÓËÁ: "
-
-#: fdisk/fdiskbsdlabel.c:355
-#, c-format
-msgid ""
-"\n"
-"%d partitions:\n"
-msgstr ""
-"\n"
-"%d ÒÁÚÄÅÌÙ:\n"
-
-#: fdisk/fdiskbsdlabel.c:356
-#, c-format
-msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "#      ÎÁÞÁÌÏ     ËÏÎÅÃ      ÒÁÚÍÅÒ   ÔÉÐ ÆÓ   [fsize bsize   cpg]\n"
-
-#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
-#, c-format
-msgid "Writing disklabel to %s.\n"
-msgstr "íÅÔËÁ ÄÉÓËÁ ÚÁÐÉÓÙ×ÁÅÔÓÑ ÎÁ %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
-#, c-format
-msgid "%s contains no disklabel.\n"
-msgstr "%s ÎÅ ÓÏÄÅÒÖÉÔ ÍÅÔËÉ ÄÉÓËÁ.\n"
-
-#: fdisk/fdiskbsdlabel.c:427
-msgid "Do you want to create a disklabel? (y/n) "
-msgstr "èÏÔÉÔÅ ÓÏÚÄÁÔØ ÍÅÔËÕ ÄÉÓËÁ? (Ä/Î) "
-
-#: fdisk/fdiskbsdlabel.c:467
-msgid "bytes/sector"
-msgstr "ÂÁÊÔ/ÓÅËÔÏÒ"
-
-#: fdisk/fdiskbsdlabel.c:468
-msgid "sectors/track"
-msgstr "ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ"
-
-#: fdisk/fdiskbsdlabel.c:469
-msgid "tracks/cylinder"
-msgstr "ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ"
-
-#: fdisk/fdiskbsdlabel.c:477
-msgid "sectors/cylinder"
-msgstr "ÓÅËÔÏÒÙ/ÃÉÌÉÎÄÒ"
-
-#: fdisk/fdiskbsdlabel.c:481
-#, c-format
-msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
-msgstr "äÏÌÖÎÏ ÂÙÔØ <= ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ * ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ (ÐÏ ÕÍÏÌÞÁÎÉÀ).\n"
-
-#: fdisk/fdiskbsdlabel.c:483
-msgid "rpm"
-msgstr "ÏÂ/ÍÉÎ"
-
-#: fdisk/fdiskbsdlabel.c:484
-msgid "interleave"
-msgstr "ÞÅÒÅÄÏ×ÁÎÉÅ"
-
-#: fdisk/fdiskbsdlabel.c:485
-msgid "trackskew"
-msgstr "ÐÅÒÅËÏÓ ÄÏÒÏÖËÉ"
-
-#: fdisk/fdiskbsdlabel.c:486
-msgid "cylinderskew"
-msgstr "ÐÅÒÅËÏÓ ÃÉÌÉÎÄÒÁ"
-
-#: fdisk/fdiskbsdlabel.c:487
-msgid "headswitch"
-msgstr "ÐÅÒÅËÌÀÞÅÎÉÅ ÇÏÌÏ×ËÉ"
-
-#: fdisk/fdiskbsdlabel.c:488
-msgid "track-to-track seek"
-msgstr "ÐÏÉÓË ÄÏÒÏÖËÉ"
-
-#: fdisk/fdiskbsdlabel.c:529
-#, c-format
-msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr "Bootstrap: %sboot -> boot%s (%s): "
-
-#: fdisk/fdiskbsdlabel.c:554
-#, c-format
-msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Bootstrap ÐÅÒÅËÒÙ×ÁÅÔÓÑ Ó ÍÅÔËÏÊ ÄÉÓËÁ!\n"
-
-#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
-#, c-format
-msgid "Bootstrap installed on %s.\n"
-msgstr "Bootstrap ÕÓÔÁÎÏ×ÌÅÎ ÎÁ %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:599
-#, c-format
-msgid "Partition (a-%c): "
-msgstr "òÁÚÄÅÌ (a-%c): "
-
-#: fdisk/fdiskbsdlabel.c:630
-#, c-format
-msgid "This partition already exists.\n"
-msgstr "üÔÏÔ ÒÁÚÄÅÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
-
-#: fdisk/fdiskbsdlabel.c:756
-#, c-format
-msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÄÅÌÏ× (%d, ÍÁËÓÉÍÕÍ - %d).\n"
-
-#: fdisk/fdiskbsdlabel.c:804
-#, c-format
-msgid ""
-"\n"
-"Syncing disks.\n"
-msgstr ""
-"\n"
-"óÉÎÈÒÏÎÉÚÉÒÕÀÔÓÑ ÄÉÓËÉ.\n"
-
 #: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
@@ -3420,15 +3451,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux Ó×ÏÐ"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux ÓÏÂÓÔ×ÅÎ."
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3438,8 +3469,12 @@ msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:163
 #, c-format
-msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
-msgstr "÷ ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó MIPS Computer Systems, Inc ÍÅÔËÁ ÎÅ ÄÏÌÖÎÁ ÓÏÄÅÒÖÁÔØ ÂÏÌÅÅ 512 ÂÁÊÔ\n"
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+"÷ ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó MIPS Computer Systems, Inc ÍÅÔËÁ ÎÅ ÄÏÌÖÎÁ ÓÏÄÅÒÖÁÔØ ÂÏÌÅÅ "
+"512 ÂÁÊÔ\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
@@ -3559,7 +3594,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "ðÒÉÓÕÔÓÔ×ÕÅÔ ÂÏÌÅÅ ÏÄÎÏÇÏ ÐÕÎËÔÁ ÄÌÑ ×ÓÅÇÏ ÄÉÓËÁ.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "òÁÚÄÅÌÙ ÎÅ ÏÐÒÅÄÅÌÅÎÙ\n"
@@ -3644,7 +3679,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\t÷Ù ×ÙÂÒÁÌÉ ÎÅÏÂÙÞÎÏÅ ÉÍÑ boot-ÆÁÊÌÁ.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3665,11 +3699,10 @@ msgstr ""
 "ôÏÌØËÏ ÒÁÚÄÅÌ ×ÓÅÇÏ ÄÉÓËÁ \"SGI volume\" ÍÏÖÅÔ ÎÁÒÕÛÉÔØ ÜÔÏ.\n"
 "÷×ÅÄÉÔÅ äá, ÅÓÌÉ ×Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÒÁÚÍÅÔÉÌÉ ÜÔÏÔ ÒÁÚÄÅÌ ÏÔÄÅÌØÎÏ.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "äá\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3726,11 +3759,13 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:728
 #, c-format
 msgid ""
-"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
+"d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
-"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: BLKGETSIZE ioctl ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÎÁ %s. éÓÐÏÌØÚÕÅÔÓÑ ÚÎÁÞÅÎÉÅ ÇÅÏÍÅÔÒÉÉ ÃÉÌÉÎÄÒÁ %d.\n"
-"üÔÏ ÚÎÁÞÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÅÞÅÎÅÎÏ ÄÌÑ ÕÓÔÒÏÊÓÔ× > 33.8 çâ.\n"
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: BLKGETSIZE ioctl ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÎÁ %s. éÓÐÏÌØÚÕÅÔÓÑ "
+"ÚÎÁÞÅÎÉÅ ÇÅÏÍÅÔÒÉÉ ÃÉÌÉÎÄÒÁ %d.\n"
+"üÔÏ ÚÎÁÞÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÕÍÅÎØÛÅÎÏ ÄÌÑ ÕÓÔÒÏÊÓÔ× > 33.8 çâ.\n"
 
 #: fdisk/fdisksgilabel.c:741
 #, c-format
@@ -3742,44 +3777,43 @@ msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ ÓÏÈÒÁÎÉÔØ ÐÁÒÁÍÅÔÒÙ ÒÁÚÄÅÌÁ %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tîáþáìï=%d\täìéîá=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "ðÕÓÔÏÊ"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "á×ÔÏÏÐÒÅÄÅÌÅÎÉÅ Linux raid"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3794,12 +3828,12 @@ msgstr ""
 "ÉÌÉ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÏÂÎÏ×ÉÔØ ÍÅÔËÕ (ËÏÍÁÎÄÁ\n"
 "s × ÇÌÁ×ÎÏÍ ÍÅÎÀ)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "á×ÔÏËÏÎÆÉÇÕÒÁÃÉÑ ÎÁÛÌÁ %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3813,7 +3847,7 @@ msgstr ""
 "×ÏÓÓÔÁÎÏ×ÉÔØ.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3823,72 +3857,72 @@ msgstr ""
 "   ?   Á×ÔÏÍÁÔÉÞÅÓËÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ\n"
 "   0   ×ÙÂÏÒÏÞÎÙÊ (ÓÏ ÚÎÁÞÅÎÉÑÍÉ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÏÂÎÁÒÕÖÅÎÎÏÇÏ ÏÂÏÒÕÄÏ×ÁÎÉÑ)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "÷ÙÂÅÒÉÔÅ ÔÉÐ (? - Á×ÔÏ, 0 - ×ÙÂÏÒÏÞÎÙÊ): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "á×ÔÏËÏÎÆÉÇÕÒÁÃÉÑ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "óÅËÔÏÒÙ/ÄÏÒÏÖËÁ"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "áÌØÔÅÒÎÁÔÉ×ÎÙÅ ÃÉÌÉÎÄÒÙ"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "æÉÚÉÞÅÓËÉÅ ÃÉÌÉÎÄÒÙ"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "óËÏÒÏÓÔØ ×ÒÁÝÅÎÉÑ (ÏÂ/ÍÉÎ)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "ëÏÜÆÆÉÃÉÅÎÔ ÞÅÒÅÄÏ×ÁÎÉÑ"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "äÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÅËÔÏÒÙ ÎÁ ÃÉÌÉÎÄÒ"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "÷Ù ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ×ÓÅ ÐÁÒÁÍÅÔÒÙ ÄÉÓËÁ ÉÚ ÍÅÎÀ x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" ÄÉÓË"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux ÚÁËÁÚÎÏÊ"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "òÁÚÄÅÌ %d ÎÁ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "òÁÚÄÅÌ %d ÐÅÒÅËÒÙ×ÁÅÔÓÑ Ó ÄÒÕÇÉÍÉ × ÓÅËÔÏÒÁÈ %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "îÅÉÓÐÏÌØÚÕÅÍÙÊ ÐÒÏÍÅÖÕÔÏË - ÓÅËÔÏÒÙ 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "îÅÉÓÐÏÌØÚÕÅÍÙÊ ÐÒÏÍÅÖÕÔÏË - ÓÅËÔÏÒÙ %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3897,7 +3931,7 @@ msgstr ""
 "äÒÕÇÉÅ ÒÁÚÄÅÌÙ ÕÖÅ ÏÈ×ÁÔÙ×ÁÀÔ ×ÅÓØ ÄÉÓË.\n"
 "õÄÁÌÉÔÅ ÎÅËÏÔÏÒÙÅ ÉÌÉ ÕÍÅÎØÛÉÔÅ ÉÈ ÐÅÒÅÄ ÐÏ×ÔÏÒÎÏÊ ÐÏÐÙÔËÏÊ.\n"
 
-#: fdisk/fdisksunlabel.c:589
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3908,7 +3942,7 @@ msgstr ""
 "%d %s ÚÁÈ×ÁÔÉÌÏ ÄÒÕÇÏÊ ÒÁÚÄÅÌ. ÷ÁÛ ÐÕÎËÔ ÂÙÌ ÉÚÍÅÎÅÎ\n"
 "ÎÁ %d %s\n"
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3917,7 +3951,7 @@ msgstr ""
 "åÓÌÉ ×Ù ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÏ×ÍÅÓÔÉÍÏÓÔØ Ó SunOS/Solaris, ÐÏÓÔÁÒÁÊÔÅÓØ\n"
 "ÏÓÔÁ×ÉÔØ ÜÔÏÔ ÒÁÚÄÅÌ ËÁË ×ÅÓØ disk (5), ÎÁÞÉÎÁÑ Ó 0, Ó %u ÓÅËÔÏÒÁÍÉ\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3933,7 +3967,7 @@ msgstr ""
 "Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÐÏÍÅÔÉÔØ ÜÔÏÔ ÒÁÚÄÅÌ ËÁË 82\n"
 "82 (Linux Ó×ÏÐ): "
 
-#: fdisk/fdisksunlabel.c:654
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3952,7 +3986,7 @@ msgstr ""
 "åÄÉÎÉÃÙ = %s ÐÏ %d * 512 ÂÁÊÔ\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:668
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -3965,16 +3999,16 @@ msgstr ""
 "åÄÉÎÉÃÙ = %s ÐÏ %d * 512 ÂÁÊÔ\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s æÌÁÇ   îÁÞÁÌÏ     ëÏÎÅà     âÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/fdisksunlabel.c:698
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "ëÏÌÉÞÅÓÔ×Ï ÁÌØÔÅÒÎÁÔÉ×ÎÙÈ ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisksunlabel.c:731
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "ëÏÌÉÞÅÓÔ×Ï ÆÉÚÉÞÅÓËÉÈ ÃÉÌÉÎÄÒÏ×"
 
@@ -3998,32 +4032,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "òÁÓÛÉÒÅÎÎÙÊ"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX ÚÁÇÒÕÚÏÞÎÙÊ"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot-ÍÅÎÅÄÖÅÒ"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4032,7 +4060,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4125,12 +4152,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4151,8 +4176,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4162,7 +4185,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD ÉÌÉ SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4183,12 +4205,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / ÓÔÁÒÙÊ Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux Ó×ÏÐ / Solaris"
@@ -4217,12 +4237,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4231,7 +4249,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4296,30 +4313,22 @@ msgstr "äÁÎÎÙÅ ÎÅ æó"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS ÆÓ"
@@ -4328,116 +4337,110 @@ msgstr "BeOS ÆÓ"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC ÚÁÇÒ."
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS ×ÔÏÒÉÞÎÙÊ"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "ÏÛÉÂËÁ ÐÏÉÓËÁ ÎÁ %s - ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "ÏÛÉÂËÁ ÐÏÉÓËÁ: ÎÕÖÎÙ 0x%08x%08x, ÐÏÌÕÞÅÎÙ 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "ÎÅÈ×ÁÔËÁ ÐÁÍÑÔÉ - ÓÄÁÀÓØ\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ Ó %s - ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÅËÔÏÒ %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ïûéâëá: ÓÅËÔÏÒ %lu ÎÅ ÉÍÅÅÔ ÓÉÇÎÁÔÕÒÙ msdos\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÎÁ %s - ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÅËÔÏÒ %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ Ó ÓÏÈÒÁÎÅÎÎÙÍ ÓÅËÔÏÒÏÍ ÒÁÚÄÅÌÁ (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÎÁ %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÒÁÚÄÅÌÁ (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
-msgstr "ÆÁÊÌ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÒÁÚÄÅÌÁ ÉÍÅÅÔ ÎÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ - ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÏÔÍÅÎÅÎÏ\n"
+msgstr ""
+"ÆÁÊÌ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÒÁÚÄÅÌÁ ÉÍÅÅÔ ÎÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ - ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÏÔÍÅÎÅÎÏ\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "ÎÅÈ×ÁÔËÁ ÐÁÍÑÔÉ?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÒÁÚÄÅÌÁ  (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÕÓÔÒÏÊÓÔ×Ï %s ÄÌÑ ÚÁÐÉÓÉ\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÓÅËÔÏÒÁ %lu ÎÁ %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "äÉÓË %s: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÇÅÏÍÅÔÒÉÀ\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "äÉÓË %s: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4449,22 +4452,23 @@ msgstr ""
 "×ÅÒÏÑÔÎÏ ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ.\n"
 "[éÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ --force, ÅÓÌÉ ×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÜÔÏÇÏ]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: HDIO_GETGEO ÓÏÏÂÝÉÌ, ÞÔÏ ÉÍÅÅÔÓÑ %lu ÇÏÌÏ×ÏË\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: HDIO_GETGEO ÓÏÏÂÝÉÌ, ÞÔÏ ÉÍÅÅÔÓÑ %lu ÓÅËÔÏÒÏ×\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: BLKGETSIZE/HDIO_GETGEO ÓÏÏÂÝÉÌ, ÞÔÏ ÉÍÅÅÔÓÑ %lu ÃÉÌÉÎÄÒÏ×\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: BLKGETSIZE/HDIO_GETGEO ÓÏÏÂÝÉÌ, ÞÔÏ ÉÍÅÅÔÓÑ %lu ÃÉÌÉÎÄÒÏ×\n"
 
-#: fdisk/sfdisk.c:521
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4473,7 +4477,7 @@ msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÍÁÌÏ×ÅÒÏÑÔÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÓÅËÔÏÒÏ× (%lu) - ÏÂÙÞÎÏ ÉÈ 63\n"
 "üÔÏ ×ÙÚÏ×ÅÔ ÐÒÏÂÌÅÍÙ Õ ×ÓÅÈ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ ÁÄÒÅÓÁÃÉÀ C/H/S.\n"
 
-#: fdisk/sfdisk.c:525
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4482,22 +4486,33 @@ msgstr ""
 "\n"
 "äÉÓË %s: %lu ÃÉÌÉÎÄÒÏ×, %lu ÇÏÌÏ×ÏË, %lu ÓÅËÔÏÒÏ×/ÄÏÒÏÖËÕ\n"
 
-#: fdisk/sfdisk.c:607
+#: fdisk/sfdisk.c:606
 #, c-format
-msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr "%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÇÏÌÏ×ËÉ: %lu (ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr ""
+"%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÇÏÌÏ×ËÉ: %lu (ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ "
+"0-%lu)\n"
 
-#: fdisk/sfdisk.c:612
+#: fdisk/sfdisk.c:611
 #, c-format
-msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
-msgstr "%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÓÅËÔÏÒÁ: %lu (ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ 1-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
+"lu)\n"
+msgstr ""
+"%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÓÅËÔÏÒÁ: %lu (ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ "
+"1-%lu)\n"
 
-#: fdisk/sfdisk.c:617
+#: fdisk/sfdisk.c:616
 #, c-format
-msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
-msgstr "%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÃÉÌÉÎÄÒÏ×: %lu (ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
+"lu)\n"
+msgstr ""
+"%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÃÉÌÉÎÄÒÏ×: %lu (ÄÏÌÖÎÏ ÂÙÔØ "
+"ÍÅÖÄÕ 0-%lu)\n"
 
-#: fdisk/sfdisk.c:657
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4506,12 +4521,12 @@ msgstr ""
 "Id  éÍÑ\n"
 "\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "ðÅÒÅÞÉÔÙ×ÁÅÔÓÑ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ×...\n"
 
-#: fdisk/sfdisk.c:819
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4520,31 +4535,31 @@ msgstr ""
 "ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ. ðÅÒÅÇÒÕÚÉÔÅ Ó×ÏÀ\n"
 "ÓÉÓÔÅÍÕ ÐÅÒÅÄ ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ mkfs\n"
 
-#: fdisk/sfdisk.c:824
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "ïÛÉÂËÁ ÚÁËÒÙÔÉÑ %s\n"
 
-#: fdisk/sfdisk.c:862
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ÎÅÔ ÔÁËÏÇÏ ÒÁÚÄÅÌÁ\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÆÏÒÍÁÔ - ÉÓÐÏÌØÚÕÀÔÓÑ ÓÅËÔÏÒÙ\n"
 
-#: fdisk/sfdisk.c:924
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× %s\n"
 
-#: fdisk/sfdisk.c:935
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "ÎÅÏÂÓÌÕÖÉ×ÁÅÍÙÊ ÆÏÒÍÁÔ - ÉÓÐÏÌØÚÕÅÔÓÑ %s\n"
 
-#: fdisk/sfdisk.c:939
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4553,12 +4568,12 @@ msgstr ""
 "åÄÉÎÉÃÙ = ÃÉÌÉÎÄÒÙ ÐÏ %lu ÂÁÊÔ, ÂÌÏËÉ ÐÏ 1024 ÂÁÊÔ, ÎÁÞÉÎÁÑ Ó %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:942
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "  õÓÔÒ-×Ï úÁÇÒ   îÁÞ   ëÏÎÅà    #ÃÉÌ     #ÂÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/sfdisk.c:947
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4567,12 +4582,12 @@ msgstr ""
 "åÄÉÎÉÃÙ = ÓÅËÔÏÒÙ ÐÏ 512 ÂÁÊÔ, ÎÁÞÉÎÁÑ Ó %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:949
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "  õÓÔÒ-×Ï úÁÇÒ   îÁÞÁÌÏ     ëÏÎÅà   #ÓÅËÔÏÒÙ  Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/sfdisk.c:952
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4581,12 +4596,12 @@ msgstr ""
 "åÄÉÎÉÃÙ = ÂÌÏËÉ ÐÏ 1024 ÂÁÊÔ, ÎÁÞÉÎÁÑ Ó %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:954
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "  õÓÔÒ-×Ï úÁÇÒ  îÁÞÁÌÏ     ëÏÎÅà     #ÂÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4595,31 +4610,31 @@ msgstr ""
 "åÄÉÎÉÃÙ = mebi-ÂÁÊÔÙ ÐÏ 1048576 ÂÁÊÔ, ÂÌÏËÉ ÐÏ 1024 ÂÁÊÔ, ÎÁÞÉÎÁÑ Ó %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:959
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "  õÓÔÒ-×Ï úÁÇÒ   îÁÞ ëÏÎÅà    íiB     #ÂÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/sfdisk.c:1119
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tÎÁÞÁÌÏ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1126
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tËÏÎÅÃ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "ÒÁÚÄÅÌ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÃÉÌÉÎÄÒÅ %ld, ÐÏÓÌÅ ËÏÎÃÁ ÄÉÓËÁ\n"
 
-#: fdisk/sfdisk.c:1139
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "òÁÚÄÅÌÙ ÎÅ ÎÁÊÄÅÎÙ\n"
 
-#: fdisk/sfdisk.c:1143
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4631,51 +4646,53 @@ msgstr ""
 "(×ÍÅÓÔÏ %ld/%ld/%ld).\n"
 "äÌÑ ÌÉÓÔÉÎÇÁ ÂÕÄÅÔ ÐÏÄÒÁÚÕÍÅ×ÁÔØÓÑ ÜÔÁ ÇÅÏÍÅÔÒÉÑ.\n"
 
-#: fdisk/sfdisk.c:1192
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÏÔÓÕÔÓÔ×ÕÅÔ.\n"
 
-#: fdisk/sfdisk.c:1194
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "ÓÔÒÁÎÎÏ, ÏÐÒÅÄÅÌÅÎÙ ÔÏÌØËÏ ÒÁÚÄÅÌÙ %d.\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÉÍÅÅÔ ÎÕÌÅ×ÏÊ ÒÁÚÍÅÒ, ÎÏ ÏÎ ÎÅ ÐÏÍÅÞÅÎ ËÁË ÐÕÓÔÏÊ\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÉÍÅÅÔ ÎÕÌÅ×ÏÊ ÒÁÚÍÅÒ, ÎÏ ÏÎ ÎÅ ÐÏÍÅÞÅÎ ËÁË ÐÕÓÔÏÊ\n"
 
-#: fdisk/sfdisk.c:1206
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÉÍÅÅÔ ÎÕÌÅ×ÏÊ ÒÁÚÍÅÒ É Ñ×ÌÑÅÔÓÑ ÚÁÇÒÕÚÏÞÎÙÍ\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÉÍÅÅÔ ÎÕÌÅ×ÏÊ ÒÁÚÍÅÒ É Ñ×ÌÑÅÔÓÑ ÚÁÇÒÕÚÏÞÎÙÍ\n"
 
-#: fdisk/sfdisk.c:1209
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÉÍÅÅÔ ÎÕÌÅ×ÏÊ ÒÁÚÍÅÒ É ÎÅÎÕÌÅ×ÏÅ ÎÁÞÁÌÏ\n"
 
-#: fdisk/sfdisk.c:1220
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s "
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "ÎÅ ÎÁÈÏÄÉÔÓÑ × ÒÁÚÄÅÌÅ %s\n"
 
-#: fdisk/sfdisk.c:1232
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌÙ %s "
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "É ÐÅÒÅËÒÙ×ÁÅÔÓÑ Ó %s\n"
 
-#: fdisk/sfdisk.c:1244
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4684,17 +4701,17 @@ msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÓÏÄÅÒÖÉÔ ÞÁÓÔØ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× (ÓÅËÔÏÒ %lu),\n"
 "É ÒÁÚÒÕÛÉÔ ÅÅ ÐÒÉ ÚÁÐÏÌÎÅÎÉÉ\n"
 
-#: fdisk/sfdisk.c:1256
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÎÁÞÉÎÁÅÔÓÑ Ó ÎÕÌÅ×ÏÇÏ ÓÅËÔÏÒÁ\n"
 
-#: fdisk/sfdisk.c:1260
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÒÁÓÐÏÌÏÇÁÅÔÓÑ ÄÏ ËÏÎÃÁ ÄÉÓËÁ\n"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4702,17 +4719,17 @@ msgstr ""
 "óÒÅÄÉ ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÏ× ÚÁÞÁÓÔÕÀ ÔÏÌØËÏ ÏÄÉÎ ÍÏÖÅÔ\n"
 "ÂÙÔØ ÒÁÓÛÉÒÅÎ (ÔÅÍ ÎÅ ÍÅÎÅÅ, ÄÌÑ Linux ÜÔÏ ÎÅ ÐÒÏÂÌÅÍÁ)\n"
 
-#: fdisk/sfdisk.c:1293
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÎÅ ÎÁÞÉÎÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ\n"
 
-#: fdisk/sfdisk.c:1299
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÎÅ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ\n"
 
-#: fdisk/sfdisk.c:1317
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4720,46 +4737,51 @@ msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÂÏÌÅÅ ÏÄÎÏÇÏ ÒÁÚÄÅÌÁ ÐÏÍÅÞÅÎÏ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ (ÁËÔÉ×ÎÙÊ)\n"
 "üÔÏ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ ÄÌÑ LILO, ÎÏ DOS'Ï×ÓËÉÊ MBR ÎÅ ÚÁÇÒÕÚÉÔ ÜÔÏÔ ÄÉÓË.\n"
 
-#: fdisk/sfdisk.c:1324
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÂÙÞÎÏ ÚÁÇÒÕÚËÁ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ ÔÏÌØËÏ Ó ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÏ×\n"
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÂÙÞÎÏ ÚÁÇÒÕÚËÁ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ ÔÏÌØËÏ Ó ÏÓÎÏ×ÎÙÈ "
+"ÒÁÚÄÅÌÏ×\n"
 "LILO ÉÇÎÏÒÉÒÕÅÔ ÆÌÁÇ `ÚÁÇÒÕÚÏÞÎÙÊ'.\n"
 
-#: fdisk/sfdisk.c:1330
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÔ ÏÓÎÏ×ÎÏÇÏ ÒÁÚÄÅÌÁ, ÐÏÍÅÞÅÎÎÏÇÏ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ (ÁËÔÉ×ÎÙÊ)\n"
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÔ ÏÓÎÏ×ÎÏÇÏ ÒÁÚÄÅÌÁ, ÐÏÍÅÞÅÎÎÏÇÏ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ "
+"(ÁËÔÉ×ÎÙÊ)\n"
 "üÔÏ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ ÄÌÑ LILO, ÎÏ DOS'Ï×ÓËÉÊ MBR ÎÅ ÚÁÇÒÕÚÉÔ ÜÔÏÔ ÄÉÓË.\n"
 
-#: fdisk/sfdisk.c:1344
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "ÎÁÞÁÌÏ"
 
-#: fdisk/sfdisk.c:1347
+#: fdisk/sfdisk.c:1346
 #, c-format
-msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "ÒÁÚÄÅÌ %s: ÎÁÞÁÌÏ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"ÒÁÚÄÅÌ %s: ÎÁÞÁÌÏ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1353
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "ËÏÎÅÃ"
 
-#: fdisk/sfdisk.c:1356
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "ÒÁÚÄÅÌ %s: ËÏÎÅÃ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
+msgstr ""
+"ÒÁÚÄÅÌ %s: ËÏÎÅÃ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1359
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "ÒÁÚÄÅÌ %s ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÃÉÌÉÎÄÒÅ %ld, ÐÏÓÌÅ ËÏÎÃÁ ÄÉÓËÁ\n"
 
-#: fdisk/sfdisk.c:1384
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4768,7 +4790,7 @@ msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÁÞÁÌÏ ÒÁÓÛÉÒÅÎÎÏÇÏ ÒÁÚÄÅÌÁ ÓÄ×ÉÎÕÔÏ Ó %ld ÎÁ %ld\n"
 "(ôÏÌØËÏ ÄÌÑ ×Ù×ÏÄÁ ÌÉÓÔÉÎÇÁ, ÂÅÚ ÉÚÍÅÎÅÎÉÑ ÅÇÏ ÓÏÄÅÒÖÉÍÏÇÏ.)\n"
 
-#: fdisk/sfdisk.c:1390
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4776,341 +4798,361 @@ msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ ÎÅ ÎÁÞÉÎÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÒÁÚÄÅÌÁ.\n"
 "DOS É Linux ÂÕÄÕÔ ÉÎÔÅÒÐÒÅÔÉÒÏ×ÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÐÏ-Ó×ÏÅÍÕ.\n"
 
-#: fdisk/sfdisk.c:1408 fdisk/sfdisk.c:1485
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÄÅÌÏ× - ÉÇÎÏÒÉÒÕÀÔÓÑ ÜÔÉ ÐÏÓÌÅÄÎÉÅ ÎÏÍÅÒÁ (%d)\n"
 
-#: fdisk/sfdisk.c:1423
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "ÄÅÒÅ×Ï ÒÁÚÄÅÌÏ×?\n"
 
-#: fdisk/sfdisk.c:1544
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "ÏÂÎÁÒÕÖÅÎ ÍÅÎÅÄÖÅÒ ÄÉÓËÏ× - ÎÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ\n"
 
-#: fdisk/sfdisk.c:1551
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "îÁÊÄÅÎÁ ÓÉÇÎÁÔÕÒÁ DM6  - ÓÄÁÀÓØ\n"
 
-#: fdisk/sfdisk.c:1571
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "ÓÔÒÁÎÎÏ... ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ ÎÕÌÅ×ÏÇÏ ÒÁÚÍÅÒÁ?\n"
 
-#: fdisk/sfdisk.c:1578 fdisk/sfdisk.c:1589
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "ÓÔÒÁÎÎÏ... ÒÁÚÄÅÌ BSD ÎÕÌÅ×ÏÇÏ ÒÁÚÍÅÒÁ?\n"
 
-#: fdisk/sfdisk.c:1623
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÔÉÐ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×\n"
 
-#: fdisk/sfdisk.c:1635
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "âÙÌ ÕËÁÚÁÎ ÆÌÁÇ -n: îÉÞÅÇÏ ÎÅ ÉÚÍÅÎÅÎÏ\n"
 
-#: fdisk/sfdisk.c:1651
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÒÙÈ ÓÅËÔÏÒÏ× - ×ÙÐÏÌÎÑÅÔÓÑ ÐÒÅÒÙ×ÁÎÉÅ\n"
 
-#: fdisk/sfdisk.c:1656
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÒÁÚÄÅÌÁ ÎÁ %s\n"
 
-#: fdisk/sfdisk.c:1733
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "ÄÌÉÎÎÁÑ ÉÌÉ ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ ××ÏÄÁ - ×ÙÐÏÌÎÑÅÔÓÑ ×ÙÈÏÄ\n"
 
-#: fdisk/sfdisk.c:1769
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "ÏÛÉÂËÁ ××ÏÄÁ: `=' ÏÖÉÄÁÌÓÑ ÐÏÓÌÅ ÐÏÌÑ %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "ÏÛÉÂËÁ ××ÏÄÁ: ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ %c ÐÏÓÌÅ ÐÏÌÑ %s\n"
 
-#: fdisk/sfdisk.c:1782
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ××ÏÄ: %s\n"
 
-#: fdisk/sfdisk.c:1824
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "ÞÉÓÌÏ ÓÌÉÛËÏÍ ÂÏÌØÛÏÅ\n"
 
-#: fdisk/sfdisk.c:1828
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "ÍÕÓÏÒ ÐÏÓÌÅ ÞÉÓÌÁ\n"
 
-#: fdisk/sfdisk.c:1951
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "ÎÅÔ ÍÅÓÔÁ ÄÌÑ ÄÅÓËÒÉÐÔÏÒÁ ÒÁÚÄÅÌÁ\n"
 
-#: fdisk/sfdisk.c:1984
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÏËÒÕÖÁÀÝÉÊ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ\n"
 
-#: fdisk/sfdisk.c:2035
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÌÅÊ ××ÏÄÁ\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2069
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "íÅÓÔÁ ÂÏÌØÛÅ ÎÅÔ\n"
 
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕËÁÚÁÎÎÙÊ ÒÁÚÍÅÒ (%lu) ÐÒÅ×ÙÛÁÅÔ ÍÁËÓÉÍÁÌØÎÏ ÄÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ (%lu)\n"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕËÁÚÁÎÎÙÊ ÒÁÚÍÅÒ (%lu) ÐÒÅ×ÙÛÁÅÔ ÍÁËÓÉÍÁÌØÎÏ ÄÏÐÕÓÔÉÍÙÊ "
+"ÒÁÚÍÅÒ (%lu)\n"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÒÁÚÄÅÌ\n"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÏÅ ÎÁÞÁÌÏ ÒÁÚÄÅÌÁ (ÒÁÎÅÅ %lu)\n"
 
-#: fdisk/sfdisk.c:2153
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ÎÅÒÁÓÐÏÚÁÎÎÙÊ ÚÁÇÒÕÚÏÞÎÙÊ ÆÌÁÇ - ×ÙÂÅÒÉÔÅ - ÉÌÉ *\n"
 
-#: fdisk/sfdisk.c:2170 fdisk/sfdisk.c:2183
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "ÞÁÓÔÉÞÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ c,h,s?\n"
 
-#: fdisk/sfdisk.c:2194
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "òÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ ÎÅ ÔÁÍ, ÇÄÅ ÏÖÉÄÁÌÓÑ\n"
 
-#: fdisk/sfdisk.c:2226
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "ÎÅ×ÅÒÎÙÊ ××ÏÄ\n"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÄÅÌÏ×\n"
 
-#: fdisk/sfdisk.c:2281
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
-"÷×ÏÄ × ÓÌÅÄÕÀÝÅÍ ÆÏÒÍÁÔÅ; ÏÔÓÕÔÓÔ×ÕÀÝÉÅ ÐÏÌÑ ÐÏÌÕÞÁÀÔ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n"
+"÷×ÏÄ × ÓÌÅÄÕÀÝÅÍ ÆÏÒÍÁÔÅ; ÏÔÓÕÔÓÔ×ÕÀÝÉÅ ÐÏÌÑ ÐÏÌÕÞÁÀÔ ÚÎÁÞÅÎÉÑ ÐÏ "
+"ÕÍÏÌÞÁÎÉÀ.\n"
 "<ÎÁÞÁÌÏ> <ÒÁÚÍÅÒ> <ÔÉÐ [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
-"ïÂÙÞÎÏ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÔÏÌØËÏ ÕËÁÚÁÔØ <ÎÁÞÁÌÏ> É <ÒÁÚÍÅÒ> (É ×ÏÚÍÏÖÎÏ <ÔÉÐ>).\n"
-
-#: fdisk/sfdisk.c:2303
-msgid "version"
-msgstr "×ÅÒÓÉÑ"
+"ïÂÙÞÎÏ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÔÏÌØËÏ ÕËÁÚÁÔØ <ÎÁÞÁÌÏ> É <ÒÁÚÍÅÒ> (É ×ÏÚÍÏÖÎÏ "
+"<ÔÉÐ>).\n"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ÏÐÃÉÉ] ÕÓÔÒÏÊÓÔ×Ï...\n"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "ÕÓÔÒÏÊÓÔ×Ï: ÞÔÏ-ÔÏ ×ÒÏÄÅ /dev/hda ÉÌÉ /dev/sda"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "ðÏÌÅÚÎÙÅ ÏÐÃÉÉ:"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ÉÌÉ --show-size]: ÓÐÉÓÏË ÒÁÚÍÅÒÏ× ÒÁÚÄÅÌÏ×"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ÉÌÉ --id]:        ×Ù×ÏÄ ÉÌÉ ÉÚÍÅÎÅÎÉÅ Id ÒÁÚÄÅÌÁ"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ÉÌÉ --list]:      ÓÐÉÓÏË ÒÁÚÄÅÌÏ× ËÁÖÄÏÇÏ ÕÓÔÒÏÊÓÔ×Á"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr "    -d [ÉÌÉ --dump]:      ÄÁÍÐ, ÎÏ × ÆÏÒÍÁÔÅ, ÐÏÄÈÏÄÑÝÅÍ ÄÌÑ ÄÁÌØÎÅÊÛÅÇÏ ××ÏÄÁ"
+msgstr ""
+"    -d [ÉÌÉ --dump]:      ÄÁÍÐ, ÎÏ × ÆÏÒÍÁÔÅ, ÐÏÄÈÏÄÑÝÅÍ ÄÌÑ ÄÁÌØÎÅÊÛÅÇÏ "
+"××ÏÄÁ"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [ÉÌÉ --increment]: ÞÉÓÌÏ ÃÉÌÉÎÄÒÏ× É Ô.Ä. Ó 1, Á ÎÅ Ó 0"
 
-#: fdisk/sfdisk.c:2317
-msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
-msgstr "    -uS, -uB, -uC, -uM:   ÐÒÉÅÍ/ÏÔÞÅÔ × ÅÄÉÎÉÃÁÈ ÓÅËÔÏÒÙ/ÂÌÏËÉ/ÃÉÌÉÎÄÒÙ/íâ"
+#: fdisk/sfdisk.c:2314
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
+"MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:   ÐÒÉÅÍ/ÏÔÞÅÔ × ÅÄÉÎÉÃÁÈ ÓÅËÔÏÒÙ/ÂÌÏËÉ/ÃÉÌÉÎÄÒÙ/íâ"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ÉÌÉ --list-types]:ÓÐÉÓÏË ÉÚ×ÅÓÔÎÙÈ ÔÉÐÏ× ÒÁÚÄÅÌÏ×"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
-msgstr "    -D [ÉÌÉ --DOS]:       ÄÌÑ DOS-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ: ÒÁÓÈÏÄÕÅÔÓÑ ÎÅÍÎÏÇÏ ÍÅÓÔÁ"
+msgstr ""
+"    -D [ÉÌÉ --DOS]:       ÄÌÑ DOS-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ: ÒÁÓÈÏÄÕÅÔÓÑ ÎÅÍÎÏÇÏ ÍÅÓÔÁ"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [ÉÌÉ --re-read]:   ÐÅÒÅÞÉÔÙ×ÁÎÉÅ ÑÄÒÏÍ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                 ÉÚÍÅÎÅÎÉÅ ÔÏÌØËÏ ÒÁÚÄÅÌÁ Ó ÎÏÍÅÒÏÍ #"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                  ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÎÅ ÚÁÐÉÓÙ×ÁÔØ ÎÁ ÄÉÓË"
 
-#: fdisk/sfdisk.c:2323
-msgid "    -O file :            save the sectors that will be overwritten to file"
-msgstr "    -O ÆÁÊÌ :             ÓÏÈÒÁÎÅÎÉÅ × ÆÁÊÌ ÓÅËÔÏÒÏ×, ËÏÔÏÒÙÅ ÂÕÄÕÔ ÐÅÒÅÚÁÐÉÓÁÎÙ"
+#: fdisk/sfdisk.c:2320
+msgid ""
+"    -O file :            save the sectors that will be overwritten to file"
+msgstr ""
+"    -O ÆÁÊÌ :             ÓÏÈÒÁÎÅÎÉÅ × ÆÁÊÌ ÓÅËÔÏÒÏ×, ËÏÔÏÒÙÅ ÂÕÄÕÔ "
+"ÐÅÒÅÚÁÐÉÓÁÎÙ"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I ÆÁÊÌ :             ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÜÔÉÈ ÓÅËÔÏÒÏ×"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ÉÌÉ --version]:   ×Ù×ÏÄ ÎÏÍÅÒÁ ×ÅÒÓÉÉ"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ÉÌÉ --help]:      ×Ù×ÏÄ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "ïÐÁÓÎÙÅ ÏÐÃÉÉ:"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [ÉÌÉ --show-geometry]: ×Ù×ÏÄ ÇÅÏÍÅÔÒÉÉ, ÔÒÁËÔÕÅÍÏÊ ÑÄÒÏÍ"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2326
+msgid ""
+"    -G [or --show-pt-geometry]: print geometry guessed from the partition "
+"table"
+msgstr ""
+"    -G [ÉÌÉ --show-pt-geometry]: ×Ù×ÏÄ ÇÅÏÍÅÔÒÉÉ, ÐÏÌÕÞÅÎÎÏÊ ÉÚ ÔÁÂÌÉÃÙ "
+"ÒÁÚÄÅÌÏ×"
+
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [ÉÌÉ --show-extended]: ÔÁËÖÅ ×Ù×ÏÄ ÓÐÉÓËÁ ÒÁÓÛÉÒÅÎÎÙÈ ÒÁÚÄÅÌÏ× ÎÁ ×ÙÈÏÄÅ\n"
+"    -x [ÉÌÉ --show-extended]: ÔÁËÖÅ ×Ù×ÏÄ ÓÐÉÓËÁ ÒÁÓÛÉÒÅÎÎÙÈ ÒÁÚÄÅÌÏ× ÎÁ "
+"×ÙÈÏÄÅ\n"
 "                              ÉÌÉ ÏÖÉÄÁÅÍÙÅ ÄÅÓËÒÉÐÔÏÒÙ ÄÌÑ ÎÉÈ ÎÁ ×ÈÏÄÅ"
 
-#: fdisk/sfdisk.c:2331
-msgid "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+#: fdisk/sfdisk.c:2329
+msgid ""
+"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [ÉÌÉ --Linux]:      ÉÇÎÏÒÉÒÏ×ÁÎÉÅ ×ÅÝÅÊ, ÎÅÕÍÅÓÔÎÙÈ ÄÌÑ Linux"
 
-#: fdisk/sfdisk.c:2332
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ÉÌÉ --quiet]:      ÐÏÄÁ×ÌÅÎÉÅ ÐÒÅÄÕÐÒÅÖÄÁÀÝÉÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "÷Ù ÍÏÖÅÔÅ ÐÅÒÅËÒÙÔØ ÏÂÎÁÒÕÖÅÎÎÕÀ ÇÅÏÍÅÔÒÉÀ, ÉÓÐÏÌØÚÕÑ:"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [ÉÌÉ --cylinders #]:ÕÓÔÁÎÏ×ËÁ ÞÉÓÌÁ ÉÓÐÏÌØÚÕÅÍÙÈ ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ÉÌÉ --heads #]:    ÕÓÔÁÎÏ×ËÁ ÞÉÓÌÁ ÉÓÐÏÌØÚÕÅÍÙÈ ÇÏÌÏ×ÏË"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [ÉÌÉ --sectors #]:  ÕÓÔÁÎÏ×ËÁ ÞÉÓÌÁ ÉÓÐÏÌØÚÕÅÍÙÈ ÓÅËÔÏÒÏ×"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "÷Ù ÍÏÖÅÔÅ ÏÔËÌÀÞÉÔØ ÐÒÏ×ÅÒËÕ ×ÓÅÈ ÐÒÏÔÉ×ÏÒÅÞÉÊ:"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
-msgstr "    -f  [ÉÌÉ --force]:      ×ÙÐÏÌÎÑÔØ ÔÏ, ÞÔÏ Ñ ÓËÁÖÕ, ÄÁÖÅ ÅÓÌÉ ÜÔÏ ÇÌÕÐÏÓÔØ"
+msgstr ""
+"    -f  [ÉÌÉ --force]:      ×ÙÐÏÌÎÑÔØ ÔÏ, ÞÔÏ Ñ ÓËÁÖÕ, ÄÁÖÅ ÅÓÌÉ ÜÔÏ ÇÌÕÐÏÓÔØ"
 
-#: fdisk/sfdisk.c:2344
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
 
-#: fdisk/sfdisk.c:2345
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s ÕÓÔÒÏÊÓÔ×Ï\t\t ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÁËÔÉ×ÎÙÈ ÒÁÚÄÅÌÏ× ÕÓÔÒÏÊÓÔ×Á\n"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr "%s ÕÓÔÒÏÊÓÔ×Ï n1 n2 ... ÁËÔÉ×ÉÒÕÅÔ ÒÁÚÄÅÌÙ n1 ... É ÄÅÚÁËÔÉ×ÉÒÕÅÔ ÏÓÔÁÌØÎÙÅ\n"
+msgstr ""
+"%s ÕÓÔÒÏÊÓÔ×Ï n1 n2 ... ÁËÔÉ×ÉÒÕÅÔ ÒÁÚÄÅÌÙ n1 ... É ÄÅÚÁËÔÉ×ÉÒÕÅÔ ÏÓÔÁÌØÎÙÅ\n"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -ÕÓÔÒÏÊÓÔ×Ï \t ÁËÔÉ×ÉÒÕÅÔ ÒÁÚÄÅÌ n, ÄÅÚÁËÔÉ×ÉÒÕÅÔ ÄÒÕÇÉÅ ÒÁÚÄÅÌÙ\n"
 
-#: fdisk/sfdisk.c:2511
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "ÎÅÔ ËÏÍÁÎÄÙ?\n"
 
-#: fdisk/sfdisk.c:2629
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "×ÓÅÇÏ: %llu ÂÌÏËÏ×\n"
 
-#: fdisk/sfdisk.c:2666
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: sfdisk --print-id ÕÓÔÒÏÊÓÔ×Ï ÎÏÍÅÒ_ÒÁÚÄÅÌÁ\n"
 
-#: fdisk/sfdisk.c:2668
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: sfdisk --change-id ÕÓÔÒÏÊÓÔ×Ï ÎÏÍÅÒ_ÒÁÚÄÅÌÁ Id\n"
 
-#: fdisk/sfdisk.c:2670
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: sfdisk --id ÕÓÔÒÏÊÓÔ×Ï ÎÏÍÅÒ_ÒÁÚÄÅÌÁ [Id]\n"
 
-#: fdisk/sfdisk.c:2677
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "ÍÏÖÎÏ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÏ ÕÓÔÒÏÊÓÔ×Ï (ËÒÏÍÅ ÔÅÈ, ÞÔÏ Ó  -l ÉÌÉ -s)\n"
 
-#: fdisk/sfdisk.c:2703
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ-ÚÁÐÉÓÉ\n"
 
-#: fdisk/sfdisk.c:2705
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ\n"
 
-#: fdisk/sfdisk.c:2730
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: ïë\n"
 
-#: fdisk/sfdisk.c:2747
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld ÃÉÌÉÎÄÒÏ×, %ld ÇÏÌÏ×ÏË, %ld ÓÅËÔÏÒÏ×/ÄÏÒÏÖËÕ\n"
 
-#: fdisk/sfdisk.c:2764
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ %s\n"
 
-#: fdisk/sfdisk.c:2842
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ÎÅ×ÅÒÎÙÊ active-ÂÁÊÔ: 0x%x ×ÍÅÓÔÏ 0x80\n"
 
-#: fdisk/sfdisk.c:2860 fdisk/sfdisk.c:2913 fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5118,7 +5160,7 @@ msgstr ""
 "çÏÔÏ×Ï\n"
 "\n"
 
-#: fdisk/sfdisk.c:2869
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5127,35 +5169,35 @@ msgstr ""
 "õ ×ÁÓ ÉÍÅÀÔÓÑ %d ÁËÔÉ×ÎÙÈ ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÁ. üÔÏ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ ÄÌÑ LILO,\n"
 "ÎÏ DOS'Ï×ÓËÉÊ MBR ÚÁÇÒÕÚÉÔ ÔÏÌØËÏ ÄÉÓË Ó ÏÄÎÉÍ ÁËÔÉ×ÎÙÍ ÒÁÚÄÅÌÏÍ.\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "ÒÁÚÄÅÌ %s ÉÍÅÅÔ id %x É ÎÅ Ñ×ÌÑÅÔÓÑ ÓËÒÙÔÙÍ\n"
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "îÅ×ÅÒÎÙÊ Id %lx\n"
 
-#: fdisk/sfdisk.c:2955
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "üÔÏÔ ÄÉÓË ÓÅÊÞÁÓ ÉÓÐÏÌØÚÕÅÔÓÑ.\n"
 
-#: fdisk/sfdisk.c:2972
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "îÅÉÓÐÒÁ×ÉÍÁÑ ÏÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s\n"
 
-#: fdisk/sfdisk.c:2975
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ\n"
 
-#: fdisk/sfdisk.c:2981
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "ðÒÏ×ÅÒÑÅÔÓÑ, ÞÔÏÂÙ ÓÅÊÞÁÓ ÎÉËÔÏ ÎÅ ÉÓÐÏÌØÚÏ×ÁÌ ÜÔÏÔ ÄÉÓË...\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5164,33 +5206,34 @@ msgid ""
 msgstr ""
 "\n"
 "äÉÓË ÓÅÊÞÁÓ ÉÓÐÏÌØÚÕÅÔÓÑ - ÓËÏÒÅÅ ×ÓÅÇÏ, ÒÁÚÍÅÔËÁ - ÜÔÏ ÐÌÏÈÁÑ ÉÄÅÑ.\n"
-"òÁÚÍÏÎÔÉÒÕÊÔÅ ×ÓÅ ÆÁÊÌÏ×ÙÅ ÓÉÓÔÅÍÙ É ÏÔËÌÀÞÉÔÅ ×ÓÅ ÒÁÚÄÅÌÙ Ó×ÏÐÉÎÇÁ ÜÔÏÇÏ ÄÉÓËÁ.\n"
+"òÁÚÍÏÎÔÉÒÕÊÔÅ ×ÓÅ ÆÁÊÌÏ×ÙÅ ÓÉÓÔÅÍÙ É ÏÔËÌÀÞÉÔÅ ×ÓÅ ÒÁÚÄÅÌÙ Ó×ÏÐÉÎÇÁ ÜÔÏÇÏ "
+"ÄÉÓËÁ.\n"
 "éÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ --no-reread ÄÌÑ ÏÔÍÅÎÙ ÜÔÏÊ ÐÒÏ×ÅÒËÉ.\n"
 
-#: fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "éÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ --force ÄÌÑ ÏÔËÌÀÞÅÎÉÑ ×ÓÅÈ ÐÒÏ×ÅÒÏË.\n"
 
-#: fdisk/sfdisk.c:2991
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "ïë\n"
 
-#: fdisk/sfdisk.c:3000
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "óÔÁÒÁÑ ÓÉÔÕÁÃÉÑ:\n"
 
-#: fdisk/sfdisk.c:3004
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "òÁÚÄÅÌ %d ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÎÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÅÇÏ\n"
 
-#: fdisk/sfdisk.c:3012
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "îÏ×ÁÑ ÓÉÔÕÁÃÉÑ:\n"
 
-#: fdisk/sfdisk.c:3017
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5198,21 +5241,21 @@ msgstr ""
 "îÅ ÎÒÁ×ÑÔÓÑ ÍÎÅ ÜÔÉ ÒÁÚÄÅÌÙ - ÎÉÞÅÇÏ ÎÅ ÉÚÍÅÎÅÎÏ.\n"
 "(åÓÌÉ ×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÜÔÏÇÏ, ÉÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ --force.)\n"
 
-#: fdisk/sfdisk.c:3020
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "îÅ ÎÒÁ×ÉÔÓÑ ÍÎÅ ÜÔÏ - ×ÏÚÍÏÖÎÏ, ×ÁÍ ÓÌÅÄÕÅÔ ÏÔ×ÅÔÉÔØ îÅÔ\n"
 
-#: fdisk/sfdisk.c:3025
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "÷ÁÓ ÕÓÔÒÁÉ×ÁÅÔ ÔÁËÏÊ ×ÁÒÉÁÎÔ? [ÄÎ×] "
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "÷Ù ÈÏÔÉÔÅ ÚÁÐÉÓÁÔØ ÜÔÏ ÎÁ ÄÉÓË? [ÄÎ×] "
 
-#: fdisk/sfdisk.c:3032
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5221,16 +5264,16 @@ msgstr ""
 "\n"
 "sfdisk: ÐÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ ÏËÏÎÞÁÎÉÅ ××ÏÄÁ\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ - ÎÉÞÅÇÏ ÎÅ ÉÚÍÅÎÅÎÏ\n"
 
-#: fdisk/sfdisk.c:3040
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ÏÔ×ÅÔØÔÅ Ä, Î ÉÌÉ ×\n"
 
-#: fdisk/sfdisk.c:3048
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5239,14 +5282,16 @@ msgstr ""
 "îÏ×ÁÑ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÕÓÐÅÛÎÏ ÚÁÐÉÓÁÎÁ\n"
 "\n"
 
-#: fdisk/sfdisk.c:3054
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"åÓÌÉ ×Ù ÓÏÚÄÁÌÉ ÉÌÉ ÉÚÍÅÎÉÌÉ ÒÁÚÄÅÌ DOS, ÓËÁÖÅÍ, /dev/foo7, ÉÓÐÏÌØÚÕÊÔÅ ÚÁÔÅÍ dd(1),\n"
-"ÞÔÏÂÙ ÏÂÎÕÌÉÔØ ÐÅÒ×ÙÅ 512 ÂÁÊÔ:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"åÓÌÉ ×Ù ÓÏÚÄÁÌÉ ÉÌÉ ÉÚÍÅÎÉÌÉ ÒÁÚÄÅÌ DOS, ÓËÁÖÅÍ, /dev/foo7, ÉÓÐÏÌØÚÕÊÔÅ "
+"ÚÁÔÅÍ dd(1),\n"
+"ÞÔÏÂÙ ÏÂÎÕÌÉÔØ ÐÅÒ×ÙÅ 512 ÂÁÊÔ:  dd if=/dev/zero of=/dev/foo7 bs=512 "
+"count=1\n"
 "(óÍ. fdisk(8).)\n"
 
 #: getopt/getopt.c:233
@@ -5278,20 +5323,26 @@ msgid "              parameters\n"
 msgstr "              ÐÁÒÁÍÅÔÒÙ\n"
 
 #: getopt/getopt.c:328
-msgid "  -a, --alternative            Allow long options starting with single -\n"
-msgstr "  -a, --alternative            òÁÚÒÅÛÅÎÉÅ ÄÌÉÎÎÙÈ ÏÐÃÉÊ, ÎÁÞÉÎÁÀÝÉÈÓÑ Ó ÏÄÎÏÇÏ -\n"
+msgid ""
+"  -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            òÁÚÒÅÛÅÎÉÅ ÄÌÉÎÎÙÈ ÏÐÃÉÊ, ÎÁÞÉÎÁÀÝÉÈÓÑ Ó "
+"ÏÄÎÏÇÏ -\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   üÔÏ ÎÅÂÏÌØÛÏÅ ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ\n"
+msgstr ""
+"  -h, --help                   üÔÏ ÎÅÂÏÌØÛÏÅ ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   äÌÉÎÎÙÅ ÏÐÃÉÉ ÄÌÑ ÒÁÓÐÏÚÎÁ×ÁÎÉÑ\n"
 
 #: getopt/getopt.c:331
-msgid "  -n, --name=progname          The name under which errors are reported\n"
-msgstr "  -n, --name=ÉÍÑ_ÐÒÏÇÒÁÍÍÙ     éÍÑ, ÏÔ ËÏÔÏÒÏÇÏ ×ÅÄÅÔÓÑ ÏÔÞÅÔ Ï ÏÛÉÂËÁÈ\n"
+msgid ""
+"  -n, --name=progname          The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=ÉÍÑ_ÐÒÏÇÒÁÍÍÙ     éÍÑ, ÏÔ ËÏÔÏÒÏÇÏ ×ÅÄÅÔÓÑ ÏÔÞÅÔ Ï ÏÛÉÂËÁÈ\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
@@ -5299,7 +5350,8 @@ msgstr "  -o, --options=ÓÔÒÏËÁ_ÏÐÃÉÊ   ëÏÒÏÔËÉÅ ÏÐÃÉÉ ÄÌÑ ÒÁÓÐÏÚÎÁ×ÁÎÉÑ\n"
 
 #: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-msgstr "  -q, --quiet                  ïÔËÌÀÞÅÎÉÅ ÏÔÞÅÔÁ ÏÂ ÏÛÉÂËÁÈ getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  ïÔËÌÀÞÅÎÉÅ ÏÔÞÅÔÁ ÏÂ ÏÛÉÂËÁÈ getopt(3)\n"
 
 #: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
@@ -5307,7 +5359,8 @@ msgstr "  -Q, --quiet-output           âÅÚ ÏÂÙÞÎÙÈ ×ÙÈÏÄÎÙÈ ÄÁÎÎÙÈ\n"
 
 #: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr "  -s, --shell=ÛÅÌÌ             õÓÔÁÎÏ×ËÁ ÕÓÌÏ×ÉÊ ÚÁËÌ. × ËÁ×ÙÞËÉ ÄÌÑ ÛÅÌÌÁ\n"
+msgstr ""
+"  -s, --shell=ÛÅÌÌ             õÓÔÁÎÏ×ËÁ ÕÓÌÏ×ÉÊ ÚÁËÌ. × ËÁ×ÙÞËÉ ÄÌÑ ÛÅÌÌÁ\n"
 
 #: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
@@ -5315,7 +5368,8 @@ msgstr "  -T, --test                   ðÒÏ×ÅÒËÁ ×ÅÒÓÉÉ getopt(1)\n"
 
 #: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -u, --unqote                 îÅ ÚÁËÌÀÞÁÔØ × ËÁ×ÙÞËÉ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ\n"
+msgstr ""
+"  -u, --unqote                 îÅ ÚÁËÌÀÞÁÔØ × ËÁ×ÙÞËÉ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ\n"
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
@@ -5334,129 +5388,132 @@ msgstr "getopt (ÕÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÙÊ) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ, Ó×ÑÖÉÔÅÓØ Ó Á×ÔÏÒÏÍ."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "ÚÁÇÒÕÖÅÎ ÉÚ MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD-ÞÁÓÙ\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "ÐÏÒÔ ÞÁÓÏ× ×ÙÓÔÁ×ÌÅÎ ÎÁ 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "ËÌÁÓÓÎÁÑ éçòõûëá!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: ÁÔÏÍÎÙÊ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÄÌÑ 1000 ÉÔÅÒÁÃÉÊ!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ÐÏÌÕÞÉÔØ ÒÁÚÒÅÛÅÎÉÅ, ÐÏÔÏÍÕ ÎÅ ÂÙÌÁ ×ÙÐÏÌÎÅÎÁ ÐÏÐÙÔËÁ.\n"
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ÐÏÌÕÞÉÔØ ÒÁÚÒÅÛÅÎÉÅ, ÐÏÔÏÍÕ ÎÅ ÂÙÌÁ ×ÙÐÏÌÎÅÎÁ ÐÏÐÙÔËÁ.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
-msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÐÏÒÔÕ I/O:  ×ÙÚÏ× iopl(3) ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ.\n"
+msgstr ""
+"%s ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÐÏÒÔÕ I/O:  ×ÙÚÏ× iopl(3) ÚÁ×ÅÒÛÉÌÓÑ "
+"ÎÅÕÄÁÞÅÊ.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "÷ÏÚÍÏÖÎÏ, ×ÁÍ ÎÕÖÎÙ ÐÒÉ×ÉÌÅÇÉÉ root'Á.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "ðÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ, ÞÔÏ ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ %s ×ÒÅÍÅÎÉ.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "ÍÅÓÔÎÏÍÕ"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÒÁÓÐÏÚÎÁÎÎÁÑ ÔÒÅÔØÑ ÓÔÒÏËÁ × ÆÁÊÌÅ adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(ïÖÉÄÁÌÏÓØ: `UTC' ÉÌÉ `LOCAL' ÉÌÉ ÎÉÞÅÇÏ.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "äÁÔÁ ÐÏÓÌÅÄÎÅÊ ËÏÒÒÅËÔÉÒÏ×ËÉ ÏÔËÌÏÎÅÎÉÑ - %ld ÓÅËÕÎÄ ÐÏÓÌÅ 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "äÁÔÁ ÐÏÓÌÅÄÎÅÊ ËÁÌÉÂÒÏ×ËÉ - %ld ÓÅËÕÎÄ ÐÏÓÌÅ 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ %s ×ÒÅÍÅÎÉ\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "ïÖÉÄÁÅÔÓÑ ÔÉËÁÎØÅ ÞÁÓÏ×...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...ÐÏÌÕÞÅÎÏ ÔÉËÁÎØÅ ÞÁÓÏ×\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "îÅ×ÅÒÎÙÅ ÚÎÁÞÅÎÉÑ × ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÁÈ: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "áÐÐÁÒÁÔÎÏÅ ×ÒÅÍÑ: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld ÓÅËÕÎÄ Ó 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "÷ÒÅÍÑ, ÐÒÏÞÉÔÁÎÎÏÅ Ó ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ×: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÕÓÔÁÎÁ×ÌÉ×ÁÀÔÓÑ × %.2d:%.2d:%.2d = %ld ÓÅËÕÎÄ Ó 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "þÁÓÙ ÎÅ ÉÚÍÅÎÅÎÙ - ÔÏÌØËÏ ÔÅÓÔÉÒÏ×ÁÎÉÅ.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5465,27 +5522,32 @@ msgstr ""
 "÷ÒÅÍÑ, ÐÒÏÛÅÄÛÅÅ Ó ÎÁÞÁÌÁ ÏÔÓÞÅÔÁ, ÓÏÓÔÁ×ÉÌÏ %.6f ÓÅËÕÎÄ.\n"
 "äÏÐÏÌÎÉÔÅÌØÎÁÑ ÚÁÄÅÒÖËÁ ÄÌÑ ÄÏÓÔÉÖÅÎÉÑ ÓÌÅÄÕÀÝÅÊ ÐÏÌÎÏÊ ÓÅËÕÎÄÙ.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
-msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
-msgstr "òÅÇÉÓÔÒÙ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÓÏÄÅÒÖÁÔ ÚÎÁÞÅÎÉÑ, ËÏÔÏÒÙÅ ÌÉÂÏ ÎÅ×ÅÒÎÙ (ÎÁÐÒ., 50-Ê ÄÅÎØ ÍÅÓÑÃÁ), ÌÉÂÏ ÎÁÈÏÄÑÔÓÑ ÚÁ ÐÒÅÄÅÌÁÍÉ ÜÆÆÅËÔÉ×ÎÏÇÏ ÄÉÁÐÁÚÏÎÁ (ÎÁÐÒ, 2095 ÇÏÄ).\n"
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"òÅÇÉÓÔÒÙ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÓÏÄÅÒÖÁÔ ÚÎÁÞÅÎÉÑ, ËÏÔÏÒÙÅ ÌÉÂÏ ÎÅ×ÅÒÎÙ (ÎÁÐÒ., 50-"
+"Ê ÄÅÎØ ÍÅÓÑÃÁ), ÌÉÂÏ ÎÁÈÏÄÑÔÓÑ ÚÁ ÐÒÅÄÅÌÁÍÉ ÜÆÆÅËÔÉ×ÎÏÇÏ ÄÉÁÐÁÚÏÎÁ (ÎÁÐÒ, "
+"2095 ÇÏÄ).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f ÓÅËÕÎÄ\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "îÅ ÕËÁÚÁÎÁ ÏÐÃÉÑ --date.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "áÒÇÕÍÅÎÔ --date ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5494,21 +5556,23 @@ msgstr ""
 "úÎÁÞÅÎÉÅ ÏÐÃÉÉ --date ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÏÊ ÄÁÔÏÊ.\n"
 "÷ ÞÁÓÔÎÏÓÔÉ, ÏÎÏ ÓÏÄÅÒÖÉÔ ËÁ×ÙÞËÉ.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "ðÏÄÁÅÔÓÑ ËÏÍÁÎÄÙ ÄÁÔÙ: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ ÐÒÏÇÒÁÍÍÕ 'date' × ÛÅÌÌÅ /bin/sh. popen() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ ÐÒÏÇÒÁÍÍÕ 'date' × ÛÅÌÌÅ /bin/sh. popen() ÚÁ×ÅÒÛÉÌÓÑ "
+"ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "ÏÔ×ÅÔ ËÏÍÁÎÄÙ date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5523,66 +5587,76 @@ msgstr ""
 "ïÔ×ÅÔ ÂÙÌ:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
-"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
-"ëÏÍÁÎÄÁ date, ×ÙÚ×ÁÎÎÁÑ %s, ×ÏÚ×ÒÁÔÉÌÁ ÞÔÏ-ÔÏ ËÒÏÍÅ ÃÅÌÏÇÏ ÞÉÓÌÁ, ÔÏÇÄÁ ËÁË ÏÖÉÄÁÌÏÓØ ÐÒÅÏÂÒÁÚÏ×ÁÎÎÏÅ ÚÎÁÞÅÎÉÅ ×ÒÅÍÅÎÉ.\n"
+"ëÏÍÁÎÄÁ date, ×ÙÚ×ÁÎÎÁÑ %s, ×ÏÚ×ÒÁÔÉÌÁ ÞÔÏ-ÔÏ ËÒÏÍÅ ÃÅÌÏÇÏ ÞÉÓÌÁ, ÔÏÇÄÁ ËÁË "
+"ÏÖÉÄÁÌÏÓØ ÐÒÅÏÂÒÁÚÏ×ÁÎÎÏÅ ÚÎÁÞÅÎÉÅ ×ÒÅÍÅÎÉ.\n"
 "ëÏÍÁÎÄÁ ÂÙÌÁ:\n"
 "  %s\n"
 "ïÔ×ÅÔ ÂÙÌ:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "ÓÔÒÏËÁ ÄÁÔÙ %s ÒÁ×ÎÑÅÔÓÑ %ld ÓÅËÕÎÄÁÍ Ó 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
-msgstr "áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÎÅ ÓÏÄÅÒÖÁÔ ×ÅÒÎÏÇÏ ×ÒÅÍÅÎÉ, ÐÏÜÔÏÍÕ Ó ÎÉÈ ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÓÉÓÔÅÍÎÏÅ ×ÒÅÍÑ.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÎÅ ÓÏÄÅÒÖÁÔ ×ÅÒÎÏÇÏ ×ÒÅÍÅÎÉ, ÐÏÜÔÏÍÕ Ó ÎÉÈ ÎÅ×ÏÚÍÏÖÎÏ "
+"ÕÓÔÁÎÏ×ÉÔØ ÓÉÓÔÅÍÎÏÅ ×ÒÅÍÑ.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "÷ÙÚÙ×ÁÅÔÓÑ settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "óÉÓÔÅÍÎÙÅ ÞÁÓÙ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ, ÐÏÔÏÍÕ ÞÔÏ ÚÁÐÕÓË × ÔÅÓÔÏ×ÏÍ ÒÅÖÉÍÅ.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "äÌÑ ÕÓÔÁÎÏ×ËÉ ÓÉÓÔÅÍÎÙÈ ÞÁÓÏ× ÎÕÖÎÙ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
-msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
-msgstr "ëÏÒÒÅËÔÉÒÏ×ËÁ ËÏÜÆÆÉÃÉÅÎÔÁ ÏÔËÌÏÎÅÎÉÑ ÎÅ ×ÙÐÏÌÎÅÎÁ, ÐÏÔÏÍÕ ÞÔÏ ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÒÁÎÅÅ ÓÏÄÅÒÖÁÌÉ ÍÕÓÏÒ.\n"
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+"ëÏÒÒÅËÔÉÒÏ×ËÁ ËÏÜÆÆÉÃÉÅÎÔÁ ÏÔËÌÏÎÅÎÉÑ ÎÅ ×ÙÐÏÌÎÅÎÁ, ÐÏÔÏÍÕ ÞÔÏ ÁÐÐÁÒÁÔÎÙÅ "
+"ÞÁÓÙ ÒÁÎÅÅ ÓÏÄÅÒÖÁÌÉ ÍÕÓÏÒ.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5592,36 +5666,42 @@ msgstr ""
 "ÞÔÏ ÐÏÓÌÅÄÎÑÑ ËÁÌÉÂÒÏ×ËÁ ÂÙÌÁ ÎÕÌÅ×ÏÊ, ÐÏÜÔÏÍÕ ÎÅ×ÅÒÎÁ\n"
 "ÈÒÏÎÏÌÏÇÉÑ É ÎÅÏÂÈÏÄÉÍ ÚÁÐÕÓË ËÁÌÉÂÒÏ×ËÉ.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
-msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
-msgstr "ëÏÒÒÅËÔÉÒÏ×ËÁ ËÏÜÆÆÉÃÉÅÎÔÁ ÏÔËÌÏÎÅÎÉÑ ÎÅ ×ÙÐÏÌÎÅÎÁ, ÐÏÔÏÍÕ ÞÔÏ ÓÏ ×ÒÅÍÅÎÉ ÐÏÓÌÅÄÎÅÊ ËÁÌÉÂÒÏ×ËÉ ÐÒÏÛÌÏ ÍÅÎÅÅ ÄÎÑ.\n"
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"ëÏÒÒÅËÔÉÒÏ×ËÁ ËÏÜÆÆÉÃÉÅÎÔÁ ÏÔËÌÏÎÅÎÉÑ ÎÅ ×ÙÐÏÌÎÅÎÁ, ÐÏÔÏÍÕ ÞÔÏ ÓÏ ×ÒÅÍÅÎÉ "
+"ÐÏÓÌÅÄÎÅÊ ËÁÌÉÂÒÏ×ËÉ ÐÒÏÛÌÏ ÍÅÎÅÅ ÄÎÑ.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"þÁÓÙ ÐÅÒÅ×ÅÄÅÎÙ ÎÁ %.1f ÓÅËÕÎÄ ÎÁÚÁÄ, %d ÓÅËÕÎÄ ÎÅÓÍÏÔÒÑ ÎÁ ËÏÜÆÆÉÃÉÅÎÔ ÏÔËÌÏÎÅÎÉÑ %f ÓÅËÕÎÄ × ÄÅÎØ.\n"
+"þÁÓÙ ÐÅÒÅ×ÅÄÅÎÙ ÎÁ %.1f ÓÅËÕÎÄ ÎÁÚÁÄ, %d ÓÅËÕÎÄ ÎÅÓÍÏÔÒÑ ÎÁ ËÏÜÆÆÉÃÉÅÎÔ "
+"ÏÔËÌÏÎÅÎÉÑ %f ÓÅËÕÎÄ × ÄÅÎØ.\n"
 "ëÏÜÆÆÉÃÉÅÎÔ ÏÔËÌÏÎÅÎÉÑ ÎÁÓÔÒÁÉ×ÁÅÔÓÑ ÎÁ %f ÓÅËÕÎÄ × ÄÅÎØ\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "÷ÒÅÍÑ ÐÏÓÌÅ ÐÏÓÌÅÄÎÅÊ ËÏÒÒÅËÔÉÒÏ×ËÉ ÓÏÓÔÁ×ÌÑÅÔ %d ÓÅËÕÎÄ\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "îÅÏÂÈÏÄÉÍÏ ÄÏÂÁ×ÉÔØ %d ÓÅËÕÎÄ É ÐÅÒÅ×ÅÓÔÉ ÞÁÓÙ ÎÁ %.6f ÓÅËÕÎÄ ÎÁÚÁÄ\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "æÁÊÌ adjtime ÎÅ ÏÂÎÏ×ÌÑÅÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ËÌÀÞÅÎ ÒÅÖÉÍ ÔÅÓÔÉÒÏ×ÁÎÉÑ.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5630,73 +5710,89 @@ msgstr ""
 "óÌÅÄÕÀÝÅÅ ÂÕÄÅÔ ÚÁÐÉÓÁÎÏ × %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "ðÁÒÁÍÅÔÒÙ ËÏÒÒÅËÔÉÒÏ×ËÉ ÏÔËÌÏÎÅÎÉÑ ÎÅ ÏÂÎÏ×ÌÅÎÙ.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr "áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÎÅ ÓÏÄÅÒÖÁÔ ×ÅÒÎÏÇÏ ×ÒÅÍÅÎÉ, ÐÏÜÔÏÍÕ ÏÔËÏÒÒÅËÔÉÒÏ×ÁÔØ ÉÈ ÎÅ×ÏÚÍÏÖÎÏ.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÎÅ ÓÏÄÅÒÖÁÔ ×ÅÒÎÏÇÏ ×ÒÅÍÅÎÉ, ÐÏÜÔÏÍÕ ÏÔËÏÒÒÅËÔÉÒÏ×ÁÔØ ÉÈ "
+"ÎÅ×ÏÚÍÏÖÎÏ.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr "îÅÏÂÈÏÄÉÍÁÑ ËÏÒÒÅËÔÉÒÏ×ËÁ ÓÏÓÔÁ×ÌÑÅÔ ÍÅÎØÛÅ ÓÅËÕÎÄÙ, ÐÏÜÔÏÍÕ ÞÁÓÙ ÎÅ ÎÁÓÔÒÁÉ×ÁÀÔÓÑ.\n"
+msgstr ""
+"îÅÏÂÈÏÄÉÍÁÑ ËÏÒÒÅËÔÉÒÏ×ËÁ ÓÏÓÔÁ×ÌÑÅÔ ÍÅÎØÛÅ ÓÅËÕÎÄÙ, ÐÏÜÔÏÍÕ ÞÁÓÙ ÎÅ "
+"ÎÁÓÔÒÁÉ×ÁÀÔÓÑ.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "éÓÐÏÌØÚÕÅÔÓÑ %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "îÅ ÎÁÊÄÅÎ ÐÒÉÇÏÄÎÙÊ ÞÁÓÏ×ÏÊ ÉÎÔÅÒÆÅÊÓ.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÓÉÓÔÅÍÎÙÅ ÞÁÓÙ.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
-"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 "úÎÁÞÅÎÉÅ ×ÅËÁ ÄÌÑ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÑÄÒÏ ÈÒÁÎÉÔ ÔÏÌØËÏ ÎÁ Alpha-ÍÁÛÉÎÁÈ.\n"
 "üÔÁ ËÏÐÉÑ hwclock ÂÙÌÁ ÓÏÚÄÁÎÁ ÄÌÑ ÍÁÛÉÎÙ, ÏÔÌÉÞÎÏÊ ÏÔ Alpha\n"
-"(É, ÔÁËÉÍ ÏÂÒÁÚÏÍ, ÓÅÊÞÁÓ, ÐÏ-×ÉÄÉÍÏÍÕ, ÎÁ Alpha ÎÅ ÒÁÂÏÔÁÅÔ).  äÅÊÓÔ×ÉÅ ÏÔËÌÏÎÅÎÏ.\n"
+"(É, ÔÁËÉÍ ÏÂÒÁÚÏÍ, ÓÅÊÞÁÓ, ÐÏ-×ÉÄÉÍÏÍÕ, ÎÁ Alpha ÎÅ ÒÁÂÏÔÁÅÔ).  äÅÊÓÔ×ÉÅ "
+"ÏÔËÌÏÎÅÎÏ.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÚÎÁÞÅÎÉÅ ×ÅËÁ ÉÚ ÑÄÒÁ.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "ñÄÒÏ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ, ÞÔÏ ÚÎÁÞÅÎÉÅ ×ÅËÁ %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
-msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
-msgstr "þÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ ×ÅËÁ, ×Ù ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÃÉÀ 'epoch' ÄÌÑ ÕËÁÚÁÎÉÑ ÎÕÖÎÏÇÏ ÚÎÁÞÅÎÉÑ.\n"
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"þÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ ×ÅËÁ, ×Ù ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÃÉÀ 'epoch' ÄÌÑ "
+"ÕËÁÚÁÎÉÑ ÎÕÖÎÏÇÏ ÚÎÁÞÅÎÉÑ.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "÷ÅË ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × %d - ÔÏÌØËÏ ÔÅÓÔÉÒÏ×ÁÎÉÅ.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ × ÑÄÒÅ ÚÎÁÞÅÎÉÅ ×ÅËÁ.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s ÉÚ %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5734,10 +5830,12 @@ msgstr ""
 "æÕÎËÃÉÉ:\n"
 "  --help        ×Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ\n"
 "  --show        ÞÔÅÎÉÅ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× É ×Ù×ÏÄ ÒÅÚÕÌØÔÁÔÁ\n"
-"  --set         ÕÓÔÁÎÏ×ËÁ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÎÁ ×ÒÅÍÑ, ÕËÁÚÁÎÎÏÅ Ó --date\n"
+"  --set         ÕÓÔÁÎÏ×ËÁ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÎÁ ×ÒÅÍÑ, ÕËÁÚÁÎÎÏÅ Ó --"
+"date\n"
 "  --hctosys     ÕÓÔÁÎÏ×ËÁ ÓÉÓÔÅÍÎÏÇÏ ×ÒÅÍÅÎÉ ÐÏ ÁÐÐÁÒÁÔÎÙÍ ÞÁÓÁÍ\n"
 "  --systohc     ÕÓÔÁÎÏ×ËÁ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÐÏ ÔÅËÕÝÅÍÕ ÓÉÓÔÅÍÎÏÍÕ ×ÒÅÍÅÎÉ\n"
-"  --adjust      ÒÅÇÕÌÉÒÏ×ËÁ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÄÌÑ ×ÙÞÉÓÌÅÎÉÑ ÓÉÓÔÅÍÁÔÉÞÅÓËÏÇÏ\n"
+"  --adjust      ÒÅÇÕÌÉÒÏ×ËÁ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÄÌÑ ×ÙÞÉÓÌÅÎÉÑ "
+"ÓÉÓÔÅÍÁÔÉÞÅÓËÏÇÏ\n"
 "                ÏÔËÌÏÎÅÎÉÑ ÐÏÓÌÅ ÐÏÓÌÅÄÎÅÊ ÕÓÔÁÎÏ×ËÉ ÉÌÉ ÒÅÇÕÌÉÒÏ×ËÉ ÞÁÓÏ×\n"
 "  --getepoch    ×Ù×ÏÄ ÚÎÁÞÅÎÉÑ ×ÅËÁ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÑÄÒÁ\n"
 "  --setepoch    ÕÓÔÁÎÏ×ËÁ ÚÎÁÞÅÎÉÑ ×ÅËÁ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÑÄÒÁ × ÚÎÁÞÅÎÉÅ,\n"
@@ -5745,17 +5843,20 @@ msgstr ""
 "  --version     ×Ù×ÏÄ ×ÅÒÓÉÉ hwclock ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×ÙÈÏÄ\n"
 "\n"
 "ïÐÃÉÉ: \n"
-"  --utc         ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ ×ÓÅÏÂÝÅÍÕ ÓËÏÏÒÄÉÎÉÒÏ×ÁÎÎÏÍÕ ×ÒÅÍÅÎÉ\n"
+"  --utc         ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ ×ÓÅÏÂÝÅÍÕ ÓËÏÏÒÄÉÎÉÒÏ×ÁÎÎÏÍÕ "
+"×ÒÅÍÅÎÉ\n"
 "  --localtime   ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ ÍÅÓÔÎÏÍÕ ×ÒÅÍÅÎÉ\n"
 "  --directisa   ÐÒÑÍÏÊ ÄÏÓÔÕÐ Ë ÛÉÎÅ ISA ×ÍÅÓÔÏ %s\n"
-"  --badyear     ÉÇÎÏÒÉÒÏ×ÁÔØ ÇÏÄ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÉÚ-ÚÁ ÐÏ×ÒÅÖÄÅÎÎÏÇÏ bios'Á\n"
-"  --date        ÕËÁÚÁÎÉÅ ×ÒÅÍÅÎÉ, ËÏÔÏÒÏÅ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎÏ × ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ\n"
+"  --badyear     ÉÇÎÏÒÉÒÏ×ÁÔØ ÇÏÄ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÉÚ-ÚÁ ÐÏ×ÒÅÖÄÅÎÎÏÇÏ "
+"bios'Á\n"
+"  --date        ÕËÁÚÁÎÉÅ ×ÒÅÍÅÎÉ, ËÏÔÏÒÏÅ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎÏ × ÁÐÐÁÒÁÔÎÙÅ "
+"ÞÁÓÙ\n"
 "  --epoch=ÇÏÄ   ÕËÁÚÁÎÉÅ ÇÏÄÁ, Ó ËÏÔÏÒÏÇÏ ÎÁÞÉÎÁÅÔÓÑ  ÚÎÁÞÅÎÉÅ\n"
 "                ÜÒÙ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ×\n"
 "  --noadjfile   ÂÅÚ ÉÓÐÏÌØÚÏ×ÁÎÉÑ /etc/adjtime. ôÒÅÂÕÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÑ\n"
 "                ÌÉÂÏ --utc, ÌÉÂÏ --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5764,12 +5865,12 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                ÓÏÏÂÝÁÅÔ hwclock'Õ ÔÉÐ ×ÁÛÅÊ alpha (ÓÍ. hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ÐÒÉÎÉÍÁÅÔ ÎÅÏÐÃÉÏÎÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ.  ÷ÁÍ ÐÒÅÄÏÓÔÁ×ÌÅÎÙ %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5778,50 +5879,69 @@ msgstr ""
 "÷Ù ÕËÁÚÁÌÉ ÎÅÓËÏÌØËÏ ÆÕÎËÃÉÊ.\n"
 "÷Ù ÍÏÖÅÔÅ ×ÙÐÏÌÎÉÔØ ÔÏÌØËÏ ÏÄÎÕ ÆÕÎËÃÉÀ ÚÁ ÒÁÚ.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
-msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
-msgstr "%s: ïÐÃÉÉ --utc É --localtime Ñ×ÌÑÀÔÓÑ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÍÉ. á ×Ù ÕËÁÚÁÌÉ ÏÂÅ.\n"
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+"%s: ïÐÃÉÉ --utc É --localtime Ñ×ÌÑÀÔÓÑ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÍÉ. á ×Ù ÕËÁÚÁÌÉ "
+"ÏÂÅ.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
-msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
-msgstr "%s: ïÐÃÉÉ --adjust É --noadjfile Ñ×ÌÑÀÔÓÑ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÍÉ. á ×Ù ÕËÁÚÁÌÉ ÏÂÅ.\n"
+msgid ""
+"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: ïÐÃÉÉ --adjust É --noadjfile Ñ×ÌÑÀÔÓÑ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÍÉ. á ×Ù ÕËÁÚÁÌÉ "
+"ÏÂÅ.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: ó --noadjfile ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÌÉÂÏ --utc, ÌÉÂÏ --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÐÒÉÇÏÄÎÏÅ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ×ÒÅÍÑ. îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÞÁÓÙ.\n"
+msgstr ""
+"ïÔÓÕÔÓÔ×ÕÅÔ ÐÒÉÇÏÄÎÏÅ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ×ÒÅÍÑ. îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÞÁÓÙ.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "ë ÓÏÖÁÌÅÎÉÀ ÔÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÉÚÍÅÎÑÔØ ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "ë ÓÏÖÁÌÅÎÉÀ ÔÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÉÚÍÅÎÑÔØ ÓÉÓÔÅÍÎÙÅ ÞÁÓÙ.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
-msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
-msgstr "ë ÓÏÖÁÌÅÎÉÀ ÔÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÉÚÍÅÎÑÔØ × ÑÄÒÅ ×ÅË ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ×.\n"
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+"ë ÓÏÖÁÌÅÎÉÀ ÔÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÉÚÍÅÎÑÔØ × ÑÄÒÅ ×ÅË ÁÐÐÁÒÁÔÎÙÈ "
+"ÞÁÓÏ×.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÁÐÐÁÒÁÔÎÙÍ ÞÁÓÁÍ ËÁËÉÍ ÂÙ ÔÏ ÎÉ ÂÙÌÏ ÉÚ×ÅÓÔÎÙÍ ÓÐÏÓÏÂÏÍ.\n"
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÁÐÐÁÒÁÔÎÙÍ ÞÁÓÁÍ ËÁËÉÍ ÂÙ ÔÏ ÎÉ ÂÙÌÏ ÉÚ×ÅÓÔÎÙÍ "
+"ÓÐÏÓÏÂÏÍ.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
-msgid "Use the --debug option to see the details of our search for an access method.\n"
-msgstr "éÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ --debug, ÞÔÏÂÙ Õ×ÉÄÅÔØ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÁÛÅÍ ÐÏÉÓËÅ ÄÌÑ ÍÅÔÏÄÁ ÄÏÓÔÕÐÁ.\n"
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr ""
+"éÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ --debug, ÞÔÏÂÙ Õ×ÉÄÅÔØ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÁÛÅÍ ÐÏÉÓËÅ "
+"ÄÌÑ ÍÅÔÏÄÁ ÄÏÓÔÕÐÁ.\n"
 
 #: hwclock/kd.c:55
 #, c-format
@@ -5850,7 +5970,6 @@ msgstr "ioctl() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÐÒÉ ÞÔÅÎÉÉ ×ÒÅÍÅÎÉ ÉÚ %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "ioctl KDSHWCLK ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ /dev/tty1 ÉÌÉ /dev/vc/1"
@@ -5902,7 +6021,9 @@ msgstr "ioctl() × %s ÄÌÑ ×ÙËÌÀÞÅÎÉÑ ÐÒÅÒÙ×ÁÎÉÊ ÏÂÎÏ×ÌÅÎÉÑ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 #: hwclock/rtc.c:271
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr "ioctl() × %s ÄÌÑ ×ËÌÀÞÅÎÉÑ ÐÒÅÒÙ×ÁÎÉÊ ÏÂÎÏ×ÌÅÎÉÑ ÎÅÏÖÉÄÁÎÎÏ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
+msgstr ""
+"ioctl() × %s ÄÌÑ ×ËÌÀÞÅÎÉÑ ÐÒÅÒÙ×ÁÎÉÊ ÏÂÎÏ×ÌÅÎÉÑ ÎÅÏÖÉÄÁÎÎÏ ÚÁ×ÅÒÛÉÌÓÑ "
+"ÎÅÕÄÁÞÅÊ"
 
 #: hwclock/rtc.c:330
 #, c-format
@@ -5921,8 +6042,14 @@ msgstr "ïÔËÒÙÔÉÅ %s ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
-msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
-msgstr "äÌÑ ÉÚÍÅÎÅÎÉÑ ÚÎÁÞÅÎÉÑ ×ÅËÁ × ÑÄÒÅ ÎÅÏÂÈÏÄÉÍÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÄÒÁÊ×ÅÒÕ ÕÓÔÒÏÊÓÔ×Á Linux 'rtc' ÐÏÓÒÅÄÓÔ×ÏÍ ÓÐÅÃÉÁÌØÎÏÇÏ ÆÁÊÌÁ ÕÓÔÒÏÊÓÔ×Á %s. ÷ ÄÁÎÎÏÊ ÓÉÓÔÅÍÅ ÜÔÏÔ ÆÁÊÌ ÏÔÓÕÔÓÔ×ÕÅÔ.\n"
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"äÌÑ ÉÚÍÅÎÅÎÉÑ ÚÎÁÞÅÎÉÑ ×ÅËÁ × ÑÄÒÅ ÎÅÏÂÈÏÄÉÍÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÄÒÁÊ×ÅÒÕ "
+"ÕÓÔÒÏÊÓÔ×Á Linux 'rtc' ÐÏÓÒÅÄÓÔ×ÏÍ ÓÐÅÃÉÁÌØÎÏÇÏ ÆÁÊÌÁ ÕÓÔÒÏÊÓÔ×Á %s. ÷ "
+"ÄÁÎÎÏÊ ÓÉÓÔÅÍÅ ÜÔÏÔ ÆÁÊÌ ÏÔÓÕÔÓÔ×ÕÅÔ.\n"
 
 #: hwclock/rtc.c:388 hwclock/rtc.c:434
 #, c-format
@@ -5951,7 +6078,8 @@ msgstr "×ÅË ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × %ld Ó RTC_EPOCH_SET ioctl × %s.\n"
 
 #: hwclock/rtc.c:444
 #, c-format
-msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgid ""
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "äÒÁÊ×ÅÒ ÕÓÔÒÏÊÓÔ×Á ÑÄÒÁ ÄÌÑ %s ÎÅ ÉÍÅÅÔ RTC_EPOCH_SET ioctl.\n"
 
 #: hwclock/rtc.c:447
@@ -5963,7 +6091,6 @@ msgstr "ioctl(RTC_EPOCH_SET) × %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 msgid "calling open_tty\n"
 msgstr "×ÙÚÙ×ÁÅÔÓÑ open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "×ÙÚÙ×ÁÅÔÓÑ termio_init\n"
@@ -5972,7 +6099,6 @@ msgstr "×ÙÚÙ×ÁÅÔÓÑ termio_init\n"
 msgid "writing init string\n"
 msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ ÓÔÒÏËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "ÐÅÒÅÄ autobaud\n"
@@ -5986,7 +6112,6 @@ msgstr "ÏÖÉÄÁÅÔÓÑ cr-lf\n"
 msgid "read %c\n"
 msgstr "ÞÔÅÎÉÅ %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "ÞÉÔÁÅÔÓÑ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
@@ -6040,7 +6165,6 @@ msgstr "/dev: chdir() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ÎÅÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6055,12 +6179,10 @@ msgstr "/dev/%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁË ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: ÎÅ ÏÔËÒÙÔ ÄÌÑ ÞÔÅÎÉÑ/ÚÁÐÉÓÉ"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "×ÙÐÏÌÎÑÅÔÓÑ ÄÕÂÌÉÒÏ×ÁÎÉÅ\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6093,36 +6215,36 @@ msgstr "%s: ÐÅÒÅÐÏÌÎÅÎÉÅ ××ÏÄÁ"
 #: login-utils/agetty.c:1195
 #, c-format
 msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
 msgstr ""
-"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-hiLmw] [-l ÐÒÏÇÒÁÍÍÁ_×ÈÏÄÁ] [-t ÔÁÊÍ-ÁÕÔ] [-I ÓÔÒÏËÁ_ÉÎÉÃÉÁÌÉÚÁÃÉÉ] [-H ÈÏÓÔ_ÄÌÑ_×ÈÏÄÁ] ÓËÏÒÏÓÔØ_ÐÅÒÅÄÁÞÉ,... ÐÏÒÔ [ÔÉÐ_ÔÅÒÍÉÎÁÌÁ]\n"
-"ÉÌÉ\t[-hiLmw] [-l ÐÒÏÇÒÁÍÍÁ_×ÈÏÄÁ] [-t ÔÁÊÍ-ÁÕÔ] [-I ÓÔÒÏËÁ_ÉÎÉÃÉÁÌÉÚÁÃÉÉ] [-H ÈÏÓÔ_ÄÌÑ_×ÈÏÄÁ] ÐÏÒÔ ÓËÏÒÏÓÔØ_ÐÅÒÅÄÁÞÉ,... [ÔÉÐ_ÔÅÒÍÉÎÁÌÁ]\n"
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-hiLmw] [-l ÐÒÏÇÒÁÍÍÁ_×ÈÏÄÁ] [-t ÔÁÊÍ-ÁÕÔ] [-I "
+"ÓÔÒÏËÁ_ÉÎÉÃÉÁÌÉÚÁÃÉÉ] [-H ÈÏÓÔ_ÄÌÑ_×ÈÏÄÁ] ÓËÏÒÏÓÔØ_ÐÅÒÅÄÁÞÉ,... ÐÏÒÔ "
+"[ÔÉÐ_ÔÅÒÍÉÎÁÌÁ]\n"
+"ÉÌÉ\t[-hiLmw] [-l ÐÒÏÇÒÁÍÍÁ_×ÈÏÄÁ] [-t ÔÁÊÍ-ÁÕÔ] [-I ÓÔÒÏËÁ_ÉÎÉÃÉÁÌÉÚÁÃÉÉ] [-"
+"H ÈÏÓÔ_ÄÌÑ_×ÈÏÄÁ] ÐÏÒÔ ÓËÏÒÏÓÔØ_ÐÅÒÅÄÁÞÉ,... [ÔÉÐ_ÔÅÒÍÉÎÁÌÁ]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: ÍÁÌÏ ÐÁÍÑÔÉ, ×ÈÏÄ × ÓÉÓÔÅÍÕ ÍÏÖÅÔ ÚÁ×ÅÒÛÉÔØÓÑ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ malloc ÄÌÑ ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ malloc ÄÌÑ grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "÷ÈÏÄ × %s Ó %s ÚÁÐÒÅÝÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "÷ÈÏÄ × %s Ó %s ÚÁÐÒÅÝÅÎ.\n"
@@ -6140,7 +6262,9 @@ msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 #: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
-msgstr "%s: ÍÏÖÎÏ ÔÏÌØËÏ ÉÚÍÅÎÉÔØ ÌÏËÁÌØÎÙÅ ÜÌÅÍÅÎÔÙ; ×ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ yp%s.\n"
+msgstr ""
+"%s: ÍÏÖÎÏ ÔÏÌØËÏ ÉÚÍÅÎÉÔØ ÌÏËÁÌØÎÙÅ ÜÌÅÍÅÎÔÙ; ×ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ yp%"
+"s.\n"
 
 #: login-utils/chfn.c:151 login-utils/chsh.c:136
 msgid "Unknown user context"
@@ -6167,8 +6291,8 @@ msgstr "éÚÍÅÎÅÎÉÅ ÉÎÆÏÒÍÁÃÉÉ finger ÄÌÑ %s.\n"
 msgid "Password error."
 msgstr "ïÛÉÂËÁ ÐÁÒÏÌÑ."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "ðÁÒÏÌØ: "
@@ -6246,8 +6370,12 @@ msgstr "%s: %s ÎÅ Á×ÔÏÒÉÚÏ×ÁÎ ÄÌÑ ÉÚÍÅÎÅÎÉÑ ÛÅÌÌÁ %s\n"
 
 #: login-utils/chsh.c:157
 #, c-format
-msgid "%s: Running UID doesn't match UID of user we're altering, shell change denied\n"
-msgstr "%s: úÁÐÕÝÅÎÎÙÊ UID ÎÅ ÓÏ×ÐÁÄÁÅÔ Ó UID'ÏÍ ÒÅÄÁËÔÉÒÕÅÍÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ, ÉÚÍÅÎÅÎÉÅ ÛÅÌÌÁ ÚÁÐÒÅÝÅÎÏ\n"
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+"%s: úÁÐÕÝÅÎÎÙÊ UID ÎÅ ÓÏ×ÐÁÄÁÅÔ Ó UID'ÏÍ ÒÅÄÁËÔÉÒÕÅÍÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ, "
+"ÉÚÍÅÎÅÎÉÅ ÛÅÌÌÁ ÚÁÐÒÅÝÅÎÏ\n"
 
 #: login-utils/chsh.c:163
 #, c-format
@@ -6342,34 +6470,6 @@ msgstr "éÓÐÏÌØÚÕÊÔÅ %s -l ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÓÐÉÓËÁ.\n"
 msgid "No known shells.\n"
 msgstr "îÅÔ ÉÚ×ÅÓÔÎÙÈ ÛÅÌÌÏ×.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÌÕÞÁÊÎÙÅ ÄÁÎÎÙÅ ÉÚ /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ (%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s ÎÅ ÉÍÅÅÔ ×ÅÒÎÙÈ filemode'Ï×"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÄÁÎÎÙÅ ÉÚ %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6377,13 +6477,15 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: last [-#] [-f ÆÁÊÌ] [-t tty] [-h ÉÍÑ_ÈÏÓÔÁ] [ÐÏÌØÚÏ×ÁÔÅÌØ ...]\n"
+msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: last [-#] [-f ÆÁÊÌ] [-t tty] [-h ÉÍÑ_ÈÏÓÔÁ] "
+"[ÐÏÌØÚÏ×ÁÔÅÌØ ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  ×ÓÅ ÅÝÅ × ÓÉÓÔÅÍÅ"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6392,15 +6494,15 @@ msgstr ""
 "\n"
 "wtmp ÎÁÞÁÌÓÑ %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: malloc ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6409,51 +6511,45 @@ msgstr ""
 "\n"
 "ÐÒÅÒ×ÁÎ %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "èòåîï÷ï: ÎÅ×ÏÚÍÏÖÎÏ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "èòåîï÷ï: ÐÌÏÈÏÊ tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h ÔÏÌØËÏ ÄÌÑ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: login [-fp] [ÉÍÑ_ÐÏÌØÚÏ×ÁÔÅÌÑ]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr "login: ÓÂÏÊ PAM, ÐÒÅÒÙ×ÁÎÉÅ: %s\n"
+msgstr "login: ÓÂÏÊ PAM, ×ÙÐÏÌÎÑÅÔÓÑ ÐÒÅÒÙ×ÁÎÉÅ: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "ÌÏÇÉÎ: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "óâïê ÷èïäá %d éú %s äìñ %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6462,17 +6558,17 @@ msgstr ""
 "îÅ×ÅÒÎÙÊ ÌÏÇÉÎ\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "óìéûëïí íîïçï ðïðùôïë ÷èïäá (%d) éú %s äìñ %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "óâïê óåóóéé ÷èïäá éú %s äìñ %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6481,7 +6577,7 @@ msgstr ""
 "\n"
 "îÅ×ÅÒÎÙÊ ÌÏÇÉÎ\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6490,135 +6586,120 @@ msgstr ""
 "\n"
 "ðÒÏÂÌÅÍÁ ÕÓÔÁÎÏ×ËÉ ÓÅÓÓÉÉ, ÐÒÅÒÙ×ÁÎÉÅ.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "ðõóôïå ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ × %s:%d. ðÒÅÒÙ×ÁÎÉÅ."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "îÅ×ÅÒÎÏÅ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ \"%s\" × %s:%d. ðÒÅÒÙ×ÁÎÉÅ."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: îÅÈ×ÁÔËÁ ÐÁÍÑÔÉ\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "úÁÐÒÅÝÅÎÎÏÅ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s ×ÈÏÄ ÎÁ ÜÔÏÔ ÔÅÒÍÉÎÁÌ ÏÔ×ÅÒÇÎÕÔ.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "÷èïä %s ïô÷åòçîõô éú %s îá TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "÷èïä %s ïô÷åòçîõô îá TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "îÅ×ÅÒÎÙÊ ÌÏÇÉÎ\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"õÖÅ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ×ÏÛÌÏ × ÓÉÓÔÅÍÕ.\n"
-"ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "õ ×ÁÓ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÚÁÐÕÝÅÎÎÙÈ ÐÒÏÃÅÓÓÏ×.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP îá %s þåòåú %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "÷èïä ROOT ÷ %s ó %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "÷èïä ROOT ÷ %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "÷èïä ÷ %s þåòåú %s éú %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "÷èïä ÷ %s þåòåú %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "÷ÁÍ ÎÏ×ÏÅ ÐÉÓØÍÏ.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "÷ÁÍ ÐÉÓØÍÏ.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: ÓÂÏÊ ÓÏÚÄÁÎÉÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "îÅÔ ËÁÔÁÌÏÇÁ %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "÷ÈÏÄ × ÓÉÓÔÅÍÕ Ó ÄÏÍÁÛÎÉÍ ËÁÔÁÌÏÇÏÍ = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ÎÅÔ ÐÁÍÑÔÉ ÄÌÑ ÛÅÌÌ-ÓËÒÉÐÔÁ.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÛÅÌÌ-ÓËÒÉÐÔ: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ÎÅÔ ÛÅÌÌÁ: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6627,65 +6708,65 @@ msgstr ""
 "\n"
 "%s ÌÏÇÉÎ: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "éíñ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "ÉÍÅÎÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÍÏÇÕÔ ÎÅ ÎÁÞÉÎÁÔØÓÑ Ó '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÕÓÔÙÈ ÐÅÒÅ×ÏÄÏ× ÓÔÒÏË.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "þòåúíåòîùå ÐÅÒÅ×ÏÄÙ ÓÔÒÏË"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "÷ÈÏÄ × ÓÉÓÔÅÍÕ ÐÒÅ×ÙÓÉÌ ÐÒÅÄÅÌ ÏÖÉÄÁÎÉÑ × %d ÓÅËÕÎÄ\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "ðÏÓÌÅÄÎÉÊ ×ÈÏÄ × ÓÉÓÔÅÍÕ: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "ÉÚ %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "× %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "óâïê ÷èïäá ÷ óéóôåíõ éú %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "óâïê ÷èïäá ÷ óéóôåíõ îá %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d óâïé ÷èïäá éú %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d óâïé ÷èïäá ÷ %s, %s"
@@ -6705,166 +6786,30 @@ msgstr "- ÎÅÔ\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: mesg [Ä | Î]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: ÷Ù ËÔÏ?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: îÅÔ ÔÁËÏÊ ÇÒÕÐÐÙ."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: äÏÓÔÕÐ ÚÁÐÒÅÝÅÎ"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "îÅÔ ÛÅÌÌÁ"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "ðÁÒÏÌØ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ 6 ÓÉÍ×ÏÌÏ×, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"ðÁÒÏÌØ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÓÉÍ×ÏÌÙ ÓÌÅÄÕÀÝÉÈ Ä×ÕÈ ËÌÁÓÓÏ×:\n"
-"ÓÉÍ×ÏÌÙ ×ÅÒÈÎÅÇÏ É ÎÉÖÎÅÇÏ ÒÅÇÉÓÔÒÁ, ÃÉÆÒÙ É ÎÅ ÂÕË×ÅÎÎÏÃÉÆÒÏ×ÙÅ\n"
-"ÓÉÍ×ÏÌÙ. óÍ. passwd(1) ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÏ×ÔÏÒÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÔÁÒÙÊ ÐÁÒÏÌØ.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÎÅ ÉÓÐÏÌØÚÕÊÔÅ × ËÁÞÅÓÔ×Å ÐÁÒÏÌÑ ÞÔÏ-ÔÏ ×ÒÏÄÅ Ó×ÏÅÇÏ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÎÅ ÉÓÐÏÌØÚÕÊÔÅ × ËÁÞÅÓÔ×Å ÐÁÒÏÌÑ ÞÔÏ-ÔÏ ×ÒÏÄÅ Ó×ÏÅÇÏ ÎÁÓÔÏÑÝÅÇÏ ÉÍÅÎÉ!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: passwd [ÉÍÑ_ÐÏÌØÚÏ×ÁÔÅÌÑ [ÐÁÒÏÌØ]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "ôÏÌØËÏ root ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÏÒÍÙ Ó ÏÄÎÉÍ É Ä×ÕÍÑ ÁÒÇÕÍÅÎÔÁÍÉ.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: passwd [-foqsvV] [ÐÏÌØÚÏ×ÁÔÅÌØ [ÐÁÒÏÌØ]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÏÅ ÉÍÑ"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "ôÏÌØËÏ root ÍÏÖÅÔ ÉÚÍÅÎÑÔØ ÞÕÖÉÅ ÐÁÒÏÌÉ.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ. `%s' ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÌØÚÏ×ÁÔÅÌØ?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "ë ÓÏÖÁÌÅÎÉÀ Ñ ÍÏÇÕ ÉÚÍÅÎÑÔØ ÔÏÌØËÏ ÌÏËÁÌØÎÙÅ ÐÁÒÏÌÉ. ÷ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID É ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅ ÓÏ×ÐÁÄÁÀÔ, ÓÁÍÏÚ×ÁÎÅÃ!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "éÚÍÅÎÅÎÉÅ ÐÁÒÏÌÑ ÄÌÑ %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "÷×ÅÄÉÔÅ ÓÔÁÒÙÊ ÐÁÒÏÌØ: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "úÁÐÒÅÝÅÎÎÙÊ ÐÁÒÏÌØ, ÓÁÍÏÚ×ÁÎÅÃ."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "÷×ÅÄÉÔÅ ÎÏ×ÙÊ ÐÁÒÏÌØ: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "ðÁÒÏÌØ ÎÅ ÉÚÍÅÎÅÎ."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "ðÏ×ÔÏÒÉÔÅ ÎÏ×ÙÊ ÐÁÒÏÌØ: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "÷Ù ÏÛÉÂÌÉÓØ. ðÁÒÏÌØ ÎÅ ÉÚÍÅÎÅÎ."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "ÐÁÒÏÌØ ÉÚÍÅÎÅÎ, ÐÏÌØÚÏ×ÁÔÅÌØ %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ðáòïìø ROOT'A éúíåîåî"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "ÐÁÒÏÌØ ÉÚÍÅÎÅÎ root'ÏÍ, ÐÏÌØÚÏ×ÁÔÅÌØ %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "×ÙÚÙ×ÁÅÔÓÑ setpwnam ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁÒÏÌÑ.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "ðÁÒÏÌØ *îå* ÉÚÍÅÎÅÎ, ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "ðÁÒÏÌØ ÉÚÍÅÎÅÎ.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -6911,7 +6856,6 @@ msgstr "ÐÅÒÅÚÁÇÒÕÖÅÎ %s'ÏÍ: %s"
 msgid "halted by %s: %s"
 msgstr "ÏÓÔÁÎÏ×ÌÅÎ %s'ÏÍ: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -6948,7 +6892,6 @@ msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÇÒÁÍÍÙ \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7024,7 +6967,9 @@ msgstr "×ÙÐÏÌÎÅÎÉÅ ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÇÏ ÛÅÌÌÁ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
-msgstr "ÓÏÚÄÁÎÉÅ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÇÏ ÛÅÌÌÁ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
+msgstr ""
+"ÓÏÚÄÁÎÉÅ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÇÏ ÛÅÌÌÁ ÚÁ×ÅÒÛÉÌÏÓØ "
+"ÎÅÕÄÁÞÅÊ\n"
 
 #: login-utils/simpleinit.c:208
 msgid "error opening fifo\n"
@@ -7038,7 +6983,6 @@ msgstr "ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ close-on-exec ÎÁ /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "ÏÛÉÂËÁ ÚÁÐÕÓËÁ finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ finalprog\n"
@@ -7067,7 +7011,7 @@ msgstr "ÏÔËÒÙÔÉÅ ËÁÔÁÌÏÇÁ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 msgid "fork failed\n"
 msgstr "ÓÏÚÄÁÎÉÅ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1622
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "×ÙÐÏÌÎÅÎÉÅ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
@@ -7216,12 +7160,6 @@ msgstr "ÚÁÐÒÅÝÅÎÎÏÅ ÚÎÁÞÅÎÉÅ ÍÅÓÑÃÁ: ÉÓÐÏÌØÚÕÊÔÅ 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "ÚÁÐÒÅÝÅÎÎÏÅ ÚÎÁÞÅÎÉÅ ÇÏÄÁ: ÉÓÐÏÌØÚÕÊÔÅ 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7232,13 +7170,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: cal [-13smjyV] [[ÍÅÓÑÃ] ÇÏÄ]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [+ÆÏÒÍÁÔ] [ÄÅÎØ ÍÅÓÑà ÇÏÄ]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "äÅÎØ ó×. éÚÁÂÅÌÌÙ"
 
@@ -7284,8 +7221,11 @@ msgstr "logger: ÉÍÑ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÐÒÉÏÒÉÔÅÔÁ: %s.\n"
 
 #: misc-utils/logger.c:287
 #, c-format
-msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: logger [-is] [-f ÆÁÊÌ] [-p ÐÒÉÏÒÉÔÅÔ] [-t ÔÜÇ] [-u ÓÏËÅÔ] [ ÓÏÏÂÝÅÎÉÅ ... ]\n"
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: logger [-is] [-f ÆÁÊÌ] [-p ÐÒÉÏÒÉÔÅÔ] [-t ÔÜÇ] [-u ÓÏËÅÔ] "
+"[ ÓÏÏÂÝÅÎÉÅ ... ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
@@ -7367,7 +7307,7 @@ msgstr "%s: ÐÅÒÅÉÍÅÎÏ×ÁÎÉÅ %s × %s ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s ÉÚ × ÆÁÊÌÙ...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7378,22 +7318,22 @@ msgstr ""
 "éÓÐÏÌØÚÕÊÔÅ `%s [ÏÐÃÉÉ] %s', ÅÓÌÉ ×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÜÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ.\n"
 "óËÒÉÐÔ ÎÅ ÚÁÐÕÝÅÎ.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: script [-a] [-f] [-q] [-t] [ÆÁÊÌ]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "óËÒÉÐÔ ÚÁÐÕÝÅÎ, ÆÁÊÌ - %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "óËÒÉÐÔ ÚÁÐÕÝÅÎ %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7402,254 +7342,253 @@ msgstr ""
 "\n"
 "óËÒÉÐÔ ×ÙÐÏÌÎÅÎ %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "óËÒÉÐÔ ×ÙÐÏÌÎÅÎ, ÆÁÊÌ - %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "îÅ È×ÁÔÁÅÔ pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: ïÛÉÂËÁ ÁÒÇÕÍÅÎÔÁ, ÉÓÐÏÌØÚÏ×ÁÎÉÅ\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term ÉÍÑ_ÔÅÒÍÉÎÁÌÁ ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ ÁÔÔÒÉÂ ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-þéóìï_ëïîóïìåê] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-þéóìï_ëïîóïìåê] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file ÉÍÑ_ÆÁÊÌÁ_ÄÁÍÐÁ ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq ÞÁÓÔÏÔÁ ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ/ÓÎÑÔØ ÒÅÖÉÍ ÜÎÅÒÇÏÓÂÅÒÅÖÅÎÉÑ\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "ÏÛÉÂËÁ klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÄÁÍÐÁ ÜËÒÁÎÁ\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, É ÎÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÄÁÍÐ ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: ÐÅÒÅÍÅÎÎÁÑ $TERM ÎÅ ÏÐÒÅÄÅÌÅÎÁ.\n"
@@ -7709,51 +7648,57 @@ msgstr "óÏÏÂÝÅÎÉÅ ÏÔ %s@%s (ËÁË %s) ÎÁ %s × %s ..."
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "óÏÏÂÝÅÎÉÅ ÏÔ %s@%s ÎÁ %s × %s ..."
 
-#: mount/fstab.c:135
+#: mount/fstab.c:136
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÛÉÂËÁ ÞÔÅÎÉÑ %s: %s"
 
-#: mount/fstab.c:163 mount/fstab.c:188
+#: mount/fstab.c:164 mount/fstab.c:189
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s"
 
-#: mount/fstab.c:168
+#: mount/fstab.c:169
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s - ×ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÅÔÓÑ %s\n"
 
-#: mount/fstab.c:472
+#: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
+msgstr ""
+"ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ "
+"ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
 
-#: mount/fstab.c:487
+#: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÓÙÌËÕ ÎÁ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
+msgstr ""
+"ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÓÙÌËÕ ÎÁ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ "
+"ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
 
-#: mount/fstab.c:499
+#: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
+msgstr ""
+"ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ "
+"ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
 
-#: mount/fstab.c:514
+#: mount/fstab.c:526
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s\n"
 
-#: mount/fstab.c:526
+#: mount/fstab.c:538
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s"
 
-#: mount/fstab.c:528
+#: mount/fstab.c:540
 msgid "timed out"
 msgstr "×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÉÓÔÅËÌÏ"
 
-#: mount/fstab.c:535
+#: mount/fstab.c:547
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7762,22 +7707,22 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÓÙÌËÕ %s\n"
 "÷ÏÚÍÏÖÎÏ, ÓÕÝÅÓÔ×ÕÅÔ ÕÓÔÁÒÅ×ÛÉÊ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ?\n"
 
-#: mount/fstab.c:584 mount/fstab.c:622
+#: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s (%s) - mtab ÎÅ ÏÂÎÏ×ÌÅÎ"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:633
 #, c-format
 msgid "error writing %s: %s"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ %s: %s"
 
-#: mount/fstab.c:640
+#: mount/fstab.c:643
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "ÏÛÉÂËÁ ÓÍÅÎÙ ÒÅÖÉÍÁ %s: %s\n"
 
-#: mount/fstab.c:658
+#: mount/fstab.c:661
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n"
@@ -7847,27 +7792,29 @@ msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÉ ÏÄÎÏÇÏ Ó×ÏÂÏÄÎÏÇÏ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ"
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ × ÐÁÍÑÔÉ, ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
-#: mount/lomount.c:341
+#: mount/lomount.c:340
 #, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÅÎ\n"
 
-#: mount/lomount.c:352
+#: mount/lomount.c:351
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÕÓÔÒÏÊÓÔ×Ï %s: %s\n"
 
-#: mount/lomount.c:362
+#: mount/lomount.c:361
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÅÎ\n"
 
-#: mount/lomount.c:370
+#: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "üÔÁ ×ÅÒÓÉÑ mount ÂÙÌÁ ÏÔËÏÍÐÉÌÉÒÏ×ÁÎÁ ÂÅÚ ÐÏÄÄÅÒÖËÉ loop. ðÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÉÔÅ ÐÅÒÅËÏÍÐÉÌÑÃÀ.\n"
+msgstr ""
+"üÔÁ ×ÅÒÓÉÑ mount ÂÙÌÁ ÏÔËÏÍÐÉÌÉÒÏ×ÁÎÁ ÂÅÚ ÐÏÄÄÅÒÖËÉ loop. ðÏÖÁÌÕÊÓÔÁ, "
+"×ÙÐÏÌÎÉÔÅ ÐÅÒÅËÏÍÐÉÌÑÃÀ.\n"
 
-#: mount/lomount.c:407
+#: mount/lomount.c:406
 #, c-format
 msgid ""
 "usage:\n"
@@ -7877,21 +7824,24 @@ msgid ""
 "  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
 msgstr ""
 "ÉÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
-"  %s loop_ÕÓÔÒÏÊÓÔ×Ï                                        # ÐÏÌÕÞÅÎÉÅ ÉÎÆÏÒÍÁÃÉÉ\n"
+"  %s loop_ÕÓÔÒÏÊÓÔ×Ï                                        # ÐÏÌÕÞÅÎÉÅ "
+"ÉÎÆÏÒÍÁÃÉÉ\n"
 "  %s -d loop_ÕÓÔÒÏÊÓÔ×Ï                                     # ÕÄÁÌÅÎÉÅ\n"
-"  %s -f                                                     # ÐÏÉÓË ÎÅÉÓÐÏÌØÚÕÅÍÙÈ\n"
+"  %s -f                                                     # ÐÏÉÓË "
+"ÎÅÉÓÐÏÌØÚÕÅÍÙÈ\n"
 "  %s [ -e ÛÉÆÒÏ×ÁÎÉÅ ] [ -o ÓÍÅÝÅÎÉÅ ] loop_ÕÓÔÒÏÊÓÔ×Ï ÆÁÊÌ # ÕÓÔÁÎÏ×ËÁ\n"
 
-#: mount/lomount.c:426 mount/sundries.c:30 mount/sundries.c:41
-#: mount/sundries.c:56 mount/sundries.c:259
+#: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
 msgid "not enough memory"
 msgstr "ÎÅÈ×ÁÔËÁ ÐÁÍÑÔÉ"
 
-#: mount/lomount.c:541
+#: mount/lomount.c:540
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr "ðÏÄÄÅÒÖËÁ loop ÂÙÌÁ ÎÅÄÏÓÔÕÐÎÁ ×Ï ×ÒÅÍÑ ËÏÍÐÉÌÑÃÉÉ. ðÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÉÔÅ ÐÅÒÅËÏÍÉÌÑÃÉÀ.\n"
+msgstr ""
+"ðÏÄÄÅÒÖËÁ loop ÂÙÌÁ ÎÅÄÏÓÔÕÐÎÁ ×Ï ×ÒÅÍÑ ËÏÍÐÉÌÑÃÉÉ. ðÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÉÔÅ "
+"ÐÅÒÅËÏÍÉÌÑÃÉÀ.\n"
 
 #: mount/mntent.c:166
 #, c-format
@@ -7907,166 +7857,187 @@ msgstr "[mntent]: ÓÔÒÏËÁ %d × %s ÐÌÏÈÁÑ %s\n"
 msgid "; rest of file ignored"
 msgstr "; ÏÓÔÁÌØÎÁÑ ÞÁÓÔØ ÆÁÊÌÁ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÁ"
 
-#: mount/mount.c:381
+#: mount/mount_blkid.c:87
+#, c-format
+msgid "%s: error: the label %s occurs on both %s and %s\n"
+msgstr "%s: ÏÛÉÂËÁ: ÍÅÔËÁ %s ×ÓÔÒÅÞÁÅÔÓÑ × %s É %s\n"
+
+#: mount/mount_blkid.c:99
+#, c-format
+msgid "mount: going to mount %s by UUID\n"
+msgstr "mount: ÂÕÄÅÔ ×ÙÐÏÌÎÅÎÏ ÍÏÎÔÉÒÏ×ÁÎÉÅ %s ÓÏÇÌÁÓÎÏ UUID\n"
+
+#: mount/mount_blkid.c:103
+#, c-format
+msgid "mount: going to mount %s by label\n"
+msgstr "mount: ÂÕÄÅÔ ×ÙÐÏÌÎÅÎÏ ÍÏÎÔÉÒÏ×ÁÎÉÅ %s ÓÏÇÌÁÓÎÏ ÍÅÔËÉ\n"
+
+#: mount/mount_by_label.c:192
+#, c-format
+msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s, ÐÏÜÔÏÍÕ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ UUID É íåôëé ÎÅ ÍÏÖÅÔ ÂÙÔØ "
+"×ÙÐÏÌÎÅÎÏ.\n"
+
+#: mount/mount_by_label.c:315
+#, c-format
+msgid "%s: bad UUID"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ UUID"
+
+#: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: ÓÏÇÌÁÓÎÏ mtab, %s ÕÖÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÁ %s"
 
-#: mount/mount.c:386
+#: mount/mount.c:387
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: ÓÏÇÌÁÓÎÏ mtab, %s ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÁ %s"
 
-#: mount/mount.c:406
+#: mount/mount.c:407
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÚÁÐÉÓÉ: %s"
 
-#: mount/mount.c:423 mount/mount.c:676
+#: mount/mount.c:424 mount/mount.c:677
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: ÏÛÉÂËÁ ÚÁÐÉÓÉ %s: %s"
 
-#: mount/mount.c:431
+#: mount/mount.c:432
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: ÏÛÉÂËÁ ÓÍÅÎÙ ÒÅÖÉÍÁ %s: %s"
 
-#: mount/mount.c:482
+#: mount/mount.c:483
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ×ÙÇÌÑÄÉÔ ËÁË ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ - ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ"
 
-#: mount/mount.c:569
+#: mount/mount.c:570
 msgid "mount failed"
 msgstr "mount ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: mount/mount.c:571
+#: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: ÔÏÌØËÏ root ÍÏÖÅÔ ÍÏÎÔÉÒÏ×ÁÔØ %s ÎÁ %s"
 
-#: mount/mount.c:599
+#: mount/mount.c:600
 msgid "mount: loop device specified twice"
 msgstr "mount: ÕÓÔÒÏÊÓÔ×Ï ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ ÕËÁÚÁÎÏ Ä×ÁÖÄÙ"
 
-#: mount/mount.c:604
+#: mount/mount.c:605
 msgid "mount: type specified twice"
 msgstr "mount: ÔÉÐ ÕËÁÚÁÎ Ä×ÁÖÄÙ"
 
-#: mount/mount.c:616
+#: mount/mount.c:617
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ÐÒÏÐÕÓËÁÅÔÓÑ ÕÓÔÁÎÏ×ËÁ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ\n"
 
-#: mount/mount.c:625
+#: mount/mount.c:626
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: ÐÏÄÇÏÔÏ×ËÁ Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ %s\n"
 
-#: mount/mount.c:630
+#: mount/mount.c:631
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: ÕÓÔÁÎÏ×ËÁ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: mount/mount.c:634
+#: mount/mount.c:635
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: ÕÓÔÁÎÏ×ËÁ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÉÌÁÓØ\n"
 
-#: mount/mount.c:671
+#: mount/mount.c:672
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s"
 
-#: mount/mount.c:692
+#: mount/mount.c:693
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: ÁÒÇÕÍÅÎÔ ÄÌÑ -p ÉÌÉ --pass-fd ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ"
 
-#: mount/mount.c:705
+#: mount/mount.c:706
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓËÏÒÏÓÔÉ"
 
-#: mount/mount.c:708
+#: mount/mount.c:709
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÓËÏÒÏÓÔØ: %s"
 
-#: mount/mount.c:762 mount/mount.c:1347
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ: %s"
 
-#: mount/mount.c:850
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: ÜÔÁ ×ÅÒÓÉÑ ÂÙÌÁ ÏÔËÏÍÐÉÌÉÒÏ×ÁÎÁ ÂÅÚ ÐÏÄÄÅÒÖËÉ ÔÉÐÁ `nfs'"
-
-#: mount/mount.c:890
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: ÓÂÏÊ ÍÏÎÔÉÒÏ×ÁÎÉÑ nfs ×ÅÒÓÉÉ 4, ÐÒÏÂÕÅÔÓÑ 3..\n"
 
-#: mount/mount.c:901
-msgid "mount: I could not determine the filesystem type, and none was specified"
-msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ, É ÎÉ ÏÄÎÁ ÎÅ ÂÙÌÁ ÕËÁÚÁÎÁ"
+#: mount/mount.c:895
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+"mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ, É ÎÉ ÏÄÎÁ ÎÅ ÂÙÌÁ ÕËÁÚÁÎÁ"
 
-#: mount/mount.c:904
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
 
-#. should not happen
-#: mount/mount.c:907
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: ÍÏÎÔÉÒÏ×ÁÎÉÅ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ"
 
-#: mount/mount.c:913 mount/mount.c:948
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ %s ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
 
-#: mount/mount.c:915
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: ÄÏÓÔÕÐ ÚÁÐÒÅÝÅÎ"
 
-#: mount/mount.c:917
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
-msgstr "mount: ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ mount"
+msgstr ""
+"mount: ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:921 mount/mount.c:925
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s ÚÁÎÑÔ"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:927
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ÕÖÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ"
 
-#: mount/mount.c:929
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ÕÖÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÉÌÉ %s ÚÁÎÑÔ"
 
-#: mount/mount.c:935
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: mount/mount.c:937
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ %s Ñ×ÌÑÅÔÓÑ ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÏÊ × ÎÉËÕÄÁ"
 
-#: mount/mount.c:940
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: ÓÐÅÃÉÁÌØÎÏÅ ÕÓÔÒÏÊÓÔ×Ï %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: mount/mount.c:950
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8075,12 +8046,12 @@ msgstr ""
 "mount: ÓÐÅÃÉÁÌØÎÏÅ ÕÓÔÒÏÊÓÔ×Ï %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ\n"
 "       (ÐÒÅÆÉËÓ ÐÕÔÉ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ)\n"
 
-#: mount/mount.c:963
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ÕÖÅ ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÉÌÉ ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ"
 
-#: mount/mount.c:965
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8089,7 +8060,7 @@ msgstr ""
 "mount: ÎÅ×ÅÒÎÙÊ ÔÉÐ æó, ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ, ÎÅ×ÅÒÎÙÊ ÓÕÐÅÒÂÌÏË\n"
 "       ÎÁ %s, ÏÔÓÕÔÓÔ×ÕÅÔ ËÏÄÏ×ÁÑ ÓÔÒÁÎÉÃÁ ÉÌÉ ÄÒÕÇÁÑ ÏÛÉÂËÁ"
 
-#: mount/mount.c:975
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8098,7 +8069,7 @@ msgstr ""
 "       ÉÓÐÏÌØÚÕÅÔÅ ide-scsi, É ÐÏÜÔÏÍÕ ÎÕÖÅÎ sr0, sda ÉÌÉ\n"
 "       ÞÔÏ-ÎÉÂÕÄØ ÐÏÄÏÂÎÏÅ?)"
 
-#: mount/mount.c:981
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8106,7 +8077,7 @@ msgstr ""
 "       (ÎÅ ÐÙÔÁÅÔÅÓØ ÌÙ ×Ù ÐÒÉÍÏÎÔÉÒÏ×ÁÔØ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ\n"
 "       ×ÍÅÓÔÏ ÏÄÎÏÇÏ ÉÚ ÌÏÇÉÞÅÓËÉÈ ÒÁÚÄÅÌÏ× ×ÎÕÔÒÉ ÎÅÇÏ?)"
 
-#: mount/mount.c:998
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8115,50 +8086,52 @@ msgstr ""
 "       ÎÁÊÄÅÎÁ × syslog - ÐÏÐÒÏÂÕÊÔÅ dmesg | tail ÉÌÉ ÞÔÏ-ÔÏ\n"
 "       × ÜÔÏÍ ÒÏÄÅ\n"
 
-#: mount/mount.c:1004
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "ÔÁÂÌÉÃÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ ÚÁÐÏÌÎÅÎÁ"
 
-#: mount/mount.c:1006
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÕÐÅÒÂÌÏË"
 
-#: mount/mount.c:1010
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ÎÅÉÚ×ÅÓÔÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
-#: mount/mount.c:1015
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ '%s'"
 
-#: mount/mount.c:1027
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: ×ÏÚÍÏÖÎÏ ×Ù ÉÍÅÌÉ × ×ÉÄÕ %s"
 
-#: mount/mount.c:1029
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: ÍÏÖÅÔ ÂÙÔØ ×Ù ÉÍÅÌÉ × ×ÉÄÕ 'iso9660'?"
 
-#: mount/mount.c:1031
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: ÍÏÖÅÔ ÂÙÔØ ×Ù ÉÍÅÌÉ × ×ÉÄÕ 'vfat'?"
 
-#: mount/mount.c:1034
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr "mount: %s ÉÍÅÅÔ ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á ÉÌÉ ÔÉÐ æó %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
+msgstr ""
+"mount: %s ÉÍÅÅÔ ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á ÉÌÉ ÔÉÐ æó %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#. strange ...
-#: mount/mount.c:1040
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ, Á ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÓÔÏÑÎÉÑ ÎÅ×ÏÚÍÏÖÎÏ?"
+msgstr ""
+"mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ, Á ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÓÔÏÑÎÉÑ "
+"ÎÅ×ÏÚÍÏÖÎÏ?"
 
-#: mount/mount.c:1042
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8167,71 +8140,68 @@ msgstr ""
 "mount: ÑÄÒÏ ÎÅ ÒÁÓÐÏÚÎÁÅÔ %s ËÁË ÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï\n"
 "       (ÍÏÖÅÔ ÂÙÔØ `insmod driver'?)"
 
-#: mount/mount.c:1045
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ (ÍÏÖÅÔ ÐÏÐÒÏÂÏ×ÁÔØ `-o loop'?)"
+msgstr ""
+"mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ (ÍÏÖÅÔ ÐÏÐÒÏÂÏ×ÁÔØ `-o loop'?)"
 
-#: mount/mount.c:1048
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
 
-#: mount/mount.c:1051
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1054
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "ÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï "
 
-#: mount/mount.c:1056
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÉÍÏÎÔÉÒÏ×ÁÔØ %s%s ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-#: mount/mount.c:1060
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s ÚÁÝÉÝÅÎ ÏÔ ÚÁÐÉÓÉ, ÎÏ Ñ×ÎÏ ÕËÁÚÁÎ ÆÌÁÇ `-w'"
 
-#: mount/mount.c:1077
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ÚÁÝÉÝÅÎ ÏÔ ÚÁÐÉÓÉ, ÍÏÎÔÉÒÕÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-#: mount/mount.c:1176
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: ÎÅ ÂÙÌ ÕËÁÚÁÎ ÔÉÐ - ÂÕÄÅÔ ÐÏÄÒÁÚÕÍÅ×ÁÔØÓÑ nfs ÉÚ-ÚÁ Ä×ÏÅÔÏÞÉÑ\n"
 
-#: mount/mount.c:1182
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
-msgstr "mount: ÎÅ ÂÙÌ ÕËÁÚÁÎ ÔÉÐ - ÂÕÄÅÔ ÐÏÄÒÁÚÕÍÅ×ÁÔØÓÑ smbfs ÉÚ-ÚÁ ÐÒÅÆÉËÓÁ //\n"
+msgstr ""
+"mount: ÎÅ ÂÙÌ ÕËÁÚÁÎ ÔÉÐ - ÂÕÄÅÔ ÐÏÄÒÁÚÕÍÅ×ÁÔØÓÑ smbfs ÉÚ-ÚÁ ÐÒÅÆÉËÓÁ //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1199
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ÆÏÎÏ×ÁÑ ÏÂÒÁÂÏÔËÁ \"%s\"\n"
 
-#: mount/mount.c:1210
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ÓÄÁÀÓØ \"%s\"\n"
 
-#: mount/mount.c:1292
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ÕÖÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÁ %s\n"
 
-#: mount/mount.c:1425
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8264,8 +8234,10 @@ msgstr ""
 "ëÏÍÁÎÄÁ `mount [-t ÔÉÐ_ÆÓ] ÞÔÏ-ÔÏ ËÕÄÁ-ÔÏ'.\n"
 "äÅÔÁÌÉ, ÎÁÊÄÅÎÎÙÅ × /etc/fstab, ÍÏÇÕÔ ÂÙÔØ ÐÒÏÐÕÝÅÎÙ.\n"
 "       mount -a [-t|-O] ...     : ÍÏÎÔÉÒÏ×ÁÎÉÅ ×ÓÅÇÏ ÓÏÄÅÒÖÉÍÏÇÏ /etc/fstab\n"
-"       mount ÕÓÔÒÏÊÓÔ×Ï         : ÍÏÎÔÉÒÏ×ÁÎÉÅ ÕÓÔÒÏÊÓÔ×Á ÎÁ ÉÚ×ÅÓÔÎÏÅ ÍÅÓÔÏ\n"
-"       mount ËÁÔÁÌÏÇ            : ÍÏÎÔÉÒÏ×ÁÎÉÅ ÉÚ×ÅÓÔÎÏÇÏ ÕÓÔÒÏÊÓÔ×Á ÎÁ ÎÅÇÏ\n"
+"       mount ÕÓÔÒÏÊÓÔ×Ï         : ÍÏÎÔÉÒÏ×ÁÎÉÅ ÕÓÔÒÏÊÓÔ×Á ÎÁ ÉÚ×ÅÓÔÎÏÅ "
+"ÍÅÓÔÏ\n"
+"       mount ËÁÔÁÌÏÇ            : ÍÏÎÔÉÒÏ×ÁÎÉÅ ÉÚ×ÅÓÔÎÏÇÏ ÕÓÔÒÏÊÓÔ×Á ÎÁ "
+"ÎÅÇÏ\n"
 "       mount -t ÔÉÐ ÕÓÔÒ ËÁÔ    : ÏÂÙÞÎÁÑ ËÏÍÁÎÄÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ\n"
 "ðÏÍÎÉÔÅ, ÞÔÏ mount ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÍÏÎÔÉÒÕÅÔ ÎÅ ÕÓÔÒÏÊÓÔ×Ï, Á ÆÁÊÌÏ×ÕÀ\n"
 "ÓÉÓÔÅÍÕ (ÕËÁÚÁÎÎÏÇÏ ÔÉÐÁ), ÎÁÊÄÅÎÎÕÀ ÎÁ ÜÔÏÍ ÕÓÔÒÏÊÓÔ×Å.\n"
@@ -8278,47 +8250,38 @@ msgstr ""
 "äÒÕÇÉÅ ÏÐÃÉÉ: [-nfFrsvw] [-o ÏÐÃÉÉ] [-p passwdfd].\n"
 "äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ ÎÁÂÅÒÉÔÅ  man 8 mount .\n"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: ÔÏÌØËÏ root ÍÏÖÅÔ ÓÄÅÌÁÔØ ÜÔÏ"
 
-#: mount/mount.c:1619
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s ÎÅ ÎÁÊÄÅÎ - ÓÏÚÄÁÅÔÓÑ...\n"
 
-#: mount/mount.c:1631
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: ÔÁËÏÊ ÒÁÚÄÅÌ ÎÅ ÎÁÊÄÅÎ"
 
-#: mount/mount.c:1633
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: ÍÏÎÔÉÒÕÅÔÓÑ %s\n"
 
-#: mount/mount.c:1642
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "ÎÉÞÅÇÏ ÎÅ ÂÙÌÏ ÐÒÉÍÏÎÔÉÒÏ×ÁÎÏ"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s × %s"
 
-#: mount/mount.c:1672
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s × %s ÉÌÉ %s"
 
-#: mount/mount_by_label.c:190
-#, c-format
-msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s, ÐÏÜÔÏÍÕ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ UUID É íåôëé ÎÅ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÏ.\n"
-
-#: mount/mount_by_label.c:313
-msgid "mount: bad UUID"
-msgstr "mount: ÎÅ×ÅÒÎÙÊ UUID"
-
 #: mount/mount_guess_fstype.c:489
 #, c-format
 msgid "mount: error while guessing filesystem type\n"
@@ -8349,120 +8312,120 @@ msgstr "       Ñ ÐÏÐÒÏÂÕÀ ÔÉÐ %s\n"
 msgid "Trying %s\n"
 msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: ÞÒÅÚ×ÙÞÁÊÎÏ ÄÌÉÎÎÙÊ ÁÒÇÕÍÅÎÔ host:dir\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÍÎÏÇÏËÒÁÔÎÙÅ ÉÍÅÎÁ ÈÏÓÔÏ× ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: ËÁÔÁÌÏÇ ÄÌÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ ÎÅ × ÆÏÒÍÁÔÅ host:dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÁÄÒÅÓ ÄÌÑ %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ÐÏÌÕÞÅÎ ÎÅ×ÅÒÎÙÊ hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: ÞÒÅÚ×ÙÞÁÊÎÏ ÄÌÉÎÎÙÊ ÁÒÇÕÍÅÎÔ ÏÐÃÉÉ\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: îÅÒÁÓÐÏÚÎÁÎÎÁÑ ÏÐÃÉÑ proto= .\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Warning: ïÐÃÉÑ namlen ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ ÍÏÎÔÉÒÏ×ÁÎÉÑ nfs: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÐÃÉÑ nolock ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ nfs: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ÐÏÌÕÞÅÎ ÎÅ×ÅÒÎÙÊ hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS ÞÅÒÅÚ TCP ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "ÓÏËÅÔ nfs"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "ÓÅÒ×ÅÒ nfs ÓÏÏÂÝÉÌ, ÞÔÏ ÓÅÒ×ÉÓ ÎÅÄÏÓÔÕÐÅÎ"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "ÄÌÑ ÎÁÈÏÖÄÅÎÉÑ ÐÏÒÔÁ NFS ÉÓÐÏÌØÚÕÅÔÓÑ portmapper\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "ÄÌÑ ÄÅÍÏÎÁ nfs ÉÓÐÏÌØÚÕÅÔÓÑ ÐÏÒÔ %d\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs ÐÏÄËÌÀÞÅÎÉÅ"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ×ÏÚ×ÒÁÝÁÅÍÏÅ ÚÎÁÞÅÎÉÅ ÓÏÓÔÏÑÎÉÑ nfs: %d"
 
-#: mount/sundries.c:66
+#: mount/sundries.c:26
 msgid "bug in xstrndup call"
 msgstr "ÏÛÉÂËÁ × ×ÙÚÏ×Å xstrndup"
 
-#: mount/swapon.c:54
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
-"       %s [-v] [-p priority] special ...\n"
+"       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
 "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
-"       %s [-v] [-p ÐÒÉÏÒÉÔÅÔ] ÓÐÅÃÉÁÌØÎÙÊ ...\n"
+"       %s [-v] [-p ÐÒÉÏÒÉÔÅÔ] ÓÐÅÃÉÁÌØÎÙÊ|LABEL=ÉÍÑ_ÔÏÍÁ ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8473,133 +8436,139 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] ÓÐÅÃÉÁÌØÎÙÊ ...\n"
 
-#: mount/swapon.c:170 mount/swapon.c:234
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s ÎÁ %s\n"
 
-#: mount/swapon.c:174
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
+msgid "%s: cannot find the device for %s\n"
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÕÓÔÒÏÊÓÔ×Ï ÄÌÑ %s\n"
+
+#: mount/swapon.c:184
 #, c-format
-msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ %s: %s\n"
+msgid "%s: cannot stat %s: %s\n"
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ %s: %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:195
 #, c-format
-msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr "swapon: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÉÍÅÅÔ ÎÅÂÅÚÏÐÁÓÎÙÅ ÒÁÚÒÅÛÅÎÉÑ %04o, ÒÅËÏÍÅÎÄÕÅÔÓÑ %04o\n"
+msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
+msgstr ""
+"%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÉÍÅÅÔ ÎÅÂÅÚÏÐÁÓÎÙÅ ÒÁÚÒÅÛÅÎÉÑ %04o, ÒÅËÏÍÅÎÄÕÅÔÓÑ %"
+"04o\n"
 
-#: mount/swapon.c:197
+#: mount/swapon.c:207
 #, c-format
-msgid "swapon: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: ðÒÏÐÕÓËÁÅÔÓÑ ÆÁÊÌ %s - ËÁÖÅÔÓÑ ÏÎ ÉÍÅÅÔ ÄÙÒÙ.\n"
+msgid "%s: Skipping file %s - it appears to have holes.\n"
+msgstr "%s: ðÒÏÐÕÓËÁÅÔÓÑ ÆÁÊÌ %s - ÐÏÈÏÖÅ × Î£Í ÉÍÅÀÔÓÑ ÄÙÒÙ.\n"
 
-#: mount/swapon.c:240
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "îÅ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ.\n"
 
-#: mount/swapon.c:304 mount/swapon.c:400
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: ÏÔËÏÍÐÉÌÉÒÏ×ÁÎ ÂÅÚ ÐÏÄÄÅÒÖËÉ -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "ÈÏÓÔ: %s, ËÁÔÁÌÏÇ: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÁÄÒÅÓ ÄÌÑ %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: ÐÏÌÕÞÅÎ ÎÅ×ÅÒÎÙÊ hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ÎÅ×ÅÒÎÏÅ ÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÕÐÅÒÂÌÏË"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: ÕÓÔÒÏÊÓÔ×Ï ÚÁÎÑÔÏ"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ÎÅ ÎÁÊÄÅÎ"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: %s: ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
+msgstr ""
+"umount: %s: ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ÂÌÏÞÎÙÅ ÕÓÔÒÏÊÓÔ×Á ÎÁ fs ÚÁÐÒÅÝÅÎÙ"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ÎÅÔ umount2, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s - ×ÍÅÓÔÏ ÜÔÏÇÏ ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ÚÁÎÑÔ - ÐÅÒÅÍÏÎÔÉÒÏ×ÁÎ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÏÎÔÉÒÏ×ÁÔØ %s ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ÒÁÚÍÏÎÔÉÒÏ×ÁÎ\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÓÐÉÓÏË ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ ÄÌÑ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8610,47 +8579,46 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t ÔÉÐÙ_ÆÓ] [-O ÏÐÃÉÉ]\n"
 "       umount [-f] [-r] [-n] [-v] ÓÐÅÃÉÁÌØÎÙÊ | ÕÚÅÌ...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s × mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ (ÓÏÇÌÁÓÎÏ mtab)"
 
-#: mount/umount.c:576
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: ÐÏÈÏÖÅ, ÞÔÏ %s ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÅÓËÏÌØËÏ ÒÁÚ"
 
-#: mount/umount.c:589
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s ÎÅ × fstab (Á ×Ù ÎÅ root)"
 
-#: mount/umount.c:593
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: ÍÏÎÔÉÒÏ×ÁÎÉÅ %s ÐÒÏÔÉ×ÏÒÅÞÉÔ fstab'Õ"
 
-#: mount/umount.c:634
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: ÔÏÌØËÏ %s ÍÏÖÅÔ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s ÏÔ %s"
 
-#: mount/umount.c:715
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: ÔÏÌØËÏ root ÍÏÖÅÔ ÓÄÅÌÁÔØ ÜÔÏ"
 
@@ -8676,10 +8644,12 @@ msgstr ""
 #: sys-utils/cytune.c:126
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"æÁÊÌ %s, äÌÑ ÐÏÒÏÇÏ×ÏÇÏ ÚÎÁÞÅÎÉÑ %lu É ÚÎÁÞÅÎÉÑ ÔÁÊÍ-ÁÕÔÁ %lu, íÁËÓÉÍÕÍ ÓÉÍ×ÏÌÏ× × fifo ÂÙÌÉ %d,\n"
+"æÁÊÌ %s, äÌÑ ÐÏÒÏÇÏ×ÏÇÏ ÚÎÁÞÅÎÉÑ %lu É ÚÎÁÞÅÎÉÑ ÔÁÊÍ-ÁÕÔÁ %lu, íÁËÓÉÍÕÍ "
+"ÓÉÍ×ÏÌÏ× × fifo ÂÙÌÉ %d,\n"
 "É ÍÁËÓÉÍÁÌØÎÁÑ ÓËÏÒÏÓÔØ ÐÅÒÅÄÁÞÉ × ÓÉÍ×ÏÌÁÈ/ÓÅËÕÎÄÕ ÂÙÌÁ %f\n"
 
 #: sys-utils/cytune.c:190
@@ -8709,8 +8679,12 @@ msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ×ÒÅÍÅÎÉ ÐÏ ÕÍÏÌÞÁÎÉÀ: %s\n"
 
 #: sys-utils/cytune.c:239
 #, c-format
-msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-q [-i ÉÎÔÅÒ×ÁÌ]] ([-s ÚÎÁÞÅÎÉÅ]|[-S ÚÎÁÞÅÎÉÅ]) ([-t ÚÎÁÞÅÎÉÅ]|[-T ÚÎÁÞÅÎÉÅ]) [-g|-G] ÆÁÊÌ [ÆÁÊÌ...]\n"
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-q [-i ÉÎÔÅÒ×ÁÌ]] ([-s ÚÎÁÞÅÎÉÅ]|[-S ÚÎÁÞÅÎÉÅ]) ([-t "
+"ÚÎÁÞÅÎÉÅ]|[-T ÚÎÁÞÅÎÉÅ]) [-g|-G] ÆÁÊÌ [ÆÁÊÌ...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
 #: sys-utils/cytune.c:340
@@ -8763,8 +8737,11 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÁÔØ CYGETMON ÎÁ %s: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
-msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ÐÒÅÒÙ×, %lu/%lu ÓÉÍ×; fifo: %lu ÐÏÒÏÇ, %lu ÔÁÊÍ-ÁÕÔ, %lu ÍÁËÓ, %lu ÓÅÊÞÁÓ\n"
+msgid ""
+"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ÐÒÅÒÙ×, %lu/%lu ÓÉÍ×; fifo: %lu ÐÏÒÏÇ, %lu ÔÁÊÍ-ÁÕÔ, %lu ÍÁËÓ, %lu "
+"ÓÅÊÞÁÓ\n"
 
 #: sys-utils/cytune.c:425
 #, c-format
@@ -8773,8 +8750,11 @@ msgstr "   %f ÐÒÅÒÙ×/ÓÅË; %f ÚÁÐ, %f ÏÔÐÒÁ×ÌÅÎÏ (ÓÉÍ×/ÓÅË)\n"
 
 #: sys-utils/cytune.c:430
 #, c-format
-msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ÐÒÅÒÙ×, %lu ÓÉÍ×; fifo: %lu ÐÏÒÏÇ, %lu ÔÁÊÍ-ÁÕÔ, %lu ÍÁËÓ, %lu ÓÅÊÞÁÓ\n"
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ÐÒÅÒÙ×, %lu ÓÉÍ×; fifo: %lu ÐÏÒÏÇ, %lu ÔÁÊÍ-ÁÕÔ, %lu ÍÁËÓ, %lu "
+"ÓÅÊÞÁÓ\n"
 
 #: sys-utils/cytune.c:436
 #, c-format
@@ -8786,6 +8766,19 @@ msgstr "   %f ÐÒÅÒÙ×/ÓÅË; %f ÚÁÐ (ÓÉÍ×/ÓÅË)\n"
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-c] [-n ÕÒÏ×ÅÎØ] [-s ÒÁÚÍ_ÂÕÆÅÒÁ]\n"
 
+#: sys-utils/flock.c:59
+#, c-format
+msgid "flock: unknown option, aborting.\n"
+msgstr "flock: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÒÅÒÙ×ÁÎÉÅ.\n"
+
+#: sys-utils/flock.c:77
+#, fuzzy, c-format
+msgid ""
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
+msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ flock [--shared | --timeout=ÓÅËÕÎÄÙ] ÉÍÑ_ÆÁÊÌÁ ËÏÍÁÎÄÁ {ÁÒÇ "
+"ÁÒÇ...}\n"
+
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
@@ -8889,8 +8882,11 @@ msgstr "\t%s -h ÄÌÑ ÓÐÒÁ×ËÉ.\n"
 
 #: sys-utils/ipcs.c:129
 #, c-format
-msgid "%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÒÅÄÓÔ×ÁÈ ipc, Ë ËÏÔÏÒÙÍ ×Ù ÉÍÅÅÔÅ ÄÏÓÔÕÐ ÎÁ ÞÔÅÎÉÅ.\n"
+msgid ""
+"%s provides information on ipc facilities for which you have read access.\n"
+msgstr ""
+"%s ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÒÅÄÓÔ×ÁÈ ipc, Ë ËÏÔÏÒÙÍ ×Ù ÉÍÅÅÔÅ ÄÏÓÔÕÐ ÎÁ "
+"ÞÔÅÎÉÅ.\n"
 
 #: sys-utils/ipcs.c:131
 #, c-format
@@ -8949,8 +8945,6 @@ msgstr "ÑÄÒÏ ÎÅ ÎÁÓÔÒÏÅÎÏ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÏÊ ÐÁÍÑÔÉ\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ ðÒÅÄÅÌÙ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9040,7 +9034,8 @@ msgstr "gid"
 #: sys-utils/ipcs.c:305
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
-msgstr "------ þÉÓÌÏ ÐÏÄËÌÀÞÅÎÉÊ/ÏÔËÌÀÞÅÎÉÊ/ÉÚÍÅÎÅÎÉÑ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
+msgstr ""
+"------ þÉÓÌÏ ÐÏÄËÌÀÞÅÎÉÊ/ÏÔËÌÀÞÅÎÉÊ/ÉÚÍÅÎÅÎÉÑ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
 #: sys-utils/ipcs.c:306
 #, c-format
@@ -9274,7 +9269,8 @@ msgstr "msqid"
 #: sys-utils/ipcs.c:524
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
-msgstr "------ ëÏÌÉÞÅÓÔ×Ï ÏÔÐÒÁ×ÌÅÎÉÊ/ÐÒÉÅÍÁ/ÉÚÍÅÎÅÎÉÊ ÏÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ --------\n"
+msgstr ""
+"------ ëÏÌÉÞÅÓÔ×Ï ÏÔÐÒÁ×ÌÅÎÉÊ/ÐÒÉÅÍÁ/ÉÚÍÅÎÅÎÉÊ ÏÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ --------\n"
 
 #: sys-utils/ipcs.c:525
 #, c-format
@@ -9448,11 +9444,15 @@ msgstr "pid"
 
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: rdev [ -rv ] [ -o óíåýåîéå ] [ ïâòáú [ úîáþåîéå [ óíåýåîéå ] ] ]"
+msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: rdev [ -rv ] [ -o óíåýåîéå ] [ ïâòáú [ úîáþåîéå "
+"[ óíåýåîéå ] ] ]"
 
 #: sys-utils/rdev.c:70
-msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (ÉÌÉ rdev /linux É Ô.Ä.) ÏÔÏÂÒÁÖÁÅÔ ÔÅËÕÝÅÅ ÕÓÔÒÏÊÓÔ×Ï ROOT"
+msgid ""
+"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+"  rdev /dev/fd0  (ÉÌÉ rdev /linux É Ô.Ä.) ÏÔÏÂÒÁÖÁÅÔ ÔÅËÕÝÅÅ ÕÓÔÒÏÊÓÔ×Ï ROOT"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -9460,7 +9460,9 @@ msgstr "  rdev /dev/fd0 /dev/hda2         ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ROOT × /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              ÕÓÔÁÎÏ×ËÁ ROOTFLAGS (ÓÔÁÔÕÓ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ)"
+msgstr ""
+"  rdev -R /dev/fd0 1              ÕÓÔÁÎÏ×ËÁ ROOTFLAGS (ÓÔÁÔÕÓ ÔÏÌØËÏ ÄÌÑ "
+"ÞÔÅÎÉÑ)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -9487,12 +9489,17 @@ msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     ÔÏ ÖÅ, ÞÔÏ É rdev -v"
 
 #: sys-utils/rdev.c:79
-msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr "ðÒÉÍÅÞÁÎÉÅ: ×ÉÄÅÏÒÅÖÉÍÙ: -3=óÐÒÏÓÉÔØ, -2=òÁÓÛÉÒÅÎÎÙÊ, -1=ïÂÙÞÎÙÊ Vga, 1=ËÌÀÞ1, 2=ËÌÀÞ2,..."
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+"ðÒÉÍÅÞÁÎÉÅ: ×ÉÄÅÏÒÅÖÉÍÙ: -3=óÐÒÏÓÉÔØ, -2=òÁÓÛÉÒÅÎÎÙÊ, -1=ïÂÙÞÎÙÊ Vga, "
+"1=ËÌÀÞ1, 2=ËÌÀÞ2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      ÉÓÐÏÌØÚÕÊÔÅ -R 1 ÄÌÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ ËÏÒÎÅ×ÏÇÏ ËÁÔÁÌÏÇÁ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ, -R 0 ÄÌÑ ÞÔÅÎÉÑ/ÚÁÐÉÓÉ."
+msgstr ""
+"      ÉÓÐÏÌØÚÕÊÔÅ -R 1 ÄÌÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ ËÏÒÎÅ×ÏÇÏ ËÁÔÁÌÏÇÁ ÔÏÌØËÏ ÄÌÑ "
+"ÞÔÅÎÉÑ, -R 0 ÄÌÑ ÞÔÅÎÉÑ/ÚÁÐÉÓÉ."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
@@ -9565,8 +9572,11 @@ msgstr "×ÓÅÇÏ"
 
 #: sys-utils/renice.c:68
 #, c-format
-msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: renice ÐÒÉÏÒÉÔÅÔ [ [ -p ] pid'Ù ] [ [ -g ] pgrp'Ù ] [ [ -u ] ÐÏÌØÚÏ×ÁÔÅÌÉ ]\n"
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: renice ÐÒÉÏÒÉÔÅÔ [ [ -p ] pid'Ù ] [ [ -g ] pgrp'Ù ] [ [ -u ] "
+"ÐÏÌØÚÏ×ÁÔÅÌÉ ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
@@ -9603,7 +9613,8 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s <ÕÓÔÒÏÊÓÔ×Ï> [ -i <ðòåòù÷áîéå> | -t <÷òåíñ> | -c <óéí÷ïìù> | -w <ïöéäáîéå> | \n"
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s <ÕÓÔÒÏÊÓÔ×Ï> [ -i <ðòåòù÷áîéå> | -t <÷òåíñ> | -c <óéí÷ïìù> "
+"| -w <ïöéäáîéå> | \n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
@@ -9719,20 +9730,24 @@ msgstr "hexdump: ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÐÒÏÐÕÓËÁ.\n"
 
 #: text-utils/hexsyntax.c:131
 #, c-format
-msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr "hexdump: [-bcCdovx] [-e ÓÔÒÏËÁ_ÆÏÒÍÁÔÁ] [-f ÆÁÊÌ_ÆÏÒÍÁÔÁ] [-n ÄÌÉÎÁ] [-s ÐÒÏÐÕÓË] [ÆÁÊÌ ...]\n"
+msgid ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcCdovx] [-e ÓÔÒÏËÁ_ÆÏÒÍÁÔÁ] [-f ÆÁÊÌ_ÆÏÒÍÁÔÁ] [-n ÄÌÉÎÁ] [-s "
+"ÐÒÏÐÕÓË] [ÆÁÊÌ ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-dflpcsu] [+ÎÏÍÅÒ_ÓÔÒÏËÉ | +/ÛÁÂÌÏÎ] ÉÍÑ1 ÉÍÑ2 ...\n"
+msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-dflpcsu] [+ÎÏÍÅÒ_ÓÔÒÏËÉ | +/ÛÁÂÌÏÎ] ÉÍÑ1 ÉÍÑ2 ...\n"
 
-#: text-utils/more.c:485
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ \"-%c\"\n"
 
-#: text-utils/more.c:517
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9743,8 +9758,7 @@ msgstr ""
 "*** %s: ËÁÔÁÌÏÇ ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:560
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9755,45 +9769,45 @@ msgstr ""
 "******** %s: îÅ ÔÅËÓÔÏ×ÙÊ ÆÁÊÌ ********\n"
 "\n"
 
-#: text-utils/more.c:663
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[éÓÐÏÌØÚÕÊÔÅ q ÉÌÉ or Q ÄÌÑ ×ÙÈÏÄÁ]"
 
-#: text-utils/more.c:755
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--äÁÌÅÅ--"
 
-#: text-utils/more.c:757
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(óÌÅÄÕÀÝÉÊ ÆÁÊÌ: %s)"
 
-#: text-utils/more.c:762
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[îÁÖÍÉÔÅ ÐÒÏÂÅÌ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ, 'q' ÄÌÑ ×ÙÈÏÄÁ.]"
 
-#: text-utils/more.c:1161
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...ÎÁÚÁÄ ÎÁ %d ÓÔÒÁÎÉÃ"
 
-#: text-utils/more.c:1163
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...ÎÁÚÁÄ ÎÁ 1 ÓÔÒÁÎÉÃÕ"
 
-#: text-utils/more.c:1206
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ ÏÄÎÁ ÓÔÒÏËÁ"
 
-#: text-utils/more.c:1208
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ %d ÓÔÒÏË"
 
-#: text-utils/more.c:1245
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -9803,17 +9817,20 @@ msgstr ""
 "***îÁÚÁÄ***\n"
 "\n"
 
-#: text-utils/more.c:1283
+#: text-utils/more.c:1237
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in "
+"brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"âÏÌØÛÉÎÓÔ×Õ ËÏÍÁÎÄ ÏÐÃÉÏÎÁÌØÎÏ ÐÒÅÄÛÅÓÔ×ÕÅÔ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ k. úÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ × ËÁ×ÙÞËÁÈ.\n"
-"ú×ÅÚÄÏÞËÁ (*) ÏÚÎÁÞÁÅÔ, ÞÔÏ ÁÒÇÕÍÅÎÔ ÓÔÁÎÏ×ÉÔÓÑ ÎÏ×ÙÍ ÚÎÁÞÅÎÉÅÍ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n"
+"âÏÌØÛÉÎÓÔ×Õ ËÏÍÁÎÄ ÏÐÃÉÏÎÁÌØÎÏ ÐÒÅÄÛÅÓÔ×ÕÅÔ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ k. úÎÁÞÅÎÉÑ ÐÏ "
+"ÕÍÏÌÞÁÎÉÀ × ËÁ×ÙÞËÁÈ.\n"
+"ú×ÅÚÄÏÞËÁ (*) ÏÚÎÁÞÁÅÔ, ÞÔÏ ÁÒÇÕÍÅÎÔ ÓÔÁÎÏ×ÉÔÓÑ ÎÏ×ÙÍ ÚÎÁÞÅÎÉÅÍ ÐÏ "
+"ÕÍÏÌÞÁÎÉÀ.\n"
 
-#: text-utils/more.c:1290
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9835,15 +9852,19 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<ÐÒÏÂÅÌ>                ÷Ù×ÏÄ ÓÌÅÄÕÀÝÉÈ k ÓÔÒÏË ÔÅËÓÔÁ [ÔÅËÕÝÉÊ ÒÁÚÍÅÒ ÜËÒÁÎÁ]\n"
-"z                       ÷Ù×ÏÄ ÓÌÅÄÕÀÝÉÈ k ÓÔÒÏË ÔÅËÓÔÁ [ÔÅËÕÝÉÊ ÒÁÚÍÅÒ ÜËÒÁÎÁ]*\n"
+"<ÐÒÏÂÅÌ>                ÷Ù×ÏÄ ÓÌÅÄÕÀÝÉÈ k ÓÔÒÏË ÔÅËÓÔÁ [ÔÅËÕÝÉÊ ÒÁÚÍÅÒ "
+"ÜËÒÁÎÁ]\n"
+"z                       ÷Ù×ÏÄ ÓÌÅÄÕÀÝÉÈ k ÓÔÒÏË ÔÅËÓÔÁ [ÔÅËÕÝÉÊ ÒÁÚÍÅÒ "
+"ÜËÒÁÎÁ]*\n"
 "<return>                ÷Ù×ÏÄ ÓÌÅÄÕÀÝÉÈ k ÓÔÒÏË ÔÅËÓÔÁ [1]*\n"
-"d ÉÌÉ ctrl-D            ðÒÏËÒÕÔËÁ k ÓÔÒÏË [ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ ÐÒÏËÒÕÔËÉ, ÉÚÎÁÞÁÌØÎÏ 11]*\n"
+"d ÉÌÉ ctrl-D            ðÒÏËÒÕÔËÁ k ÓÔÒÏË [ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ ÐÒÏËÒÕÔËÉ, "
+"ÉÚÎÁÞÁÌØÎÏ 11]*\n"
 "q ÉÌÉ Q ÉÌÉ <ÐÒÅÒÙ×.>   ÷ÙÈÏÄ ÉÚ more\n"
 "s                       ðÒÏÐÕÓË ×ÐÅÒÅÄ k ÓÔÒÏË ÔÅËÓÔÁ [1]\n"
 "f                       ðÒÏÐÕÓË ×ÐÅÒÅÄ k ÐÏÌÎÙÈ ÜËÒÁÎÏ× ÔÅËÓÔÁ [1]\n"
 "b ÉÌÉ ctrl-B            ðÒÏÐÕÓË ÎÁÚÁÄ k ÐÏÌÎÙÈ ÜËÒÁÎÏ× ÔÅËÓÔÁ [1]\n"
-"'                       ðÅÒÅÈÏÄ × ÍÅÓÔÏ, Ó ËÏÔÏÒÏÇÏ ÂÙÌ ÎÁÞÁÔ ÐÒÅÄÙÄÕÝÉÊ ÐÏÉÓË\n"
+"'                       ðÅÒÅÈÏÄ × ÍÅÓÔÏ, Ó ËÏÔÏÒÏÇÏ ÂÙÌ ÎÁÞÁÔ ÐÒÅÄÙÄÕÝÉÊ "
+"ÐÏÉÓË\n"
 "=                       ïÔÏÂÒÁÖÅÎÉÅ ÎÏÍÅÒÁ ÔÅËÕÝÅÊ ÓÔÒÏËÉ\n"
 "/<ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ> ðÏÉÓË k-ÇÏ ×ÈÏÖÄÅÎÉÑ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ [1]\n"
 "n                       ðÏÉÓË k-ÇÏ ×ÈÏÖÄÅÎÉÑ ÐÏÓÌÅÄÎÅÇÏ Ò.×. [1]\n"
@@ -9855,34 +9876,34 @@ msgstr ""
 ":f                      ïÔÏÂÒÁÖÅÎÉÅ ÉÍÅÎÉ ÔÅËÕÝÅÇÏ ÆÁÊÌÁ É ÎÏÍÅÒÁ ÓÔÒÏËÉ\n"
 ".                       ðÏ×ÔÏÒÅÎÉÅ ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÙ\n"
 
-#: text-utils/more.c:1359 text-utils/more.c:1364
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[îÁÖÍÉÔÅ 'h' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÎÓÔÒÕËÃÉÊ.]"
 
-#: text-utils/more.c:1398
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" ÓÔÒÏËÁ %d"
 
-#: text-utils/more.c:1400
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[îÅ ÆÁÊÌ] ÓÔÒÏËÁ %d"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  ðÅÒÅÐÏÌÎÅÎÉÅ\n"
 
-#: text-utils/more.c:1531
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ\n"
 
-#: text-utils/more.c:1560
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "îÅËÏÒÒÅËÔÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ"
 
-#: text-utils/more.c:1572
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9890,15 +9911,15 @@ msgstr ""
 "\n"
 "ûÁÂÌÏÎ ÎÅ ÎÁÊÄÅÎ\n"
 
-#: text-utils/more.c:1575 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "ûÁÂÌÏÎ ÎÅ ÎÁÊÄÅÎ"
 
-#: text-utils/more.c:1636
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ\n"
 
-#: text-utils/more.c:1675
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -9906,19 +9927,19 @@ msgstr ""
 "\n"
 "...ðÒÏÐÕÓËÁÅÔÓÑ "
 
-#: text-utils/more.c:1679
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...ðÒÏÐÕÓËÁÅÔÓÑ ÄÏ ÆÁÊÌÁ "
 
-#: text-utils/more.c:1681
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...ðÒÏÐÕÓËÁÅÔÓÑ ÏÂÒÁÔÎÏ ÄÏ ÆÁÊÌÁ "
 
-#: text-utils/more.c:1959
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "óÔÒÏËÁ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ"
 
-#: text-utils/more.c:2002
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÙ ÄÌÑ ÚÁÍÅÎÙ"
 
@@ -9971,89 +9992,89 @@ msgstr "hexdump: ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
-msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr "%s: éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-ÞÉÓÌÏ] [-p ÓÔÒÏËÁ] [-cefnrs] [+ÓÔÒÏËÁ] [+/ÛÁÂÌÏÎ/] [ÆÁÊÌÙ]\n"
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+"%s: éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-ÞÉÓÌÏ] [-p ÓÔÒÏËÁ] [-cefnrs] [+ÓÔÒÏËÁ] [+/ÛÁÂÌÏÎ/] "
+"[ÆÁÊÌÙ]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: ÄÌÑ ÏÐÃÉÉ ÔÒÅÂÕÅÔÓÑ ÁÒÇÕÍÅÎÔ -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ ×ÐÅÒÅÄ\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ ÎÁÚÁÄ\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "îÅÔ ÓÌÅÄÕÀÝÅÇÏ ÆÁÊÌÁ"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ÆÁÊÌÁ"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: ïÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: îÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ × ÆÁÊÌÅ %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ × ÆÁÊÌÅ %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "ïÛÉÂËÁ RE: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(ËÏÎÅÃ ÆÁÊÌÁ)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "îÅÔ ÚÁÐÏÍÎÅÎÎÙÈ ÓÔÒÏË ÐÏÉÓËÁ"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "ÓÏÈÒÁÎÅÎ"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !ËÏÍÁÎÄÁ ÎÅ ÒÁÚÒÅÛÅÎÁ × ÒÅÖÉÍÅ rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(óÌÅÄÕÀÝÉÊ ÆÁÊÌ: "
 
@@ -10067,6 +10088,16 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÂÕÆÅÒÎÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï\n"
 msgid "usage: rev [file ...]\n"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: rev [ÆÁÊÌ ...]\n"
 
+#: text-utils/tailf.c:53 text-utils/tailf.c:105
+#, c-format
+msgid "Cannot open \"%s\" for read\n"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ \"%s\" ÄÌÑ ÞÔÅÎÉÑ\n"
+
+#: text-utils/tailf.c:93
+#, c-format
+msgid "Usage: tailf logfile\n"
+msgstr "ÓÐÏÌØÚÏ×ÁÎÉÅ: tailf log-ÆÁÊÌ\n"
+
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
@@ -10096,3 +10127,158 @@ msgstr "óÔÒÏËÁ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ.\n"
 #, c-format
 msgid "Out of memory when growing buffer.\n"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ ÐÒÉ Õ×ÅÌÉÞÅÎÉÉ ÂÕÆÅÒÁ.\n"
+
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "îÅ×ÅÒÎÏÅ ÞÉÓÌÏ: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "ïÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "îÅÔ ÔÁËÏÇÏ ÎÁÂÏÒÁ ÐÁÒÁÍÅÔÒÏ×: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] dev ÉÍÑ\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] dev ÉÍÑ ÓÅËÔÏÒ ÇÏÌÏ×ËÉ ÄÏÒÏÖËÉ ÕÞÁÓÔÏË ÐÒÏÍÅÖÕÔÏË ÞÁÓÔÏÔÁ "
+#~ "ÓÐÅÃ 1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] dev\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] dev\n"
+
+#~ msgid "version"
+#~ msgstr "×ÅÒÓÉÑ"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÌÕÞÁÊÎÙÅ ÄÁÎÎÙÅ ÉÚ /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ (%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s ÎÅ ÉÍÅÅÔ ×ÅÒÎÙÈ filemode'Ï×"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÄÁÎÎÙÅ ÉÚ %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "õÖÅ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ×ÏÛÌÏ × ÓÉÓÔÅÍÕ.\n"
+#~ "ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "õ ×ÁÓ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÚÁÐÕÝÅÎÎÙÈ ÐÒÏÃÅÓÓÏ×.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "ðÁÒÏÌØ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ 6 ÓÉÍ×ÏÌÏ×, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "ðÁÒÏÌØ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÓÉÍ×ÏÌÙ ÓÌÅÄÕÀÝÉÈ Ä×ÕÈ ËÌÁÓÓÏ×:\n"
+#~ "ÓÉÍ×ÏÌÙ ×ÅÒÈÎÅÇÏ É ÎÉÖÎÅÇÏ ÒÅÇÉÓÔÒÁ, ÃÉÆÒÙ É ÎÅ ÂÕË×ÅÎÎÏÃÉÆÒÏ×ÙÅ\n"
+#~ "ÓÉÍ×ÏÌÙ. óÍ. passwd(1) ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÏ×ÔÏÒÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÔÁÒÙÊ ÐÁÒÏÌØ.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "ðÏÖÁÌÕÊÓÔÁ, ÎÅ ÉÓÐÏÌØÚÕÊÔÅ × ËÁÞÅÓÔ×Å ÐÁÒÏÌÑ ÞÔÏ-ÔÏ ×ÒÏÄÅ Ó×ÏÅÇÏ ÉÍÅÎÉ "
+#~ "ÐÏÌØÚÏ×ÁÔÅÌÑ!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "ðÏÖÁÌÕÊÓÔÁ, ÎÅ ÉÓÐÏÌØÚÕÊÔÅ × ËÁÞÅÓÔ×Å ÐÁÒÏÌÑ ÞÔÏ-ÔÏ ×ÒÏÄÅ Ó×ÏÅÇÏ "
+#~ "ÎÁÓÔÏÑÝÅÇÏ ÉÍÅÎÉ!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: passwd [ÉÍÑ_ÐÏÌØÚÏ×ÁÔÅÌÑ [ÐÁÒÏÌØ]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "ôÏÌØËÏ root ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÏÒÍÙ Ó ÏÄÎÉÍ É Ä×ÕÍÑ ÁÒÇÕÍÅÎÔÁÍÉ.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: passwd [-foqsvV] [ÐÏÌØÚÏ×ÁÔÅÌØ [ÐÁÒÏÌØ]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÏÅ ÉÍÑ"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "ôÏÌØËÏ root ÍÏÖÅÔ ÉÚÍÅÎÑÔØ ÞÕÖÉÅ ÐÁÒÏÌÉ.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ. `%s' ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÌØÚÏ×ÁÔÅÌØ?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "ë ÓÏÖÁÌÅÎÉÀ Ñ ÍÏÇÕ ÉÚÍÅÎÑÔØ ÔÏÌØËÏ ÌÏËÁÌØÎÙÅ ÐÁÒÏÌÉ. ÷ÍÅÓÔÏ ÜÔÏÇÏ "
+#~ "ÉÓÐÏÌØÚÕÊÔÅ yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID É ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅ ÓÏ×ÐÁÄÁÀÔ, ÓÁÍÏÚ×ÁÎÅÃ!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "éÚÍÅÎÅÎÉÅ ÐÁÒÏÌÑ ÄÌÑ %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "÷×ÅÄÉÔÅ ÓÔÁÒÙÊ ÐÁÒÏÌØ: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "úÁÐÒÅÝÅÎÎÙÊ ÐÁÒÏÌØ, ÓÁÍÏÚ×ÁÎÅÃ."
+
+#~ msgid "Enter new password: "
+#~ msgstr "÷×ÅÄÉÔÅ ÎÏ×ÙÊ ÐÁÒÏÌØ: "
+
+#~ msgid "Password not changed."
+#~ msgstr "ðÁÒÏÌØ ÎÅ ÉÚÍÅÎÅÎ."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "ðÏ×ÔÏÒÉÔÅ ÎÏ×ÙÊ ÐÁÒÏÌØ: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "÷Ù ÏÛÉÂÌÉÓØ. ðÁÒÏÌØ ÎÅ ÉÚÍÅÎÅÎ."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "ÐÁÒÏÌØ ÉÚÍÅÎÅÎ, ÐÏÌØÚÏ×ÁÔÅÌØ %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ðáòïìø ROOT'A éúíåîåî"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "ÐÁÒÏÌØ ÉÚÍÅÎÅÎ root'ÏÍ, ÐÏÌØÚÏ×ÁÔÅÌØ %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "×ÙÚÙ×ÁÅÔÓÑ setpwnam ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁÒÏÌÑ.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "ðÁÒÏÌØ *îå* ÉÚÍÅÎÅÎ, ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "ðÁÒÏÌØ ÉÚÍÅÎÅÎ.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: ÜÔÁ ×ÅÒÓÉÑ ÂÙÌÁ ÏÔËÏÍÐÉÌÉÒÏ×ÁÎÁ ÂÅÚ ÐÏÄÄÅÒÖËÉ ÔÉÐÁ `nfs'"
diff --git a/po/sl.gmo b/po/sl.gmo
new file mode 100644
index 000000000..5c5391ca0
--- /dev/null
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index 56e751944..04bcca941 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2003-01-28 16:30+0100\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -118,7 +118,7 @@ msgstr "%s: napaka ioctl na %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "uporaba:\n"
@@ -162,13 +162,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "uporaba: %s [ -n ] naprava\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s iz %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -193,7 +192,7 @@ msgstr "Dvo"
 msgid "Single"
 msgstr "Eno"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -203,97 +202,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: napaka %d pri dekomprimiranju! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: napaka v velikosti pri simbolni povezavi ,%s`\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, fuzzy, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Zapisanih samo %lu od skupno %lu bajtov"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: neveljavno dol¾ina pripone"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: prevedeno brez podpore -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: opozorilo - velikosti datoteènega sistema ni moè ugotoviti \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s ni bloèna enota, niti datoteka\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: neveljavno dol¾ina pripone"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: neveljavno ¹tevilo"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: neveljavno ¹tevilo"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -750,7 +749,7 @@ msgstr ""
 msgid "not enough space, need at least %lu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Naprava %s\n"
@@ -819,18 +818,18 @@ msgstr ""
 msgid "error closing %s"
 msgstr ""
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Uporaba: mkfs [-V] [-t tip] [izbire] naprava [velikost]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Zmanjkalo pomnilnika!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs, izdaja %s (%s)\n"
@@ -873,7 +872,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -926,10 +924,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1002,7 +996,6 @@ msgstr ""
 msgid "write failed in write_block"
 msgstr ""
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1036,7 +1029,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1078,106 +1071,106 @@ msgstr ""
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Slaba podana velikost strani %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Uporabljamo podano velikost strani %d namesto privzete vrednosti %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Privzemamo strani velikosti %d (ne %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "oznaka"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Uporaba: %s [-c] [-v0|-v1] [-pVEL_STRANI] /dev/name [bloki]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "preveè slabih strani"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "ena slaba stran\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d slabih strani\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: napaka: Ni prostora za izmenjalni prostor?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: napaka: velikost %ld je veèja od velikosti naprave %d\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: napaka: neznana izdaja %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: napaka: velikost izmenjalnega prostora mora biti vsaj %ld KB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: opozorilo: meja izmenjalnega prostora postavljena na %ld KB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: napaka: Ni prostora za izmenjalni prostor?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Izmenjalnega prostora ne bomo posku¹ali napraviti na ,%s`"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "usodna napaka: prva stran neberljiva"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1193,120 +1186,84 @@ msgstr ""
 "varnostno\n"
 "preverjanje.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Izmenjalnega prostora ni mogoèe pripraviti: branje ni mogoèe"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Pripravljamo izmenjalni prostor izdaje %d, velikost = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "izmenjalne naprave ni mogoèe previti"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "strani s podpisom ni mogoèe zapisati"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync() ni uspel"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Neveljavno ¹tevilo: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Skladenjska napaka: ,%s`\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr ""
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Neuporabljen prostor"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disk je bil zamenjan.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Ponovno za¾enite sistem, da bo razdelitvena tabela pravilno a¾urirana.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1315,810 +1272,788 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "USODNA NAPAKA"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Pritisnike katerokoli tipko za izhod iz cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Diskovnega pogona ni moè prebrati"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Na diskovni pogon ni moè pisati"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Preveè razdelkov"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Razdelek se zaène pred stezo 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Razdelek se konèa pred stezo 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Razdelek se zaène onkraj konca diska"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Razdelek se konèa onkraj konca diska"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logièni razdelki niso v diskovnem vrstnem redu"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logièni razdelki se prekrivajo"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "raz¹irjeni logièni razdelki se prekrivajo"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!! Interna napaka: ustvarjanje logiènega pogona brez raz¹irjenega "
 "razdelka !!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr ""
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr ""
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Pritisnite katerokoli tipko za nadaljevanje"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaren"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Ustvari nov primaren razdelek"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logièen"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Ustvari nov logièen razdelek"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Preklièi"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Ne ustvari razdelka"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Interna napaka !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Zaèetek"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Dodaj razdelek na zaèetek prostega obmoèja"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Dodaj razdelek na konec prostega obmoèja"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Ni prostora za ustvarjanje raz¹irjenega razdelka"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "ponovno preberi tabelo razdelkov"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Izpi¹i tabelo razdelkov na zaslon ali shrani v datoteko"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Enostaven izpis tabele razdelkov"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "ponovno preberi tabelo razdelkov"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Velikosti diska ni mogoèe ugotoviti"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Slab primarni razdelek"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Slab logièni razdelek"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Opozorilo! To lahko unièi podatke na disku!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Ste preprièani, da ¾elite zapisati tabelo razdelkov na disk? (da ali ne): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Tabela razdelkov ni bila zapisana"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "da"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Prosim, odgovorite ,da` ali ,ne`"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Tabelo razdelkov zapisujemo na disk..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Tabela razdelkov zapisana na disku"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Tabela razdelkov zapisana, a¾uriranje tabele neuspe¹no. Ponovno za¾enite "
 "sistem."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Noben primarni razdelek ni oznaèen kot zagonski. DOS MBR se ne more zagnati."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Veè kot en primarni razdelek je oznaèen kot zagonski. DOS MBR se ne more "
 "zagnati."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Vnesite ime datoteke ali pritisnite ENTER za prikaz na zaslonu: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ni moè odpreti datoteke ,%s`"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Brez   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "  Primaren"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logièen"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Neznano"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr ""
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Zagonski (%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "Opravljeno"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "parametri\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Zaèetni---      ----Konèni----  Zaèetni  ©tevilo\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " #   Ozn Glav Sekt Stz   ID  Glav Sekt Stz    sektor sektorjev\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Direktno"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Izpis tabele v surovi obliki"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorji"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Izpis tabele, urejene po sektorjih"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Enostaven izpis tabele razdelkov"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Brez izpisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Osnovna navodila za cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Cfdisk je tekstovni program za urejanje diskovnih razdelkov,"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "s katerim lahko ustvarjate, bri¹ete ali spreminjate razdelke"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "na va¹em disku."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "  Ukaz        Pomen"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr ""
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr ""
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             ,ne`"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr ""
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr ""
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Opravljeno"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr ""
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr ""
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Neznano (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr ""
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "%d glav, %d sektorjev/stezo, %d stez"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Ime"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Oznake"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Tip Razd."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Dat. sistem"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Oznaka]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr "Sektorji"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "steza"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Vel. (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Vel. (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Zagonski"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Oznaèi, ali je razdelek zagonski"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Izbri¹i"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Izbri¹i ta razdelek"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometr."
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Nastavi geometrijo diska (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Pomoè"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Izpi¹i stran z navodili"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Razpni"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Raz¹iri trenutni razdelek èez celotno prosto obmoèje (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Ustvari nov razdelek na prostem obmoèju diska"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Natisni"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Izpi¹i tabelo razdelkov na zaslon ali shrani v datoteko"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Izhod"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Izhod iz programa brez zapisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tip"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Enote"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Pi¹i"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2161,9 +2096,9 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "  Ukaz  dejanje"
 
@@ -2183,10 +2118,9 @@ msgstr ""
 msgid "   l   list known filesystem types"
 msgstr ""
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   izpi¹i ta menu"
 
@@ -2198,14 +2132,14 @@ msgstr ""
 msgid "   p   print BSD partition table"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   konèaj, ne da bi shranil spremembe"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr ""
 
@@ -2248,13 +2182,13 @@ msgstr ""
 msgid "BSD disklabel command (m for help): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2299,8 +2233,6 @@ msgstr ""
 msgid " badsect"
 msgstr ""
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2399,8 +2331,8 @@ msgstr ""
 msgid "tracks/cylinder"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr ""
 
@@ -2457,7 +2389,7 @@ msgstr ""
 msgid "Partition (a-%c): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr ""
@@ -2479,7 +2411,7 @@ msgid ""
 "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2491,7 +2423,7 @@ msgid ""
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2501,209 +2433,195 @@ msgid ""
 "  ...\n"
 msgstr ""
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Ni mogoèe odpreti %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Ni mogoèe prebrati %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Ni mogoèe pisati na %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Pomnilnika ni veè mogoèe rezervirati\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Usodna napaka\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   preklopi samo za branje"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr ""
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   zbri¹i razdelek"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   izpi¹i znane vrste razdelkov"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   dodaj nov razdelek"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   ustvari novo prazno tabelo razdelkov MS-DOS"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   izpi¹i tabelo razdelkov"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ustvari novo prazno Sunovo oznako diska"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   spremeni sistemski ID razdelka"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr ""
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   preveri tabelo razdelkov"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   zapi¹i tabelo razdelkov in konèaj"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   posebne mo¾nosti (samo za poznavalce)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   doloèi razdelek kot zagonski"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr ""
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr ""
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr ""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr ""
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr ""
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr ""
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr ""
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr ""
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr ""
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr ""
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " in "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2715,29 +2633,29 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2746,131 +2664,131 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Interna napaka\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr ""
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr ""
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr ""
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Izbrani razdelek %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Noben razdelek ¹e ni doloèen!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Vsi primarni razdelki so ¾e doloèeni!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "steza"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Enote prikaza/vnosa spremenjene na %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "OPOZORILO: Razdelek %d je raz¹irjeni razdelek\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Nastavljena je zdru¾ljivost z DOS.\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Zdru¾ljivost z DOS ni nastavljena.\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Razdelek %d ¹e ne obstaja!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2883,7 +2801,7 @@ msgstr ""
 "razdelkov tipa 0. Razdelek lahko zbri¹ete z\n"
 "ukazom ,d`.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2892,7 +2810,7 @@ msgstr ""
 "Razdelka ne morete pretvoriti v raz¹irjenega ali obratno.\n"
 "Najprej ga morate zbrisati.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2903,7 +2821,7 @@ msgstr ""
 "Tak je dogovor v SunOS/Solaris, Linux pa ga spo¹tuje.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -2914,52 +2832,52 @@ msgstr ""
 "razdelek 11 pa kot celotni del (6), kot prièakuje IRIX.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Tip razdelka %d spremenjen v %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Fizièni zaèetek razdelka %d ni enak logiènemu (ne-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "  fizièni=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logièni=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Fizièni konec razdelka %d ni enak logiènemu:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Razdelek %i se ne zaène na meji stez:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "mora biti (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Razdelek %i se ne konèa na meji stez.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "mora biti (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -2968,7 +2886,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld bajtov\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -2977,17 +2895,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d glav, %d sektorjev/stezo, %d stez"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, fuzzy, c-format
 msgid ", total %llu sectors"
 msgstr ", skupno %lu sektorjev"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2996,14 +2914,14 @@ msgstr ""
 "Enote = %s od %d x %d = %d bajtov\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3011,23 +2929,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Naprava"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3035,82 +2953,82 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr " #   Ozn Glav Sekt Stz   ID  Glav Sekt Stz    sektor sektorjev\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3119,22 +3037,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "logièni razdelki niso v diskovnem vrstnem redu"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Slab primarni razdelek"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3142,32 +3060,32 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr ""
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr ""
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3176,7 +3094,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3185,107 +3103,106 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ne morem odpreti %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ne morem odpreti %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3349,15 +3266,15 @@ msgstr ""
 msgid "SGI xvm"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr ""
 
@@ -3418,7 +3335,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr ""
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3462,7 +3378,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr ""
@@ -3537,7 +3453,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr ""
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3552,11 +3467,10 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "DA\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3621,44 +3535,43 @@ msgstr ""
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Prazno"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr ""
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3667,12 +3580,12 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3681,86 +3594,86 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3768,14 +3681,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3784,7 +3697,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3796,7 +3709,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -3805,16 +3718,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -3838,32 +3751,26 @@ msgstr ""
 msgid "Extended"
 msgstr "Raz¹irjen"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr ""
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr ""
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr ""
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr ""
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr ""
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr ""
@@ -3872,7 +3779,6 @@ msgstr ""
 msgid "W95 FAT32 (LBA)"
 msgstr ""
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr ""
@@ -3965,12 +3871,10 @@ msgstr ""
 msgid "OnTrack DM6 Aux1"
 msgstr ""
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr ""
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr ""
@@ -3991,8 +3895,6 @@ msgstr ""
 msgid "Priam Edisk"
 msgstr ""
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4002,7 +3904,6 @@ msgstr ""
 msgid "GNU HURD or SysV"
 msgstr ""
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr ""
@@ -4023,12 +3924,10 @@ msgstr ""
 msgid "Old Minix"
 msgstr ""
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr ""
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr ""
@@ -4058,12 +3957,10 @@ msgstr ""
 msgid "Amoeba BBT"
 msgstr ""
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr ""
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr ""
@@ -4072,7 +3969,6 @@ msgstr ""
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr ""
@@ -4137,30 +4033,22 @@ msgstr ""
 msgid "CP/M / CTOS / ..."
 msgstr ""
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr ""
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr ""
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr ""
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr ""
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr ""
@@ -4169,116 +4057,109 @@ msgstr ""
 msgid "EFI GPT"
 msgstr ""
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr ""
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr ""
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr ""
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr ""
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr ""
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "pomankanje pomnilnika?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "napaka pri branju %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4286,56 +4167,56 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4344,109 +4225,109 @@ msgstr ""
 "Ime id\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4454,480 +4335,475 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 #, fuzzy
 msgid "start"
 msgstr "stanje"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "po¹lji"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "ponovno preberi tabelo razdelkov"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr ""
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "razlièica"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr ", skupno %lu sektorjev"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Velikosti diska ni mogoèe ugotoviti"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -4935,42 +4811,42 @@ msgstr ""
 "Opravljeno\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -4978,73 +4854,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "V REDU\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5138,130 +5014,130 @@ msgstr ""
 msgid "internal error, contact the author."
 msgstr ""
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "zagnano iz MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ura Ruffian BCD\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "vrata ure naravnana na 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomski %s neuspe¹en v 1000 iteracijah!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Neuspelo odpiranje vrat /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Dovoljenja nismo dobili, ker nismo posku¹ali.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s ne more dobiti dostopa do V/I vrat: klic iopl(3) neuspe¹en.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Verjetno potrebujete pravice skrbnika sistema.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Privzemamo, da strojna ura teèe v %s èasu.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "univerzalnem (UTC)"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "krajevnem"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Opozorilo: neprepoznana tretja vrstica v datoteki adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Prièakovano: ,UTC`, ,LOCAL` ali pa niè).\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Zadnji popravek drsenja opravljen %ld sekund po letu 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Zadnja kalibracija opravljena %ld sekund po letu 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Strojna ura teèe v %s èasu\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "neznanem"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Èakamo na tiktak ure...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...dobili tiktak.\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Neveljavne vrednosti v strojni uri: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Èas strojne ure: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund po letu 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Èas, prebran iz strojne ure: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Strojno uro nastavljamo na %.2d:%.2d:%.2d = %ld sekund po letu 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Ure nismo premaknili - zgolj preizkus.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5270,7 +5146,7 @@ msgstr ""
 "Èas, ki je pretekel od referenènega, je  %.6f sekund.\n"
 "Poveèujemo zaostanek, da bi dosegli naslednjo celo sekundo.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5279,22 +5155,22 @@ msgstr ""
 "Registri strojne ure vsebujejo vrednosti ki so bodisi neveljavne\n"
 "(npr. 50. dan v mesecu), bodisi izven na¹ega obsega (npr. leto 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekund\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Izbira --date ni bila podana.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "Argument izbire --date je predolg.\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5303,22 +5179,22 @@ msgstr ""
 "Vrednost, podana pri izbiri --date ni veljaven datum.\n"
 "Med drugim vsebuje narekovaje.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Izvajamo ukaz date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Ne moremo pognati ukaza ,date` v lupini /bin/sh, klic popen() neuspe¹en"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "odziv ukaza date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5333,7 +5209,7 @@ msgstr ""
 "Odziv pa:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5344,69 +5220,69 @@ msgid ""
 " %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr ""
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr ""
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr ""
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr ""
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5414,60 +5290,60 @@ msgid ""
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr ""
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5476,34 +5352,39 @@ msgid ""
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s iz %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5535,72 +5416,72 @@ msgid ""
 "                either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5634,7 +5515,6 @@ msgstr ""
 msgid "ioctl KDSHWCLK failed"
 msgstr ""
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr ""
@@ -5726,9 +5606,6 @@ msgstr ""
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -5754,7 +5631,6 @@ msgstr ""
 msgid "calling open_tty\n"
 msgstr ""
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr ""
@@ -5763,7 +5639,6 @@ msgstr ""
 msgid "writing init string\n"
 msgstr ""
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr ""
@@ -5777,7 +5652,6 @@ msgstr ""
 msgid "read %c\n"
 msgstr ""
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr ""
@@ -5831,7 +5705,6 @@ msgstr ""
 msgid "/dev/%s: not a character device"
 msgstr ""
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr ""
@@ -5846,12 +5719,10 @@ msgstr ""
 msgid "%s: not open for read/write"
 msgstr ""
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr ""
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -5890,30 +5761,25 @@ msgid ""
 "line baud_rate,... [termtype]\n"
 msgstr ""
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr ""
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr ""
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr ""
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr ""
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr ""
@@ -5959,8 +5825,8 @@ msgstr ""
 msgid "Password error."
 msgstr ""
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Geslo: "
@@ -6132,34 +5998,6 @@ msgstr ""
 msgid "No known shells.\n"
 msgstr ""
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr ""
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr ""
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr ""
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr ""
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr ""
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr ""
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6169,77 +6007,71 @@ msgstr ""
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr ""
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
 "wtmp begins %s"
 msgstr ""
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr ""
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr ""
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "USODNA NAPAKA: terminalske linije ni moè znova odpreti: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: izbira -h je na voljo samo za sistemskega skrbnika.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "uporaba: login [-fp] [uporabnik]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: napaka v PAM, nadaljevanje ni mogoèe: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM ni moè inicializirati: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "prijava: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "NEUSPE©NA PRIJAVA %d IZ %s NA UPORABNIKA %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6248,17 +6080,17 @@ msgstr ""
 "Prijava ni uspela\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "PRE©TEVILNI (%d) POSKUSI PRIJAVE IZ %s NA UPORABNIKA %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6267,142 +6099,127 @@ msgstr ""
 "\n"
 "Prijava ni uspela\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr ""
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Neveljavno uporabni¹ko ime"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Prijava ni uspela\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Prijavljenih je ¾e preveè uporabnikov.\n"
-"Poskusite pozneje.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Hkrati teèe preveè va¹ih procesov.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "TELEFONSKA PRIJAVA Z LINIJE %s, UPORABNIK %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "SKRBNI©KA PRIJAVA Z RAÈUNALNIKA %s, UPORABNIK %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "SKRBNI©KA PRIJAVA NA LINIJI %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "PRIJAVA NA LINIJI %s UPORABNIKA %s Z RAÈUNALNIKA %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PRIJAVA NA LINIJI %s UPORABNIKA %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Èaka vas nova po¹ta.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Èaka vas po¹ta.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: vejitev ni mogoèa: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skripta ukazne lupine ni moè pognati: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ni ukazne lupine: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6411,65 +6228,65 @@ msgstr ""
 "\n"
 "%s prijava: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Prijavno ime je veliko predolgo.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "IME je predolgo"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Prijavna imena se ne morejo zaèeti z znakom ,-`.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Prijava je potekla po %d sekundah.\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Zadnja prijava: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "z raèunalnika %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "z linije %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "NEUSPE©NA PRIJAVA Z RAÈUNALNIKA %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "NEUSPE©NA PRIJAVA NA LINIJI %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d NEUSPE©NIH PRIJAV Z RAÈUNALNIKA %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d NEUSPE©NIH PRIJAV NA LINIJI %s, %s"
@@ -6489,166 +6306,30 @@ msgstr "je n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "uporaba: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr ""
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr ""
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr ""
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr ""
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr ""
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr ""
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Geslo mora biti dolgo vsaj 6 znakov, poskusite ¹e enkrat.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Geslo mora vsebovati tako èrke (velike ali male), kot ¹tevke ali druge\n"
-"ne-alfanumeriène znake. Izèrpnej¹a navodila so na voljo v passwd(1).\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Starega gesla ne morete znova uporabiti.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Prosim, da za geslo ne uporabljate uporabni¹kega imena.\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Prosim, da za geslo ne uporabljate va¹ega imena.\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Uporaba: passwd [uporabnik [geslo]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-"Samo sistemski skrbnik lahko uprablja obliko z enim ali dvema argumentoma.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Uporaba: passwd [-foqsvV] [uporabnik [geslo]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Ni moè pognati %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Prijavnega imena ni moè najti"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Samo sistemski skrbnik lahko spreminja gesla drugih uporabnikov.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Preveè argumentov.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Uporabni¹kega imena ni moè najti. Je ,%s` res uporabnik?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "S tem ukazom lahko spreminjate samo lokalna gesla. Uporabite yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID in uporabni¹ko ime se ne ujemata"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Spreminjamo geslo za %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Vnesite staro geslo: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Geslo ni veljavno."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Vnesite novo geslo: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Geslo ni bilo spremenjeno."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Ponovno vnesite novo geslo: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Gesli se ne ujemata. Geslo ni bilo spremenjeno."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "geslo spremenjeno, uporabnik %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "SKRBNI©KO GESLO SPREMENJENO"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "geslo spremenil skrbnik, uporabnik %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr ""
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Geslo NI BILO spremenjeno. Poskusite pozneje.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Geslo je bilo spremenjeno.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -6695,7 +6376,6 @@ msgstr "ponovno zagnan od uporabnika %s: %s"
 msgid "halted by %s: %s"
 msgstr "ustavljen od uporabnika %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -6730,7 +6410,6 @@ msgstr ""
 msgid "Error executing\t%s\n"
 msgstr "Napaka ob izvajanju     %s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -6820,7 +6499,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr ""
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr ""
@@ -6849,7 +6527,7 @@ msgstr ""
 msgid "fork failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr ""
 
@@ -6998,12 +6676,6 @@ msgstr ""
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7014,13 +6686,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr ""
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr ""
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr ""
 
@@ -7150,7 +6821,7 @@ msgstr ""
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7158,276 +6829,275 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr ""
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr ""
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Napaka pri branju %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -7502,10 +7172,6 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -7789,232 +7455,217 @@ msgstr ""
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: priklopna toèka %s ni imenik"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: dostop zavrnjen"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: ukaz mount lahko uporablja samo sistemski skrbnik"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je v rabi"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr ""
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "bloèna enota"
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ni moè priklopiti v bralnem naèinu"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s je za¹èitena pred pisanjem, priklapljamo v bralnem naèinu"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8066,34 +7717,34 @@ msgstr ""
 "Druge izbire: [-nfFrsvw] [-o izbire].\n"
 "Podrobnosti lahko poi¹èete v priroèniku z ukazom: man 8 mount\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: to lahko izvede samo sistemski skrbnik"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: priklapljamo %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8128,98 +7779,98 @@ msgstr ""
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr ""
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr ""
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr ""
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr ""
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr ""
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr ""
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr ""
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr ""
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr ""
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr ""
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr ""
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr ""
@@ -8228,7 +7879,7 @@ msgstr ""
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8237,7 +7888,7 @@ msgid ""
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8245,138 +7896,136 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "Ni moè pognati %s: %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: ni moè odpreti %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr ""
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr ""
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr ""
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr ""
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8384,48 +8033,47 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Ni mogoèe odpreti "
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, fuzzy, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8570,7 +8218,7 @@ msgstr "%s: napaka: neznana izdaja %d\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -8724,8 +8372,6 @@ msgstr ""
 msgid "------ Shared Memory Limits --------\n"
 msgstr "omejitve deljenega pomnilnika\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9479,17 +9125,17 @@ msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "uporaba: %s [-dflpcsu] [+vrstica | +/vzorec] datoteka1 datoteka2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: napaka: neznana izdaja %d\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9500,8 +9146,7 @@ msgstr ""
 "*** %s: imenik ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9512,45 +9157,45 @@ msgstr ""
 "******** %s: Ni besedilna datoteka ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Za izhod uporabite q ali Q]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Naprej--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Naslednja datoteka: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Pritisnite preslednico za nadaljevanje, Q za izhod.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...nazaj %d strani"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...nazaj eno stran"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...preskoèimo eno vrstico"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...preskoèimo %d vrstic"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -9560,7 +9205,7 @@ msgstr ""
 "***Nazaj***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9568,7 +9213,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9591,34 +9236,34 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pritisnite ,h` za navodila.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" vrstica %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ni datoteka] vrstica %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Prekoraèitev\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...preskakujemo\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9626,33 +9271,33 @@ msgstr ""
 "\n"
 "Vzorca ni moè najti\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Vzorca ni moè najti"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "vejitev ni mogoèa\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr ""
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr ""
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Vrstica je predolga"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -9705,90 +9350,87 @@ msgstr ""
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: izbira zahteva argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: nedovoljena izbira -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Naslednje datoteke ni"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Prej¹nje datoteke ni"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Napaka pri branju iz datoteke %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Neprièakovan znak za konec datoteke v datoteki %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Ni mogoèe ustvariti zaèasne datoteke\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "napaka RE: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Ni mogoèe odpreti "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "shranjeno"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr ""
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr ""
 
@@ -9842,6 +9484,114 @@ msgstr ""
 msgid "Out of memory when growing buffer.\n"
 msgstr ""
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Neveljavno ¹tevilo: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Skladenjska napaka: ,%s`\n"
+
+#~ msgid "version"
+#~ msgstr "razlièica"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Prijavljenih je ¾e preveè uporabnikov.\n"
+#~ "Poskusite pozneje.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Hkrati teèe preveè va¹ih procesov.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Geslo mora biti dolgo vsaj 6 znakov, poskusite ¹e enkrat.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Geslo mora vsebovati tako èrke (velike ali male), kot ¹tevke ali druge\n"
+#~ "ne-alfanumeriène znake. Izèrpnej¹a navodila so na voljo v passwd(1).\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Starega gesla ne morete znova uporabiti.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Prosim, da za geslo ne uporabljate uporabni¹kega imena.\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Prosim, da za geslo ne uporabljate va¹ega imena.\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Uporaba: passwd [uporabnik [geslo]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr ""
+#~ "Samo sistemski skrbnik lahko uprablja obliko z enim ali dvema "
+#~ "argumentoma.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Uporaba: passwd [-foqsvV] [uporabnik [geslo]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Ni moè pognati %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Prijavnega imena ni moè najti"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Samo sistemski skrbnik lahko spreminja gesla drugih uporabnikov.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Preveè argumentov.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Uporabni¹kega imena ni moè najti. Je ,%s` res uporabnik?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "S tem ukazom lahko spreminjate samo lokalna gesla. Uporabite yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID in uporabni¹ko ime se ne ujemata"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Spreminjamo geslo za %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Vnesite staro geslo: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Geslo ni veljavno."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Vnesite novo geslo: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Geslo ni bilo spremenjeno."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Ponovno vnesite novo geslo: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Gesli se ne ujemata. Geslo ni bilo spremenjeno."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "geslo spremenjeno, uporabnik %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "SKRBNI©KO GESLO SPREMENJENO"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "geslo spremenil skrbnik, uporabnik %s"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Geslo NI BILO spremenjeno. Poskusite pozneje.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Geslo je bilo spremenjeno.\n"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Tabelo razdelkov zapisujemo na disk..."
diff --git a/po/stamp-cat-id b/po/stamp-po
index 9788f7023..9788f7023 100644
--- a/po/stamp-cat-id
+++ b/po/stamp-po
diff --git a/po/sv.gmo b/po/sv.gmo
new file mode 100644
index 000000000..4ce037044
--- /dev/null
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 2280502f4..db0336d5e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2004-12-26 20:42+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -117,7 +117,7 @@ msgstr "%s: ioctl-fel på %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   Startsektor  Storlek Enhet\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "användning:\n"
@@ -161,13 +161,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "användning: %s [ -n ] enhet\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s från %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -192,7 +191,7 @@ msgstr "Dubbel"
 msgid "Single"
 msgstr "Enkel"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -207,97 +206,97 @@ msgstr ""
 " -v         var mer utförlig\n"
 " fil        fil att testa\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: fel %d vid uppackning! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: storleksfel i symboliska länken \"%s\"\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  packar upp block vid %ld till %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: felaktiga rättigheter på \"%s\" (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  hål vid %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Icke-blockbyte (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Icke-storleksbyte (%ld gentemot %ld)\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: ogiltigt cramfs--felaktig sökvägslängd\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: kompilerad utan stöd för -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: varning--kan inte avgöra filsystemsstorlek \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s är ingen blockenhet eller fil\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: ogiltigt cramfs--fillängden är för kort\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: ogiltigt cramfs--felaktig magisk siffra\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: varning--fillängden är för lång, utfylld avbild?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ogiltigt cramfs--crc-fel\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: varning--gammal cramfs-avbild, ingen CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: ogiltigt cramfs--felaktigt superblock\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr "%s: ogiltigt cramfs--katalogdataslut (%ld) != fildatabörjan (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ogiltigt cramfs--ogiltigt fildataavstånd\n"
@@ -774,7 +773,7 @@ msgstr "för många inoder - max är 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "inte tillräckligt med utrymme, behöver minst %lu block"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhet: %s\n"
@@ -843,20 +842,20 @@ msgstr "fel vid skrivning av \"..\"-post"
 msgid "error closing %s"
 msgstr "fel vid stängning av %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Användning: mkfs [-V] [-t filsystemstyp] [filsystemsflaggor] enhet "
 "[storlek]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Slut på minne!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
@@ -920,7 +919,6 @@ msgstr ""
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -977,10 +975,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "ROM-avbildsskrivning misslyckades (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1057,7 +1051,6 @@ msgstr "kan inte skriva inoder"
 msgid "write failed in write_block"
 msgstr "skrivning misslyckades i \"write_block\""
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1093,7 +1086,7 @@ msgstr "sökning misslyckades under test av block"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Konstiga värden i \"do_check\": troligtvis programfel\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "sökning misslyckades i \"check_blocks\""
 
@@ -1135,107 +1128,107 @@ msgstr "kan inte ta status på %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "kommer inte att försöka skapa filsystem på \"%s\""
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Användardefinierade sidstorleken %d är felaktig\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Använder användardefinierade sidstorleken %d istället för systemvärdena %d/%"
 "d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Antar sidstorleken %d (inte %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "etikett"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Användning: %s [-c] [-v0|-v1] [-pSIDSTORLEK] /dev/namn [block]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "för många felaktiga sidor"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "en felaktig sida\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu felaktiga sidor\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fel: Ingenstans att skapa växlingsutrymme?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fel: storleken %lu är större än enhetsstorleken %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fel: version %d är okänd\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fel: växlingsutrymmet måste vara minst %ld kB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: varning: avkortar växlingsutrymmet till %ld kB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: fel: Ingenstans att skapa växlingsutrymme?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Kommer inte att försöka skapa växlingsenhet på \"%s\""
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "ödesdigert: första sidan är oläsbar"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1250,122 +1243,84 @@ msgstr ""
 "växlingsutrymme på den enheten kan du använda flaggan -f för att tvinga\n"
 "fram det.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kan inte ställa in växlingsutrymme: oläsbart"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Ställer in växlingsutrymme version %d, storlek = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "kan inte spola tillbaka växlingsenheten"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "kan inte skriva signatursida"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync misslyckades"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Ogiltigt tal: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaxfel: \"%s\"\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Ingen sådan parameter är inställd: \"%s\"\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] enhet namn\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] enhet storlek sektorer huvuden spår utsträckning mellanrum "
-"hastighet spec1 formatavstånd\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] enhet\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] enhet\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Oanvändbar"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Ledigt utrymme"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disken har ändrats.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Starta om systemet för att försäkra dig om att partitionstabellen har\n"
 "uppdaterats korrekt.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1378,329 +1333,310 @@ msgstr ""
 "partitioner bör du titta i manualen för cfdisk\n"
 "för ytterligare information.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ÖDESDIGERT FEL"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Tryck valfri tangent för att avsluta cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Kan inte söka på diskenhet"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Kan inte inte läsa diskenhet"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Kan inte skriva diskenhet"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "För många partitioner"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Partitionen börjar före sektor 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Partitionen slutar före sektor 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Partitonen börjar efter slutet på disken"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Partitionen slutar efter slutet på disken"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitionen slutar i den slutliga partiella cylindern"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logiska partitioner är inte i diskordning"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logiska partitioner överlappar varandra"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "förstorade logiska partitioner överlappar varandra"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Internt fel vid skapande av logisk enhet utan utökad partition !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kan inte skapa logisk enhet här -- det skulle skapa två utökade partitioner"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menyposten är för lång. Menyn kan se konstig ut."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Meny utan riktning. Använder standardvärdet vågrät."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Ogiltig tangent"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Tryck en tangent för att fortsätta"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primär"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Skapa en ny primär partition"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Skapa en ny logisk partition"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Skapa inte någon partition"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Internt fel !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Storlek (i MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Början"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Lägg till partition i början av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Slutet"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Lägg till partition i slutet av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Ingen plats att skapa den utökade partitionen"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Ingen partitionstabell.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Ingen partitionstabell. Startar med tom tabell."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Felaktig signatur på partitionstabell"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Okänd typ av partitionstabell"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Vill du börja med en tom tabell [j/N]?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav fler cylindrar än som ryms på disken"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Kan inte öppna diskenhet"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Öppnade disken skrivskyddat - du har ingen rättighet att skriva"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Kan inte hämta diskstorlek"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Felaktig primär partition"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Felaktig logisk partition"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varning!! Detta kan förstöra data på din disk!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Är du säker på att du vill skriva partitionstabellen till disk? (ja eller "
 "nej): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Skrev inte partitionstabellen till disk"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Ange \"ja\" eller \"nej\""
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabell till disk..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabell till disk"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Skrev partitionstabellen, men omläsning av tabellen misslyckades. Starta om "
 "för att uppdatera tabellen."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Inga primära partitioner är markerade som startbara. DOS huvudstartpost\n"
 "(MBR) kan inte starta detta."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Mer än en primär partition är markerad som startbar. DOS huvudstartpost\n"
 "(MBR) kan inte starta detta."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Ange filnamnet eller tryck RETUR för att visa på skärmen: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan inte öppna filen \"%s\""
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Diskenhet: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Ingen  "
 
 # Primär/Logisk antar jag
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primär "
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logisk "
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Okänd"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Ingen"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabell för %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Första      Sista\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1708,7 +1644,7 @@ msgstr ""
 " # Typ        Sektor      Sektor   Avstånd   Längd    Filsystemstyp (ID)   "
 "Flagga\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1728,472 +1664,469 @@ msgstr ""
 # source you realize that "Start" belongs to "Sector" in another message
 # (the one from the line below in the source).
 #
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Start-----      -----Slut-----   Start-    Antal\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flggr  Hvd Sekt Cyl   ID  Hvd  Sekt Cyl     sektor    sektorer\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Rått"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Visa tabellen i rått dataformat"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Visa tabellen sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabell"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Visa bara partitionstabellen"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Visa inte tabellen"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Hjälpskärm för cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Det här är cfdisk, ett curses-baserat diskpartitioneringsprogram som"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "låter dig skapa, ta bort och ändra partitioner på din"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "hårddisk."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright © 1994-1999 Kevin E. Martin och aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Kommando     Betydelse"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "--------     ---------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Slå på/av startbarhetsflaggan på aktuell partition"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Ändra parametrarna för cylindrar, huvuden, sektorer-per-spår"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VARNING: Denna flagga bör endast användas av personer som"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             vet vad de gör."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Visa denna hjälpskärm"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximera diskanvändandet på aktuell partition"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Obs: Detta kan komma att göra partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Skapa en ny partition från ledigt utrymme"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Visa partitionstabellen på skärmen eller skriv den till en fil"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Det finns flera olika format på partitionen"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             som du kan välja mellan:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Rå data (exakt det som skulle skrivas till disken)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabell sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabell i rått format"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Byt filsystemstypen"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Byt enheter på visningen av partitionsstorlek"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Byter mellan MB, sektorer och cylindrar"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Skriv partitionstabellen till disk (måste vara ett stort W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Eftersom detta kan förstöra data på disken måste du"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             antingen bekräfta eller avvisa detta genom att ange \"ja\""
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             eller \"nej\""
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Uppil        Flytta markören till föregående partition"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nerpil       Flytta markören till nästa partition"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL+L       Rita om skärmen"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Visa denna skärm"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Obs: Alla kommandon kan anges antingen med små eller stora bokstäver"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "(utom för skrivningar med W)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylindrar"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Ändra cylindergeometri"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Huvuden"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Ändra huvudgeometri"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Ändra sektorgeometri"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Klar"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Färdig med geometriändring"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Ange antalet cylindrar: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Ogiltigt antal cylindrar"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Ange antalet huvuden: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Ogiltigt antal huvuden"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Ange antalet sektorer per spår: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Ogiltigt antal sektorer"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Ange typen av filsystem: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Kan inte ändra filsystemstypen till ett tomt värde"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Kan inte ändra filsystemstypen till utökad"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Okänd(%02X)"
 
 # Vad är detta?
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Okänd (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Diskenhet: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Storlek: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Storlek: %lld byte, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Huvuden: %d   Sektorer per spår: %d   Cylindrar: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Namn"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flaggor"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part.-typ"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "FS-typ"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etikett]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Sektorer"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cylindrar"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Storlek (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Storlek (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Startbar"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Slå på/av startbarhetsflaggan på aktuell partition"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Ta bort"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Ändra diskgeometri (endast experter)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Hjälp"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Visa hjälpskärm"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximera"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximera diskanvändningen för aktuell partition (endast experter)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Skapa ny partition från ledigt utrymme"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Visa"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Visa partitionstabellen på skärmen eller skriv den till en fil"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Avsluta"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Ändra filsystemstypen (DOS, Linux, OS/2 och så vidare)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Enheter"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Byt enheter på visningen av partitionsstorleken (MB, sektorer, cylindrar)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen till disk (detta kan förstöra data)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Kan inte göra denna partition startbar"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Kan inte ta bort en tom partition"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Kan inte maximera denna partition"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Denna partition är oanvändbar"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Denna partition används redan"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan inte ändra typen på en tom partition"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Inge fler partitioner"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Ogiltigt kommando"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994-2002 Kevin E. Martin och aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2265,9 +2198,9 @@ msgstr ""
 "\n"
 "BSD-etikett för enhet: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Kommandoåtgärd"
 
@@ -2287,10 +2220,9 @@ msgstr "   i   installera förstartare (bootstrap)"
 msgid "   l   list known filesystem types"
 msgstr "   l   visa kända filsystemstyper"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   visa denna meny"
 
@@ -2302,14 +2234,14 @@ msgstr "   n   lägg till en ny BSD-partition"
 msgid "   p   print BSD partition table"
 msgstr "   p   skriv ut BSD-partitionstabell"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   avsluta utan att spara ändringar"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   återgå till huvudmenyn"
 
@@ -2352,13 +2284,13 @@ msgstr "Det finns ingen *BSD-partition på %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD-disketikettskommando (m för hjälp): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Första %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sista %s eller +storlek eller +storlekM eller +storlekK"
@@ -2403,8 +2335,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " felsekt"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2505,8 +2435,8 @@ msgstr "sektorer/spår"
 msgid "tracks/cylinder"
 msgstr "spår/cylinder"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cylindrar"
 
@@ -2566,7 +2496,7 @@ msgstr "Förstartare (bootstrap) installerad på %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Det maximala antalet partitioner har skapats\n"
@@ -2590,7 +2520,7 @@ msgstr ""
 "\n"
 "Synkroniserar hårddiskar.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2610,7 +2540,7 @@ msgstr ""
 "-u: visa början och slut i sektorer (istället för cylindrar)\n"
 "-b 2048: (för vissa MO-enheter) använd 2048-bytessektorer\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2627,198 +2557,184 @@ msgstr ""
 "enheter)\n"
 "     ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan inte läsa %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan inte söka på %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan inte skriva %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-ioctl:en misslyckades på %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan inte allokera mer minne\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Ödesdigert fel\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   slå på/av en flagga för skrivskydd"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   redigera bsd-disketikett"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   slå på/av monterbarhetsflaggan"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   ta bort en partition"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   lista kända partitionstyper"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   lägg till en ny partition"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   skapa en ny tom DOS-partitionstabell"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   visa partitionstabellen"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   skapa en ny tom Sun-disketikett"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   ändra en partitions system-id"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   ändra visnings-/postenheter"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   verifiera partitionstabellen"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   skriv tabellen till disk och avsluta"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   extra funktionalitet (endast experter)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   välj startbar partition"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   redigera startfilspost"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   välj sgi-växlingspartition"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   slå på/av en startbarhetsflagga"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   slå på/av dos-kompatibilitetsflaggan"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ändra antalet alternativa cylindrar"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   ändra antalet cylindrar"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   skriv ut den råa datan i partitionstabellen"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ändra antalet extra sektorer per cylinder"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   ändra antalet huvuden"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   ändra mellanrumsfaktor"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ändra rotationshastighet (varv per minut)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   ändra antalet sektorer/spår"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ändra antalet fysiska cylindrar"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   flytta början på data i en partition"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   lista utökade partitioner"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   skapa en IRIX-partitionstabell (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   fixa partitionsordningen"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Du måste ställa in"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "huvuden"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2827,11 +2743,11 @@ msgstr ""
 "%s%s.\n"
 "Du kan göra detta från menyn extra funktionalitet.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " och "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2851,12 +2767,12 @@ msgstr ""
 "2) start- och partitioneringsprogramvara från andra operativsystem\n"
 "   (exemeplvis DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Felaktigt avstånd i primär utökad partition\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2865,17 +2781,17 @@ msgstr ""
 "Varning: utelämnar partitioner efter nr %d.\n"
 "De kommer att tas bort om du sparar denna partitionstabell.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Varning: extra länkpekare i partitionstabell %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Varning: ignorerar extra data i partitionstabell %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2888,17 +2804,17 @@ msgstr ""
 "inte det tidigare innehållet att kunna återställas.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Observera: sektorstorleken är %d (inte %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Du kommer inte att kunna skriva partitionstabellen.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2907,7 +2823,7 @@ msgstr ""
 "Denna disk har både magiska DOS- och BSD-siffror.\n"
 "Ge kommandot \"b\" för att gå till BSD-läge.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2916,17 +2832,17 @@ msgstr ""
 "Enheten innehåller varken en giltig DOS-partitionstabell eller en Sun-, SGI- "
 "eller OSF-disketikett\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Internt fel\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerar extra utökad partition %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2935,7 +2851,7 @@ msgstr ""
 "Varning: ogiltiga flaggan 0x%04x i partitionstabell %d kommer ett korrigeras "
 "vid skrivning med w\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2944,83 +2860,83 @@ msgstr ""
 "\n"
 "mottog EOF tre gånger - avslutar...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Hexadecimal kod (tryck L för att se koder): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standardvärde %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Använder standardvärdet %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Värdet är utanför intervallet.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varning: partition %d har tom typ\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valde partition %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partition är definierad än!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alla primära partitioner har redan definierats!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Ändrar visnings-/inmatningsenheter till %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VARNING: Partition %d är en utökad partition\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-kompatibilitetsflagga är satt\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatibilitetsflagga är inte satt\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d finns inte än!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3034,7 +2950,7 @@ msgstr ""
 "oklokt. Du kan ta bort en partition\n"
 "genom att använda kommandot \"d\".\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3043,7 +2959,7 @@ msgstr ""
 "Du kan inte ändra en partition till en utökad partition eller tvärtom\n"
 "Ta bort den först.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3055,7 +2971,7 @@ msgstr ""
 "gillar det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3067,52 +2983,52 @@ msgstr ""
 "förväntar sig det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Ändrade systemtypen för partition %d till %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d har olika fysiska/logiska början (icke-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har olika fysiska/logiska slut:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i börjar inte på cylindergräns:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "borde vara (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i slutar inte på cylindergräns.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "borde vara (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3121,7 +3037,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3130,12 +3046,12 @@ msgstr ""
 "\n"
 "Disk %s: %ld,%ld GB, %lld byte\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d huvuden, %d sektorer/spår, %d cylindrar"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", totalt %llu sektorer"
@@ -3143,7 +3059,7 @@ msgstr ", totalt %llu sektorer"
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3152,7 +3068,7 @@ msgstr ""
 "Enheter = %s av %d · %d = %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3161,7 +3077,7 @@ msgstr ""
 "Ingenting att göra. Ordningen är redan korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3172,16 +3088,16 @@ msgstr ""
 "Du valde nog fel enhet.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Start     Början        Slut     Block    Id  System\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Enhet"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3190,7 +3106,7 @@ msgstr ""
 "\n"
 "Posterna i partitionstabellen är inte i diskordning\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3201,85 +3117,85 @@ msgstr ""
 "Disk %s: %d huvuden, %d sektorer, %d cylindrar\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sek  Cyl  Hd Sek  Cyl     Början     Strl ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varning: partition %d innehåller sektor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: huvud %d är större än maximala %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: sektor %d är större än maximala %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitioner %d: cylinder %d är större än maximala %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d: tidigare sektorer %d stämmer inte överens med totala %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varning: felaktig databörjan på partition %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varning: partition %d överlappar med partition %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varning: partition %d är tom\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logisk partition %d är inte helt inuti partition %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Totala antalet allokerade sektorer %d större än maximala %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld oallokerade sektorer\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Partition %d är redan definierad. Ta bort den innan du lägger till den "
 "igen.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Inga lediga sektorer är tillgängliga\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3293,23 +3209,23 @@ msgstr ""
 "\tVARNING: Detta kommer att förstöra det nuvarande innehållet\n"
 "\tpå disken.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Du måste ta bort en partition och lägga till en utökad partition först\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Alla logiska partitioner används\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Lägger till en primär partition\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3320,20 +3236,20 @@ msgstr ""
 "   %s\n"
 "   p   primär partition (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logisk (5 eller högre)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   utökad"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ogiltigt partitionsnummer för typen \"%c\"\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3342,12 +3258,12 @@ msgstr ""
 "Partitionstabellen har ändrats!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Anropar ioctl() för att läsa om partitionstabellen.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3360,7 +3276,7 @@ msgstr ""
 "Kärnan använder fortfarande den gamla tabellen.\n"
 "Den nya tabellen kommer att användas vid nästa omstart.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3372,7 +3288,7 @@ msgstr ""
 "VARNING: Om du har skapat eller ändrat någon DOS 6.x-partition\n"
 "bör du läsa fdisk-manualsidan för ytterligare information.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -3381,67 +3297,67 @@ msgstr ""
 "\n"
 "Fel vid stängning av fil\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkroniserar hårddiskar.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har inget dataområde\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Ny början utav data"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Expertkommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Antal cylindrar"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Antal huvuden"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varning: ställer in sektoravstånd för DOS-kompatibilitet\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s innehåller inte en giltig partitionstabell\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: okänt kommando\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Denna kärna hittar själv sektorstorleken - flaggan -b ignoreras\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3450,17 +3366,16 @@ msgstr ""
 "Varning: flaggan -b (ställ in sektorstorlek) måste användas med en angiven "
 "enhet\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Upptäckte en OSF/1-disketikett på %s, går in i disketikettsläge.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Kommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3469,16 +3384,16 @@ msgstr ""
 "\n"
 "Aktuell startfil är: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Ange namnet på den nya startfilen: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Startfilen oförändrad\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3546,15 +3461,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux växling"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux egen"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3639,7 +3554,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u storlek%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3697,7 +3611,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Det finns fler än en diskpost.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Inga partitioner är angivna\n"
@@ -3782,7 +3696,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tDu har valt ett ovanligt namn på startfilen.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3803,11 +3716,10 @@ msgstr ""
 "får lov att bryta mot detta. Skriv in JA om du är säker på att\n"
 "du vill ge denna partition en annan tagg.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "JA\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3883,44 +3795,43 @@ msgstr "Försöker att behålla parametrarna för partition %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tBÖRJAN=%d\tLÄNGD=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Tom"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS rot"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS växling"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Hela disken"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetekterad"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3934,12 +3845,12 @@ msgstr ""
 "och partitioner, eller tvinga en ny etikett\n"
 "(kommandot s i huvudmenyn)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Automatiska konfigurationen hittade en %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3952,7 +3863,7 @@ msgstr ""
 "kommer naturligtvis det tidigare innehållet inte att vara\n"
 "återställningsbart.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3962,72 +3873,72 @@ msgstr ""
 "   ?   konfigurera automatiskt\n"
 "   0   anpassad (med hårdvarudetekterade standardalternativ)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Välj typ (? för automatisk konfiguration, 0 för anpassad): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Automatisk konfiguration misslyckades.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektorer/spår"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Alternativa cylindrar"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fysiska cylindrar"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighet (varv per minut)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Mellanrumsfaktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Du kan ändra alla diskaparametrar från x-menyn"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5-tumsdiskett"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux anpassad"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d slutar inte på jämn cylindergräns\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partition %d överlappar med andra på sektorerna %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Oanvänt mellanrum - sektorerna 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Oanvänt mellanrum - sektorerna %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4036,7 +3947,7 @@ msgstr ""
 "Andra partitioner täcker redan hela hårddisken.\n"
 "Ta bort/krymp dem innan du försöker igen.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4046,7 +3957,7 @@ msgstr ""
 "Du har inte täckt hela hårddisken med den tredje partitionen, men ditt\n"
 "värde %d %s täcker en annan partition. Din inmatning har ändrats till %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4055,7 +3966,7 @@ msgstr ""
 "Om du vill behålla kompatibilitet med SunOS/Solaris bör du lämna denna\n"
 "partition som Hela disken (5), med början på 0, och med %u sektorer\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4073,7 +3984,7 @@ msgstr ""
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4096,7 +4007,7 @@ msgstr ""
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4109,16 +4020,16 @@ msgstr ""
 "Enheter = %s av %d · 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flagga  Början      Slut   Block    Id  System\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Antal alternerande cylindrar"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Antal fysiska cylindrar"
 
@@ -4142,32 +4053,26 @@ msgstr "FAT16 < 32 MB"
 msgid "Extended"
 msgstr "Utökad"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX startbar"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4176,7 +4081,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4269,12 +4173,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "Ontrack DM6 Aux3"
@@ -4295,8 +4197,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4306,7 +4206,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD / SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4327,12 +4226,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Gammal Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / gammal Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux växling / Solaris"
@@ -4361,12 +4258,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad-viloläge"
@@ -4375,7 +4270,6 @@ msgstr "IBM Thinkpad-viloläge"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4440,30 +4334,22 @@ msgstr "Icke-filsystemsdata"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell-verktyg"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS-åtkomst"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4472,116 +4358,109 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC start"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekundär"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "sökfel på %s - kan inte spola till %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "sökfel: ville ha 0x%08x%08x, fick 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "slut på minne - ger upp\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "läsfel på %s - kan inte läsa sektor %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FEL: sektor %lu har ingen msdos-signatur\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "skrivfel på %s - kan inte skriva sektor %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kan inte öppna partitionssektorsparfil (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "skrivfel på %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kan inte ta status på partitionsåterställningsfil (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitionsåterställningsfilen har fel storlek - återställer inte\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "slut på minne?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan inte öppna partitionsåterställningsfilen (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "fel vid läsning av %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan inte öppna enhet %s för skrivning\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fel vid skrivning av sektor %lu på %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: kan inte få tag i geometri\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: kan inte få tag i storlek\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4592,22 +4471,22 @@ msgstr ""
 "hela disken. Att använda fdisk på det är troligtvis meningslöst.\n"
 "[Använd flaggan --force om du verkligen vill detta]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varning: HDIO_GETGEO säger att det finns %lu huvuden\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varning: HDIO_GETGEO säger att det finns %lu sektorer\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varning: BLKGETSIZE/HDIO_GETGEO säger att det finns %lu cylindrar\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4617,7 +4496,7 @@ msgstr ""
 "Detta kommer att ge problem med all programvara som använder C/H/S-"
 "adressering.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4626,7 +4505,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylindrar, %lu huvuden, %lu sektorer/spår\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4634,7 +4513,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på huvud: %lu (måste vara mellan 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4643,7 +4522,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på sektor: %lu (måste vara mellan 1-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4652,7 +4531,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på cylinder: %lu (måste vara mellan 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4661,12 +4540,12 @@ msgstr ""
 "Id  Namn\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Läser om partitionstabellen...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4674,31 +4553,31 @@ msgstr ""
 "Kommandot för att läsa om partitionstabellen misslyckades\n"
 "Starta om ditt system nu, innan du använder mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fel vid stängning av %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: det finns ingen sådan partition\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "okänt format - använder sektorer\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitionstabell för %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "oimplementerat format - använder %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4707,12 +4586,12 @@ msgstr ""
 "Enheter = cylindrar med %lu byte, block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Enhet Start Början   Slut     Cyl.     Block   Id  System\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4721,12 +4600,12 @@ msgstr ""
 "Enheter = sektorer med 512 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Enhet Start   Början      Slut   Sektorer  Id  System\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4735,12 +4614,12 @@ msgstr ""
 "Enheter = block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Enhet Start  Början      Slut      Block   Id  System\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4749,31 +4628,31 @@ msgstr ""
 "Enheter = mebibyte med 1048576 byte, block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Enhet Start Början Slut    MiB      Block   Id  System\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tbörjan: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) hittades\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tslut: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) hittades\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitionen slutar på cylinder %ld, utanför slutet på hårddisken\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Inga partitioner hittades\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4784,51 +4663,51 @@ msgstr ""
 "  för C/H/S=*/%ld/%ld (istället för %ld/%ld/%ld).\n"
 "I denna visning kommer jag att antaga den geometrin.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "ingen partitionstabell finns tillgänglig.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "konstigt, endast %d partitioner är angivna.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Varning: partition %s har storlek 0 men är inte markerad tom\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varning: partition %s har storlek 0 och är startbar\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varning: partition %s har storlek 0 och en början som inte är 0\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varning: partition %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "är inte innesluten i partition %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varning: partitionerna %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "och %s överlappar varandra\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4837,17 +4716,17 @@ msgstr ""
 "Varning: partition %s innehåller en del av partitionstabellen (sektor %lu),\n"
 "och kommer att förstöra den då den fylls\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varning: partition %s börjar på sektor 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varning: partition %s fortsätter utanför hårddisken\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4855,17 +4734,17 @@ msgstr ""
 "Endast en av de primära partitionerna kan vara utökad\n"
 " (även om detta inte är ett problem under Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varning: partition %s börjar inte på en jämn cylindergräns\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varning: partition %s slutar inte på en jämn cylindergräns\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4874,7 +4753,7 @@ msgstr ""
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4882,7 +4761,7 @@ msgstr ""
 "Varning: normalt kan man endast starta från primära partitioner\n"
 "LILO ignorerar startbarhetsflaggan.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4891,11 +4770,11 @@ msgstr ""
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "början"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4903,23 +4782,23 @@ msgstr ""
 "partition %s: början: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) "
 "hittades\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "slut"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: slut: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) "
 "hittades\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s slutar på cylinder %ld, utanför slutet på hårddisken\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4928,7 +4807,7 @@ msgstr ""
 "Varning: ändrade början på extd-partitionen från %ld till %ld\n"
 "(Endast för listningsändamål. Ändra inte dess innehåll).\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4936,133 +4815,132 @@ msgstr ""
 "Varning: utökad partition börjar inte på jämn cylindergräns.\n"
 "DOS och Linux kommer att tolka innehållet annorlunda.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "för många partitioner - ignorerar de efter nummer (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "träd med partitioner?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "upptäckte Disk Manager - kan inte hantera det\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-signatur hittades - ger upp\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "konstigt, en utökad partition med storlek 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "konstigt, en BSD-partition med storlek 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: okänd typ av partitionstabell\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Flaggan -n angavs: Inget ändrades\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Misslyckades med att spara de gamla sektorerna - avbryter\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Misslyckades med att skriva partitionen på %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "lång eller ofullständig indatarad - avslutar\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "indatafel: \"=\" förväntas efter %s-fält\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "indatafel: oväntat tecken %c efter %s-fält\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "okänd indata: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "talet är för stort\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "eftersläpande skräp efter tal\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "ingen plats för partitionshandtag\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan inte bygga omgivande utökad partition\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "för många indatafield\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Inte plats för mer\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Ogiltig typ\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Varning: angiven storlek (%lu) överskrider största tillåtna storleken (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Varning: tom partition\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varning: felaktig början på partition (första %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "okänd startbarhetsflagga - välj - eller *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s-specifikation ofullständig?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Utökad partition finns inte där den förväntades\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "felaktig indata\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "för många partitioner\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5072,46 +4950,42 @@ msgstr ""
 "<början> <storlek> <typ [E,S,L,X,hex]> <startbar [-,*]> <c,h,s> <c,h,s>\n"
 "Vanlligtvis behöver du bara ange <början> och <storlek> (och kanske <typ>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "version"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhet: någonting liknande /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "användbara flaggor:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: visa storlek på en partition"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:     visa eller ändra partitionsid"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:   visa partitioner på varje enhet"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [eller --dump]:   samma, men i format lämpligt för senare inmatning"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [eller --increment]: numrera cylindrar osv från 1 istället för från 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5119,62 +4993,62 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  acceptera/rapportera i enheter om sektorer/block/"
 "cylindrar/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:visa de kända partitionstyperna"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [eller --DOS]:    för DOS-kompatibilitet: slösa lite utrymme"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [eller --re-read]: gör så att kärnan läser om partitionstabellen"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N<nummer>:          ändra endast partitionen med numret <nummer>"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 skriv inte till hårddisken"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fil :             spara sektorerna som kommer att skrivas över till "
 "fil"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :             återställ dessa sektorer igen"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]: visa versionsinformation"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:   visa detta meddelande"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "farliga flaggor:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [eller --show-geometry]: visa kärnans bild av geometrin"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -g [eller --show-geometry]: visa kärnans bild av geometrin"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5182,117 +5056,117 @@ msgstr ""
 "    -x [eller --show-extended]: visa även utökade partitioner i utdata\n"
 "                                eller förvänta handtag för dem som indata"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [eller --Linux]:   klaga inte på saker som är irrelevanta för Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:   undertryck varningsmeddelanden"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan åsidosätta den detekterade geometrin genom att använda:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C<tal> [eller --cylinders <tal>]:ställ in antalet cylindrar att använda"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H<tal> [eller --heads <tal>]:ställ in antalet huvuden att använda"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S<tal> [eller --sectors <tal>]:ställ in antalet sektorer att använda"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan stänga av all konsekvenskontroll med:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [eller --force]:   gör vad jag säger även om det är dumt"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Användning:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s enhet\t\t visa aktiva partitioner på enhet\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s enhet n1 n2 ... aktivera partitioner n1 ..., deaktivera resten\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An enhet\t aktivera partition n, deaktivera de andra\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "inget kommando?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totalt: %llu block\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "användning: sfdisk --print-id enhet partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "användning: sfdisk --change-id enhet partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "användning: sfdisk --id enhet partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "kan endast ange en enhet (utom med -l eller -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan inte öppna %s för läsning och skrivning\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan inte öppna %s för läsning\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindrar, %ld huvuden, %ld sektorer/spår\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan inte hämta storleken på %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "felaktig aktiv byte: 0x%x istället för 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5300,7 +5174,7 @@ msgstr ""
 "Färdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5310,35 +5184,35 @@ msgstr ""
 "DOS huvudstartpost (MBR) kan endast starta en hårddisk med 1 aktiv\n"
 "partition.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s har id %x och är inte dold\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Felaktigt Id %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Denna hårddisk används för tillfället.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ödesdigert fel: kan inte hitta %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varning: %s är ingen blockenhet\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Kontrollerar att ingen använder hårddisken just nu...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5351,30 +5225,30 @@ msgstr ""
 "på denna disk är utväxlade. Använd flaggan --no-reread för att\n"
 "undertrycka denna kontroll.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Använd flaggan --force för att undertrycka alla kontroller.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Tidigare situation:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partition %d finns inte, kan inte ändra den\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5382,21 +5256,21 @@ msgstr ""
 "Jag gillar inte dessa partitioner - ingenting ändrades.\n"
 "(Om du verkligen vill göra detta bör du använda flaggan --force).\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Jag gillar inte detta - du bör nog svara nej\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Är du nöjd med detta? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vill du skriva detta till disk? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5405,16 +5279,16 @@ msgstr ""
 "\n"
 "sfdisk: för tidigt slut på indata\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Avslutar - ingenting ändrades\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Svara med ett av y, n eller q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5423,7 +5297,7 @@ msgstr ""
 "Lyckades skapa den nya partitionstabellen\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5523,130 +5397,130 @@ msgstr "getopt (utökad) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "internt fel, kontakta författaren."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "startade från MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD-klocka\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "klockporten justerades till 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "häftig LEKSAK!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomisk %s misslyckades för 1000 iterationer!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Kan inte öppna /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Jag misslyckades med att få tillåtelse eftersom jag inte försökte.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s kan inte få I/O-porttillgång: iopl(3)-anropet misslyckades.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Du behöver troligtvis root-privilegier.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Antar att hårdvaruklockan håller %s-tid.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "lokal"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Varning: okänd tredje rad i adjtime-fil\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Förväntade: \"UTC\" eller \"LOCAL\" eller ingenting.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Senaste dragningsjustering gjordes %ld sekunder efter 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Senaste kalibrering gjordes %ld sekunder efter 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Hårdvaruklockan håller %s-tid\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "okänd"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Väntar på klocktick...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...fick klocktick\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Ogiltiga värden i hårdvaruklockan: %4d-%.2d-%.2d %.2d.%.2d.%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Hv-klocktid: %4d-%.2d-%.2d %.2d.%.2d.%.2d = %ld sekunder sedan 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Tid som lästs från hårdvaruklockan: %4d-%.2d-%.2d %02d.%02d.%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Ställer hårdvaruklockan till %.2d.%.2d.%.2d = %ld sekunder sedan 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Klockan är inte ändrad - testar bara.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5655,7 +5529,7 @@ msgstr ""
 "Tid som har gått sedan referenstiden är %.6f sekunder.\n"
 "Fördröjer ytterligare för att nå nästa hela sekund.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5665,22 +5539,22 @@ msgstr ""
 "50:e dagen i månaden) eller utanför det intervall som vi kan hantera (t.ex. "
 "år 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekunder\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Ingen --date-flagga angavs.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date-argumentet är för långt\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5689,22 +5563,22 @@ msgstr ""
 "Värdet i --date-flaggan är ogiltigt.\n"
 "I synnerhet som det innehåller citationstecken.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Anropar date-kommandot: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Kan inte köra \"date\"-programmet i skalet /bin/sh. popen() misslyckades"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "svar från date-kommandot = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5719,7 +5593,7 @@ msgstr ""
 "Svaret var:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5736,12 +5610,12 @@ msgstr ""
 "Svaret var:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "datumsträngen %s är lika med %ld sekunder sedan 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5750,36 +5624,36 @@ msgstr ""
 "Hårdvaruklockan innehåller inte en giltig tid, så vi kan inte ställa "
 "systemtiden med den.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Anropar settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Ställer inte systemklockan eftersom vi kör i testläge.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Måste vara superanvändaren för att kunna ställa systemklockan.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() misslyckades"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5788,7 +5662,7 @@ msgstr ""
 "Justerar inte dragningsfaktorn eftersom hårdvaruklockan tidigare innehöll "
 "skräp.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5798,7 +5672,7 @@ msgstr ""
 "är noll, så historiken är trasig och en omstart av kalibreringen\n"
 "är nödvändig.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5807,7 +5681,7 @@ msgstr ""
 "Justerar inte dragningsfaktorn eftersom det har gått mindre än en dag sedan "
 "den senaste kalibreringen.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5818,24 +5692,24 @@ msgstr ""
 "dragningsfaktor på %f sekunder/dag.\n"
 "Justerar dragningsfaktorn med %f sekunder/dag\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Tid sedan senaste justeringen är %d sekunder\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Behöver infoga %d sekunder och referera tillbaka i tiden %.6f sekunder "
 "sedan\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Uppdaterar inte adjtime-filen eftersom vi är i testläge.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5844,40 +5718,40 @@ msgstr ""
 "Skulle skrivit följande till %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Dragningsjusteringsparametrarna uppdaterades inte.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "Hårdvaruklockan innehåller inte giltig tid, så vi kan inte justera den.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "Den justering som behövs är mindre än en sekund, så ställer inte klockan.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Använder %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Inget användbart klockgränssnitt hittades.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Kunde inte ställa systemklockan.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5889,17 +5763,17 @@ msgstr ""
 "Denna kopia av hwclock byggdes för en annan maskin än Alpha\n"
 "(och körs därför troligen inte på en Alpha just nu). Ingen åtgärd utfördes.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Kunde inte få tag i epokvärdet från kärnan.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kärnan antar att epokvärdet är %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5908,17 +5782,22 @@ msgstr ""
 "För att ställa epokvärdet måste du använda flaggan \"epoch\" för att ange "
 "vilket värde det ska ställas till.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Ställer inte epoken till %d - testar bara.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kan inte ställa in epokvärdet i kärnan.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s från %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5976,7 +5855,7 @@ msgstr ""
 "  --noadjfile   försök inte komma åt /etc/adjtime. Kräver att antingen\n"
 "                --utc eller --localtime används\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5986,12 +5865,12 @@ msgstr ""
 "                tala om för hwclock vilken typ av alpha du har (se hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s tar inga argument som inte är flaggor. Du angav %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6000,7 +5879,7 @@ msgstr ""
 "Du har angivit flera funktioner\n"
 "Du kan bara utföra en funktion åt gången.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6009,7 +5888,7 @@ msgstr ""
 "%s: Flaggorna --utc och --localtime är ömsesidigt uteslutande. Du angav "
 "båda.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6018,27 +5897,27 @@ msgstr ""
 "%s: Flaggorna --adjust och --noadjfile är ömsesidigt uteslutande. Du angav "
 "båda.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Med --noadjfile måste du ange antingen --utc eller --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ingen användbar tid att ställa. Kan inte ställa klockan.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Tyvärr, endast superanvändaren kan ändra hårdvaruklockan.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Tyvärr, endast superanvändaren kan ändra systemklockan.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6046,12 +5925,12 @@ msgid ""
 msgstr ""
 "Tyvärr, endast superanvändaren kan ändra hårdvaruklockans epok i kärnan.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Kan inte komma åt hårdvaruklockan via någon känd metod.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6087,7 +5966,6 @@ msgstr "ioctl() misslyckades med att läsa tid från %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "KDSHWCLK-ioctl misslyckades"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Kan inte öppna /dev/tty1 eller /dev/vc/1"
@@ -6181,9 +6059,6 @@ msgstr "ioctl(RTC_EPOCH_READ) på %s misslyckades"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "vi har läst epoken %ld från %s med RTC_EPOCH_READ-ioctl.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6209,7 +6084,6 @@ msgstr "ioctl(RTC_EPOCH_SET) på %s misslyckades"
 msgid "calling open_tty\n"
 msgstr "anropar open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "anropar termio_init\n"
@@ -6218,7 +6092,6 @@ msgstr "anropar termio_init\n"
 msgid "writing init string\n"
 msgstr "skriver initieringssträng\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "före autobaud\n"
@@ -6232,7 +6105,6 @@ msgstr "väntar på cr-lf\n"
 msgid "read %c\n"
 msgstr "läste %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "läser användarnamn\n"
@@ -6286,7 +6158,6 @@ msgstr "/dev: chdir() misslyckades: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ingen teckenenhet"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6301,12 +6172,10 @@ msgstr "/dev/%s: kan inte öppna som standard in: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: inte öppen för läsning/skrivning"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duplicerar\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6350,30 +6219,25 @@ msgstr ""
 "eller\t[-hiLmw] [-l inloggningsprogram] [-t time-out] [-I initieringssträng] "
 "[-H inloggningsvärd] linje baudhastighet,... [terminaltyp]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: lite minne, inloggning kan misslyckas\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "kan inte minnesallokera för ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "kan inte minnesallokera för grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Inloggning på %s från %s nekas som standard.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Inloggning på %s från %s nekas.\n"
@@ -6418,8 +6282,8 @@ msgstr "Ändrar fingerinformation för %s.\n"
 msgid "Password error."
 msgstr "Lösenordsfel."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Lösenord: "
@@ -6597,34 +6461,6 @@ msgstr "Använd %s -l för att se listan.\n"
 msgid "No known shells.\n"
 msgstr "Inga kända skal.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "kunde inte öppna /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "kunde inte läsa slumpdata från /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "kan inte öppna %s för läsning"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "kan inte ta status på %s"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s har inte rätt filrättigheter"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "kan inte läsa data från %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6635,11 +6471,11 @@ msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 "användning: last [-#] [-f fil] [-t tty] [-h värdnamn] [användare ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  fortfarande inloggad"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6648,15 +6484,15 @@ msgstr ""
 "\n"
 "wtmp börjar %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: minnesallokeringsfel.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6665,51 +6501,45 @@ msgstr ""
 "\n"
 "avbruten %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ÖDESDIGERT: kan inte återöppna tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "ÖDESDIGERT: felaktig tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h endast för superanvändaren.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "användning: login [-fp] [användarnamn]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-fel, avbryter: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kunde inte initiera PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "användarnamn: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "MISSLYCKAD INLOGGNING %d FRÅN %s FÖR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6718,17 +6548,17 @@ msgstr ""
 "Felaktig inloggning\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "FÖR MÅNGA INLOGGNINGSFÖRSÖK (%d) FRÅN %s FÖR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "MISSLYCKAD INLOGGNINGSSESSION FRÅN %s FÖR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6737,7 +6567,7 @@ msgstr ""
 "\n"
 "Felaktig inloggning\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6746,136 +6576,121 @@ msgstr ""
 "\n"
 "Problem med upprättandet av sessionen, avbryter.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Användarnamnet är NULL i %s:%d. Avbryter."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ogiltigt användarnamn \"%s\" i %s:%d. Avbryter."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Slut på minne\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Ogiltigt användarnamn"
 
 # %s blir här "root" i de flesta fall vad jag förstår
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s-inloggning nekas på denna terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "INLOGGNING AV %s NEKAS FRÅN %s PÅ TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "INLOGGNING AV %s NEKAS PÅ TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Felaktig inloggning\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"För många användare är redan inloggade.\n"
-"Försök igen senare.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Du har för många processer körande.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "UPPRINGNING PÅ %s AV %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT-INLOGGNING PÅ %s FRÅN %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT-INLOGGNING PÅ %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "INLOGGNING PÅ %s AV %s FRÅN %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "INLOGGNING PÅ %s AV %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: grenande misslyckades: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY misslyckades: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() misslyckades"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Katalogen %s finns inte!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Loggar in med hemkatalog = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: inget minne för skalskript.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kunde inte köra skalskript: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: inget skal: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6884,65 +6699,65 @@ msgstr ""
 "\n"
 "%s användarnamn: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "användarnamnet är alldeles för långt.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NAMNET är för långt"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "användarnamn får inte börja med \"-\".\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "för många tomma nyrader.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "FÖR MÅNGA nyrader"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggning gjorde time-out efter %d sekunder\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Senaste inloggning: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "från %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "MISSLYCKAD INLOGGNING FRÅN %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "MISSLYCKAD INLOGGNING PÅ %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR FRÅN %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR PÅ %s, %s"
@@ -6962,167 +6777,30 @@ msgstr "är av (n)\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "användning: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Vem är du?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Ingen sådan grupp."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Åtkomst nekas."
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Inget skal"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Lösenordet måste ha minst 6 tecken, försök igen.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Lösenordet måste innehålla tecken som tillhör två av följande klasser:\n"
-"små och stora bokstäver, siffror och icke-alfanumeriska tecken. Se\n"
-"passwd(1) för mer information.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Du kan inte återanvända det gamla lösenordet.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Använd inte någonting som liknar ditt användarnamn som lösenord!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Använd inte någonting som liknar ditt verkliga namn som lösenord!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Användning: passwd [användarnamn [lösenord]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Endast root kan använda formen med en eller två argument.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Användning: passwd [-foqsvV] [användare [lösenord]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Kan inte köra %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kan inte hitta användarnamn"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Endast root kan byta lösenordet åt andra.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "För många argument.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"Kan inte hitta användarnamnet någonstans. Är \"%s\" verkligen en användare?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Tyvärr, jag kan bara byta lokala lösenord. Använd yppasswd istället."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID och användarnamn stämmer inte överens, bedragare!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Byter lösenordet för %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Ange gamla lösenordet: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Ogiltigt lösenord, bedragare."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Ange nya lösenordet: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Lösenordet ändrades inte."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Ange nya lösenordet på nytt: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Du stavade fel till det. Lösenordet ändrades inte."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "lösenordet ändrades, användare %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT-LÖSENORDET ÄNDRADES"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "lösenordet ändrades av root, användare %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "anropar setpwnam för att ställa in lösenord.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Lösenordet ändrades *INTE*. Försök igen senare.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Lösenordet ändrades.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7169,7 +6847,6 @@ msgstr "omstartad av %s: %s"
 msgid "halted by %s: %s"
 msgstr "stannad av %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7206,7 +6883,6 @@ msgstr "Kör programmet \"%s\"...\n"
 msgid "Error executing\t%s\n"
 msgstr "Fel vid körning av\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7298,7 +6974,6 @@ msgstr "fel vid inställning av close-on-exec på /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "fel vid körning av finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "fel vid grening av finalprog\n"
@@ -7327,7 +7002,7 @@ msgstr "öppnande av katalog misslyckades\n"
 msgid "fork failed\n"
 msgstr "grening misslyckades\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "körning misslyckades\n"
 
@@ -7487,12 +7162,6 @@ msgstr "ogiltigt månadsvärde: använd 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "ogiltigt årsvärde: använd 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7503,13 +7172,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "användning: cal [-13smjyV] [[månad] år]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "användning: %s [+format] [dag månad år]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tibs Dag"
 
@@ -7641,7 +7309,7 @@ msgstr "%s: namnbyte av %s till %s misslyckades: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "anropa: %s från till filer...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7652,22 +7320,22 @@ msgstr ""
 "Använd \"%s [flaggor] %s\" om du verkligen vill använda den.\n"
 "Skriptet startades inte.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "användning: script [-a] [-f] [-q] [-t] [fil]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skriptet startades, filen är %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Skriptet startades %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7676,254 +7344,253 @@ msgstr ""
 "\n"
 "Skriptet färdigt %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skriptet färdigt, filen är %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty misslyckades\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Slut på pty:er\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argumentfel, användning\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminalnamn ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tabb1 tabb2 tabb3 ... ] ]      (tabbnummer = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tabb1 tabb2 tabb3 ... ] ]   (tabbnummer = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilnamn ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekvensnummer ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "kan inte ställa in/återställa strömsparläget\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl-fel: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fel vid läsning av %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Fel vid skrivning av skärmdump\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "kunde inte läsa %s, och kan inte dumpa ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM är inte angiven.\n"
@@ -7998,10 +7665,6 @@ msgstr "varning: kan inte öppna %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kunde inte öppna %s - använder %s istället\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8299,82 +7962,73 @@ msgstr "mount: kan inte öppna %s för inställning av hastighet"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan inte ställa in hastighet: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kan inte grena: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: denna version kompilerades utan stöd för typen \"nfs\""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 "mount: misslyckades med montering av nfs version 4, försöker med 3...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Jag kunde inte avgöra filsystemstypen, och ingen angavs"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du måste ange filsystemstypen"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: montering misslyckades"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkten %s är inte en katalog"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: åtkomst nekas"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: måste vara superanvändaren för att använda mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s är upptagen"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc är redan monterad"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s är redan monterad eller %s är upptagen"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkten %s finns inte"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: monteringspunkten %s är en symbolisk länk till ingenstans"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenheten %s finns inte"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8383,12 +8037,12 @@ msgstr ""
 "mount: specialenheten %s finns inte\n"
 "       (ett sökvägsprefix är inte en katalog)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s är inte redan monterad, eller felaktig flagga"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8397,7 +8051,7 @@ msgstr ""
 "mount: fel filsystemstyp, felaktig flagga, felaktigt superblock\n"
 "       på %s, codepage saknas, eller annat fel"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8406,7 +8060,7 @@ msgstr ""
 "       använder ide-scsi så att sr0 eller sda eller något\n"
 "       liknande behövs?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8414,7 +8068,7 @@ msgstr ""
 "       (försöker du kanske montera en utökad partition,\n"
 "       istället för någon logisk partition inuti?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8422,50 +8076,49 @@ msgstr ""
 "       I en del fall kan användbar information hittas i syslog\n"
 "       - prova dmesg | tail eller något liknande\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "monteringstabellen full"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan inte läsa superblock"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: okänd enhet"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: okänd filsystemstyp \"%s\""
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du menade troligtvis %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: du menade kanske \"iso9660\"?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: du menade kanske \"vfat\"?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr "mount: %s har fel enhetsnummer eller så stöds filsystemstypen %s inte"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s är inte en blockenhet, och statustagning misslyckas?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8474,73 +8127,68 @@ msgstr ""
 "mount: kärnan känner inte igen %s som en blockenhet\n"
 "       (kanske \"insmod drivrutin\"?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s är ingen blockenhet (försök kanske med \"-o loop\"?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s är ingen blockenhet"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s är ingen giltig blockenhet"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blockenhet "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan inte montera %s%s som endast läsbar"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s är skrivskyddad med en explicit \"-w\"-flagga angavs"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s är skrivskyddad, monterar som endast läsbar"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta nfs på grund av kolonet\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta smbfs på grund //-prefixet\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: förlägger \"%s\" till bakgrunden\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ger upp \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s är redan monterad på %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8588,34 +8236,34 @@ msgstr ""
 "Andra flaggor: [-nfFrsvw] [-o flaggor] [-p lösenordfd].\n"
 "Säg  man 8 mount  för många fler detaljer.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: endast root kan göra det"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s hittades - skapar den...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: ingen sådan partition hittades"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: monterar %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "ingenting monterades"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kan inte hitta %s i %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan inte hitta %s i %s eller %s"
@@ -8650,98 +8298,98 @@ msgstr "       Jag kommer att försöka med typen %s\n"
 msgid "Trying %s\n"
 msgstr "Försöker med %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: överdrivet långt värd:katalog-argument\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: varning: flera samtidiga värdnamn stöds inte\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: katalog att montera är inte på formatet värd:katalog\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: kan inte få tag i adress för %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: fick felaktig hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: överdrivet långt flaggargument\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Varning: Okänd \"proto=\"-flagga.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Varning: Flaggan namlen stöds inte.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "okänd nfs-monteringsparameter: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Varning: flaggan nolock stöds inte.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "okänd nfs-monteringsflagga: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: fick felaktig hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS över TCP stöds inte.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs-uttag"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs-bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs-servern rapporterade att tjänsten var otillgänglig"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "använde portmapper för att hitta NFS-porten\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "använder port %d för nfs-demonen\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs-anslut"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "okänt nfs-statusreturvärde: %d"
@@ -8750,7 +8398,7 @@ msgstr "okänt nfs-statusreturvärde: %d"
 msgid "bug in xstrndup call"
 msgstr "programfel i xstrndup-anrop"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8763,7 +8411,7 @@ msgstr ""
 "            %s [-v] [-p prioritet] special ...\n"
 "            %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8774,138 +8422,136 @@ msgstr ""
 "            %s -a [-v]\n"
 "            %s [-v] special ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s på %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: kan inte hitta \"_stext\" i %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: kan inte ta status på %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: varning: %s har osäkra rättigheter %04o, föreslår %04o\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Hoppar över filen %s - den verkar ha hål.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Inte superanvändare.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: kan inte öppna %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: kompilerad utan stöd för -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan inte grena: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "värd: %s, katalog: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: kan inte få tag i adress för %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: fick felaktig hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ogiltig blockenhet"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: inte monterad"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan inte skriva superblock"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: enheten är upptagen"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s hittades inte"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: måste vara superanvändare för att avmontera"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blockenheter är inte tillåtna på filsystem"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, försöker med umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kunde inte avmontera %s - försöker med %s istället\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s är upptagen - monterade om som endast läsbar\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunde inte montera om %s som endast läsbar\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s avmonterad\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan inte hitta lista med filsystem att avmontera"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8916,47 +8562,46 @@ msgstr ""
 "            umount -a [-f] [-r] [-n] [-v] [-t vfs-typer] [-O alternativ]\n"
 "            umount [-f] [-r] [-n] [-v] special | nod...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "Kan inte avmontera \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Försöker avmontera %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunde inte hitta %s i mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s är inte monterad (enligt mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det verkar som om %s är monterad flera gånger"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s är inte i fstab (och du är inte root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montering av %s stämmer inte överens med fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: endast %s kan avmontera %s från %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: endast root kan göra det"
 
@@ -9112,7 +8757,7 @@ msgstr "%s: okänd flagga \"-%c\"\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9281,8 +8926,6 @@ msgstr "kärnan är inte konfigurerad för delat minne\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Gränser för delat minne --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -10069,17 +9712,17 @@ msgid ""
 msgstr ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmtfil] [-n längd] [-s överhopp] [fil ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "användning: %s [-dflpcsu] [+radnummer | +/mönster] namn1 namn2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: okänd flagga \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10090,8 +9733,7 @@ msgstr ""
 "*** %s: katalog ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10102,45 +9744,45 @@ msgstr ""
 "******** %s: Inte en textfil ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Använd q eller Q för att avsluta]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Mer--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Nästa fil: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Tryck blanksteg för att fortsätta, \"q\" för att avsluta.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...tillbaka %d sidor"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...tillbaka 1 sida"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...hoppar över en rad"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...hoppar över %d rader"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10150,7 +9792,7 @@ msgstr ""
 "***Tillbaka***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10163,7 +9805,7 @@ msgstr ""
 "\n"
 "Stjärna (*) indikerar att argumentet blir nytt standardalternativ.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10208,34 +9850,34 @@ msgstr ""
 ":f                      Visa aktuellt filnamn och radnummer\n"
 ".                       Upprepa föregående kommando\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Tryck \"h\" för instruktioner.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" rad %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Inte en fil] rad %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Spill\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...hoppar över\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Reguljärt uttrycksmischmasch"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10243,15 +9885,15 @@ msgstr ""
 "\n"
 "Mönstret hittades inte\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Mönstret hittades inte"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "kan inte grena\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10259,19 +9901,19 @@ msgstr ""
 "\n"
 "...Hoppar över "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Hoppar över till filen "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Hoppar tillbaka till filen "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Raden är för lång"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Inget tidigare kommando att ersätta"
 
@@ -10324,7 +9966,7 @@ msgstr "hexdump: felaktigt format {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: felaktigt konverteringstecken %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10332,84 +9974,81 @@ msgstr ""
 "%s: Användning: %s [-number] [-p sträng] [-cefnrs] [+rad] [+/mönster/] "
 "[filer]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: flaggan kräver ett argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: otillåten flagga -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...hoppar framåt\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...hoppar bakåt\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Ingen nästa fil"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Inga tidigare fil"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Läsfel från %s-fil\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Oväntat filslut i %s-fil\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Okänt fel i %s-fil\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kan inte skapa temporär fil\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE-fel: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(Filslut)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Ingen ihågkommen söksträng"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Kan inte öppna "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "sparad"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !kommando inte tillåtet i rflag-läge.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() misslyckades, försök igen senare\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Nästa fil: "
 
@@ -10463,6 +10102,157 @@ msgstr "Indataraden är för lång.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Slut på minne vid växande av buffert.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Ogiltigt tal: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaxfel: \"%s\"\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Ingen sådan parameter är inställd: \"%s\"\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] enhet namn\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] enhet storlek sektorer huvuden spår utsträckning mellanrum "
+#~ "hastighet spec1 formatavstånd\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] enhet\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] enhet\n"
+
+#~ msgid "version"
+#~ msgstr "version"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "kunde inte öppna /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "kunde inte läsa slumpdata från /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "kan inte öppna %s för läsning"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "kan inte ta status på %s"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s har inte rätt filrättigheter"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "kan inte läsa data från %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "För många användare är redan inloggade.\n"
+#~ "Försök igen senare.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Du har för många processer körande.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Lösenordet måste ha minst 6 tecken, försök igen.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Lösenordet måste innehålla tecken som tillhör två av följande klasser:\n"
+#~ "små och stora bokstäver, siffror och icke-alfanumeriska tecken. Se\n"
+#~ "passwd(1) för mer information.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Du kan inte återanvända det gamla lösenordet.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Använd inte någonting som liknar ditt användarnamn som lösenord!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Använd inte någonting som liknar ditt verkliga namn som lösenord!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Användning: passwd [användarnamn [lösenord]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Endast root kan använda formen med en eller två argument.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Användning: passwd [-foqsvV] [användare [lösenord]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Kan inte köra %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kan inte hitta användarnamn"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Endast root kan byta lösenordet åt andra.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "För många argument.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Kan inte hitta användarnamnet någonstans. Är \"%s\" verkligen en "
+#~ "användare?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Tyvärr, jag kan bara byta lokala lösenord. Använd yppasswd istället."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID och användarnamn stämmer inte överens, bedragare!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Byter lösenordet för %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Ange gamla lösenordet: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Ogiltigt lösenord, bedragare."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Ange nya lösenordet: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Lösenordet ändrades inte."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Ange nya lösenordet på nytt: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Du stavade fel till det. Lösenordet ändrades inte."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "lösenordet ändrades, användare %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT-LÖSENORDET ÄNDRADES"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "lösenordet ändrades av root, användare %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "anropar setpwnam för att ställa in lösenord.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Lösenordet ändrades *INTE*. Försök igen senare.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Lösenordet ändrades.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: denna version kompilerades utan stöd för typen \"nfs\""
+
 #~ msgid "Error closing file\n"
 #~ msgstr "Fel vid stängning av fil\n"
 
diff --git a/po/tr.gmo b/po/tr.gmo
new file mode 100644
index 000000000..a2911efbb
--- /dev/null
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index c7c3995a0..0b149e6c5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,14 +5,14 @@
 # this file and modified versions, provided that this
 # header is not removed and modified versions are marked
 # as such. No warranty.
-# Nilgün Belma Bugüner <nilgun@superonline.com>, 2001, ..., 2004.
+# Nilgün Belma Bugüner <nilgun@superonline.com>, 2001, ..., 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2004-12-29 03:18+0300\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-30 20:12+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -118,7 +118,7 @@ msgstr "%s: %s üzerinde G/Ç hatası\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA  Sboyu  Bboyu BaşlSkt      Boyut   Aygıt\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "kullanımı:\n"
@@ -162,13 +162,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "kullanımı: %s [ -n ] AYGIT\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s (%s den)\n"
 
 #: disk-utils/fdformat.c:130
@@ -193,7 +192,7 @@ msgstr "Çift"
 msgid "Single"
 msgstr "Tek"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -208,99 +207,99 @@ msgstr ""
 " -v         ayrıntılı çıktı verir\n"
 " dosya      denenen dosya\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: sıkıştırma açılırken hata %d! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: sembolik bağ `%s' üzerinde boyut hatası\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  %ld den %ld ye kadar blok sıkıştırılmamış (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: sahte kip `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  %ld de delik (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: bloksuz (%ld) bayt\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: boyutsuz (%ld vs %ld) bayt\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: geçersiz cramfs -- dosya yolu uzunluğu hatalı\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: -x desteği olmaksızın derlenmiş\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: uyarı -- dosya sistemi boyu saptanamıyor \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s bir blok aygıtı ya da dosyası değil\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: geçersiz cramfs -- dosya uzunluğu çok küçük\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: geçersiz cramfs -- hatalı dosya kimliği\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: uyarı -- dosya uzunluğu çok büyük, adımlı eşlem?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: geçersiz cramfs--crc hatası\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: uyarı -- eski cramfs eşlemi, CRC'siz\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: geçersiz cramfs -- hatalı süperblok\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: geçersiz cramfs -- dizin verisi sonu (%ld) != dosya verisi başlangıcı (%"
 "ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: geçersiz cramfs -- geçersiz dosya verisi başlangıcı\n"
@@ -776,7 +775,7 @@ msgstr "düğüm sayısı çok fazla - en çok 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "yer yetersiz, en az %lu blok gerekiyor"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Aygıt: %s\n"
@@ -845,19 +844,19 @@ msgstr " .. girdisi yazılırken hata"
 msgid "error closing %s"
 msgstr "%s kapatılırken hata"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Kullanımı: mkfs [-V] [-t dsySistTürü] [dsySist-seçenekleri] aygıt [uzunluk]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Bellek yetersiz!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs sürüm %s (%s)\n"
@@ -920,7 +919,6 @@ msgstr ""
 "MAXENTRIES aşıldı.  mkcramfs.c içinde bu değeri yükseltin ve yeniden "
 "derleyin.   Çıkılıyor.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -976,10 +974,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "ROM bellekeÅŸlemi yazmada hata (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1059,7 +1053,6 @@ msgstr "düğümler yazılamıyor"
 msgid "write failed in write_block"
 msgstr "write_block içine yazma başarısız"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1095,7 +1088,7 @@ msgstr "bloklar denetlenirken erişim başarısız"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check yapılırken tuhaf değerler: yazılım hatası olabilir\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "check_blocks işleminde erişim başarısız"
 
@@ -1137,108 +1130,109 @@ msgstr "%s durum bilgileri alınamıyor"
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' üzerinde dosya sistemi oluşturmaya çalışılmayacak"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "kullanıcı tarafından belirtilen sayfa uzunluğu %d hatalı\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Kullanıcı tarafından belirtilen sayfa uzunluğu %d kullanılıyor,\n"
 "(sistem deÄŸeri %d/%d yerine)\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Sayfa uzunluğu olarak %d kullanılıyor (%d değil)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
-msgstr ""
+msgstr "Takas başlığı uzunluğu hatalı, bir etiket yazılmamış.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "Etiket kısaltıldı.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "yafta"
+msgstr "bir etiket yok, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "UUID yok\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr ""
-"Kullanımı: %s [-c] [-v0|-v1] [-pSayfaUzunluğu] /dev/isim [blokSayısı]\n"
+"Kullanımı: %s [-c] [-v0|-v1] [-pSayfaUzunluğu] [-L etiket]\n"
+"                /dev/isim [blokSayısı]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "çok fazla bozuk sayfa var"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Bellek yetersiz"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "1 bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: hata: Takas alanını koyacak yer yok mu?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: hata: %lu aygıtın boyutundan büyük (%lu)\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: hata: sürüm %d bilinmiyor\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: hata: takas alanı için en az %ldkB gerekiyor\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: uyarı: takas alanı %ldkB ile sınırlanıyor\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: hata: Takas alanını koyacak yer yok mu?\n"
+msgstr "%s: hata: sadece v1 takas alanlı etiket\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "'%s' üzerinde takas aygıtı oluşturulmayacak"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "ölümcül: ilk sayfa okunabilir değil"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1251,122 +1245,84 @@ msgstr ""
 "takas alanı oluşturulmadı. Burada mutlaka bir v0 takas alanı oluşturmak\n"
 "istiyorsanız -f seçeneği ile bunu yapabilirsiniz.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Takas alanı oluşturulamıyor: okunabilir değil"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Takas alanı sürüm %d, uzunluk = %llu kB olarak ayarlanıyor\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "takas alanında başa gidilemiyor"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "imza sayfası yazılamıyor"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync hata verdi"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Numara geçersiz: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Sözdizimi hatası: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Böyle bir parametre yok: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] aygıt isim\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] aygıt uzunluk sektor kafa iz gerilme boşluk oran özellik1 "
-"fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] aygıt\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] aygıt\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Kullanışsız"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "BoÅŸ Alan"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disk deÄŸiÅŸtirildi.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Bölümleme tablosunun doğru olarak güncellendiğinden emin olabilmek için\n"
 "sistemi yeniden başlatın.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1379,325 +1335,306 @@ msgstr ""
 "değişiklik yaptıysanız, lütfen cfdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ÖLÜMCÜL HATA"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "cfdisk'ten çıkmak için herhangi bir tuşa basınız"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Disk sürücü üzerinde arama yapılamıyor"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Disk sürücüsü okunamıyor"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Disk sürücüsüne yazılamıyor"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Disk bölümü sayısı çok fazla"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Disk bölümü sıfırıncı sektörden önce başlıyor"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Disk bölümü sıfırıncı sektörden önce bitiyor"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Disk bölümü disk sonundan sonra başlıyor"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Disk bölümü disk sonundan sonra bitiyor"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Disk bölümü son kısmî silindir içinde bitiyor"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "mantıksal bölümler sıralamaya uygun değil"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "mantıksal bölümler içiçe geçmiş"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "büyütülen mantıksal bölümler içiçe geçiyor"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Ek disk bölümü içermeyen mantıksal bölüm oluşturulurken iç hata !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr "Burada mantıksal bölüm oluşturulamıyor -- iki ek bölüm oluşacaktı"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menü öğesi çok uzun. Menü tuhaf görünebilir."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menü yönsüz. Yatay olarak öntanımlanıyor."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Kuraldışı tuş"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Devam etmek için bir tuşa basınız"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Birincil"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Yeni birincil disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Mantıksal"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Yeni mantıksal disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Bir disk bölümü oluşturulmaz"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! İç hata !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Alan (MB):"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Başlangıç"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Disk bölümünü boş alanın başlangıcına ekler"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Son"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Disk bölümnü boş alanın sonuna ekler"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Ek disk bölümünü oluşturacak yer yok"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Disk bölümleme tablosu yok.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Disk bölümleme tablosu yok. Boş tablo ile başlanacak."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Disk bölümleme tablosundaki imza kötü"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Disk bölümleme tablosu türü bilinmiyor"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Temiz bir tablo ile baÅŸlamak ister misiniz [e/H] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Diskte bulunan silindir sayısından büyük bir sayı belirttiniz"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Disk açılamıyor"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Açılan disk salt-okunur - yazma izniniz yok"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Diskin toplam alanı hesaplanamıyor"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Birincil disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Mantıksal disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Uyarı!! Bu işlem disk üzerindeki veriyi yokedebilir!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Disk bölümleme tablosu yazılacak, emin misiniz? (evet ya da hayır): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "hayır"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazılmadı"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "evet"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Lütfen ya `evet´ ya da `hayır´ yazınız"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Disk bölümleme tablosu diske yazılıyor..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazıldı"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Bölümleme tablosu yazıldı ama tablo yeniden okunamadı. Sistemi yeniden "
 "başlatın."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Önyükleme için imlenmiş hiç birincil disk bölümü yok. DOS MBR bunu "
 "baÅŸlatamayabilir."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Önyükleme için imlenmiş çok sayıda birincil disk bölümü var. DOS MBR bunu "
 "baÅŸlatamayabilir."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dosya ismini girin ya da ENTER tuşuna basın: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "'%s' dosyası açılamıyor"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Sabit Disk: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektör 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektör %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Yok    "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Bir/Man"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "  Birincil "
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr " Mantıksal "
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Hiçbiri"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s için Disk Bölümleme Tablosu\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr " Bölüm         İlk          Son              Sektör    Dosya\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1705,7 +1642,7 @@ msgstr ""
 " # Türü       Sektör      Sektör    Başl     Sayısı    Sistemi   Türü    "
 "Flama\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1713,472 +1650,469 @@ msgstr ""
 "-- -------   --------    --------- ------  ---------  ---------  -----  "
 "------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         --Başlangıç---      ----Bitiş-----   Başlangıç  Sektör\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flama Kafa Sekt Sld  Kiml Kafa Sekt Sld    Sektörü   Sayısı\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ----  --------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Ham"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Tablo temel veri biçemi olarak yazılır"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektör"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Tabloyu sektörlere dağılımına göre yazar"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tablo"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Disk bölümleme tablosunu yazar"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Tablo yazılamıyor"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk Yardım Ekranı"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Sabit diskinizdeki disk bölümlerini oluşturabilmenizi, silebilmenizi ve"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 "değiştirebilmenizi sağlayan etkileşimli bir disk bölümleme uygulamasıdır."
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr " "
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Telif Hakkı (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr " Komut       Anlamı"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr " -----       ------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Seçilen disk bölümünün açılış flamasını kaldırır/indirir"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Seçilen disk bölümünü siler"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Silindir, kafa, sektör/İz parametrelerini değiştirir"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             UYARI: Bu seçenek sadece ne yaptığını iyi bilen kişilerce"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             kullanılabilir."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Seçilen disk bölümünü kalan boş yere sığdırır"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Bilgi: Disk bölümünü DOS, OS/2 ve benzeri sistemlerle"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             uyumsuzluk oluÅŸturabilir."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Boş alanda yeni bir disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Disk bölümleme tablosunu ekrana ya da bir dosyaya yazar"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr ""
 "             Disk bölümleme tablosunu farklı biçemlerde elde edebilirsiniz."
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             Bu biçemler:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Temel veri (verinin diske yazılan biçemi)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Disk bölümlerinin sektörlere dağılımını gösterir"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Geleneksel disk bölümleme tablosu"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Disk bölümleme tablosu diskteki yerine kaydedilmeden çıkılır"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Dosya sistemi türünü değiştirir"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Disk bölümü boyunun birimini değiştirir"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, sektör, silindir birimleri sırayla yer değiştirir"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Disk bölümleme tablosunu diskteki yerine yazar. (Büyük W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Diskteki veriyi yanlışlıkla kaybetmemek için "
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             'evet' ya da 'hayır' yazmanız istenerek veriyi diske yazdırıp,"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             yazdırmayacağınıza kesin karar verebilirsiniz"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Yukarı Ok    Kürsörü önceki disk bölümüne kaydırır"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Aşağı Ok     Kürsörü sonraki disk bölümüne kaydırır"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ekranı tazeler"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Bilgi: Kaydet (W) komutu dışında tüm komutları büyük ya da küçük harf"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "olarak kullanabilirsiniz."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Silindir"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Silindir geometrisini deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Kafa"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Kafa geometrisini deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Sektör geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Tamam"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Geometri değişikliği yapıldı"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Silindir sayısını verin: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Silindir sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Kafa sayısını verin: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Kafa sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "sektör/iz sayısını verin: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "sektör sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Dosya sistemi türünü verin: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Dosya sistemi türü boş olarak değiştirilemez"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Dosya sistemi türü ek olarak değiştirilemez"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ne?(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Bir/Man"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Bilinmeyen (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Sabit Disk: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Boyut: %lld bayt, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Boyut: %lld bayt, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Kafa: %d        Sektör/İz: %d       Silindir: %lld  "
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Ä°sim"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flama"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Bölüm Türü"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "DS Türü"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etiket]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Sektör  "
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Silindir"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Boy (MB) "
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Boy (GB) "
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Seçilen disk bölümünde Açılış flamasını kaldırır/indirir"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Sil"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Seçilen disk bölümünü kaldırır"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Disk geometrisini değiştirir (uzmanlar için)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Yardım"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Sığdır"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Seçilen disk bölümünü kalan yere göre ayarlar (uzmanlar için)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Yeni"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Boş alanda yeni bir disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Yaz"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Disk bölümleme tablosunu ekrana ya da bir dosyaya yazar"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Çık"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Disk bölümleme tablosunu diske kaydetmeden çıkar"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Türü"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Dosya sistemi türünü değiştirir (DOS, Linux, OS/2,..,vs)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Birim"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Gösterilecek boy birimini değiştirir (MB, sekt, sld)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Kaydet"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Disk bölümleme tablosunu diske kaydeder (bu işlem verilerin kaybına sebep "
 "olur)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Bu disk bölümüne açılış kaydı yapılamaz"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Bir boş disk bölümü silinemez"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Bu disk bölümü sığdırılamıyor"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Bu disk bölümü kullanışsız"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Bu disk bölümü zaten kullanımda"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Bir boş disk bölümünün türü değiştirilemez"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Başka disk bölümü yok"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Kuraldışı komut"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Telif Hakkı © 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2250,9 +2184,9 @@ msgstr ""
 "\n"
 "Aygıt için BSD disk etiketi: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr " Komut  yaptığı iş "
 
@@ -2272,10 +2206,9 @@ msgstr "   i   önyükleyici kurar"
 msgid "   l   list known filesystem types"
 msgstr "   l   bilinen dosya sistemi türlerini listeler"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   bu menüyü gösterir"
 
@@ -2287,14 +2220,14 @@ msgstr "   n   yeni bir BSD disk bölümü ekler"
 msgid "   p   print BSD partition table"
 msgstr "   p   BSD disk bölümleme tablosunu gösterir"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   değişiklikleri kaydetmeden çıkar"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   ana menüye döner"
 
@@ -2337,13 +2270,13 @@ msgstr "%s üzerinde *BSD disk bölümü yok.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD disk etiketi komutu (yardım için m): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Ä°lk %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Son %s, +size, +sizeM veya +sizeK"
@@ -2388,8 +2321,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " bozukSektör"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2490,8 +2421,8 @@ msgstr "sektör/iz"
 msgid "tracks/cylinder"
 msgstr "iz/silindir"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "silindir"
 
@@ -2548,7 +2479,7 @@ msgstr "%s üzerine önyükleyici kuruldu.\n"
 msgid "Partition (a-%c): "
 msgstr "Disk bölümü (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Oluşturulabilecek disk bölümlerinin tümü oluşturuldu\n"
@@ -2572,7 +2503,7 @@ msgstr ""
 "\n"
 "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2594,7 +2525,7 @@ msgstr ""
 "-u: Başlangıç ve bitiş sektörlerini (silindir değil) verir\n"
 "-b 2048: 2048 baytlık sektörler kullanılır\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2612,198 +2543,184 @@ msgstr ""
 "   fdisk /dev/ida/c0d0  (RAID aygıtları)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s okunamıyor\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s üzerinde erişim olanaksız\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s yazılamıyor\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s üzerinde BLKGETSIZE ioctl hata verdi\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Daha fazla bellek ayrılamıyor\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Ölümcül Hata\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   salt-okunur flamasını kaldırır/indirir"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd disk etiketini düzenler"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   bağlanabilir flamasını kaldırır/indirir"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   bir disk bölümünü siler"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   bilinen disk bölümü türlerini listeler"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   yeni bir disk bölümü ekler"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   yeni bir DOS disk bölümü oluşturur"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   disk bölümleme tablosunu gösterir"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   yeni bir Sun disk etiketi oluÅŸturur"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   disk bölümünün sistem kimliğini değiştirir"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   gösterme/girdi birimini değiştirir"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   disk bölümleme tablosunu doğrular"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   tabloyu diskteki yerine yazar ve çıkar"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fazladan işlevsellik (uzmanlar için)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   açılış disk bölümünü seçer"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   açılış dosyası girdilerini düzenler"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi takas bölümü seçilir"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   açılış flamasını indirir/kaldırır"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos uyumluluk flamasını indirir/kaldırır"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   almaşık silindirlerin sayısını değiştirir"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   silindir sayısını değiştirir"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   disk bölümleme tablosunun temel verisini gösterir"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   silindir başına fazladan sektör sayısını değiştirir"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   kafa sayısını değiştirir"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   serpiÅŸtirme etkenini deÄŸiÅŸtirir"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   devir sayısını değiştirir (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   sektör/iz sayısını değiştirir"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   fiziksel silindir sayısını değiştirir"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   disk bölümü içindeki verinin başlanıcına gider"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   ek disk bölümlerini listeler"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) disk bölümleme tablosu oluşturur"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   disk bölümleme sırasını düzeltir"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Belirtilmeli"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "kafa"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2812,11 +2729,11 @@ msgstr ""
 "%s%s.\n"
 "Bunu fazladan işlevler menüsünden yapabilirsiniz.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " ve "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2835,12 +2752,12 @@ msgstr ""
 "2) diğer işletim sistemlerinin önyükleme ve disk bölümleme yazılımları\n"
 "   (örn. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Birincil ek disk bölümünde hizalama hatalı\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2849,17 +2766,17 @@ msgstr ""
 "Uyarı: %d. bölümden sonrakiler atlanıyor.\n"
 "Bu bölümleme tablosunu kaydederseniz, bunlar silinmiş olacak.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Uyarı: %d disk bölümleme tablosunda fazladan bağ imleyici\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Uyarı: %d disk bölümleme tablosundaki fazladan veri yoksayılıyor\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2871,17 +2788,17 @@ msgstr ""
 "deÄŸiÅŸiklikler\n"
 "bellekte bekleyecek. Aksi takdirde, önceki içerik kurtarılamayacak.\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Bilgi: sektör uzunluğu %d (%d değil)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Disk bölümleme tablosunu diskteki yerine kaydetme yetkiniz yok.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2890,7 +2807,7 @@ msgstr ""
 "Bu disk hem DOS hem de BSD olarak imli.\n"
 "BSD kipine geçmek için 'b' komutunu verin.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2899,17 +2816,17 @@ msgstr ""
 "Aygıt ne geçerli bir DOS disk bölümleme tablosu ne de Sun, SGI ya da OSF "
 "disk etiketleri içeriyor.\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "İç hata\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Fazladan ek disk bölümü %d yoksayılıyor\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2918,7 +2835,7 @@ msgstr ""
 "Uyarı: geçersiz bayrak 0x%04x %d. disk bölümleme tablosunda w(yaz) ile "
 "düzeltilmiş olacak\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2927,83 +2844,83 @@ msgstr ""
 "\n"
 "Dosya sonuna rastlandı - çıkılıyor..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Onaltılık kod (kod listesi için L tuşlayın):"
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, öntanımlı %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Öntanımlı değer %u kullanılıyor\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Değer kapsamdışı.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Disk bölümü numarası"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Uyarı: %d disk bölümünün türü boş görünüyor\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Seçilen disk bölümü %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Tanımlı bir disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Tüm birincil bölümler zaten tanımlı!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "silindir"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "gösterme/girdi birimi %s olarak değiştiriliyor\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "UYARI: %d disk bölümü bir ek disk bölümü\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS uyumluluk flaması etkin\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS uyumluluk flaması etkin değil\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "%d disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3016,7 +2933,7 @@ msgstr ""
 "muhtemelen pek uygun olmayacaktır. 'd' komutunu\n"
 "kullanarak bir disk bölümünü silebilirsiniz.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3025,7 +2942,7 @@ msgstr ""
 "Bir disk bölümünü bir ek bölümün içinde ya da herhangi bir yerde\n"
 "değiştiremezsiniz. Önce silmeniz gerekir.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3035,7 +2952,7 @@ msgstr ""
 "Linux'a uygun olsa da SunOS/Solaris gerektirdiÄŸinden,\n"
 "3. disk bölümünün diskin tamamı (5) olarak bırakıldığı kabul ediliyor.\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3045,54 +2962,54 @@ msgstr ""
 "IRIX gerektirdiğinden, 11. disk bölümü tüm 'volume' (6) ve\n"
 "9. disk bölümü 'volume' başlığı (6) olarak bırakıldığı kabul ediliyor.\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "%d disk bölümünün sistem türü %x (%s) olarak değiştirildi\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "%d disk bölümü farklı fiziksel/mantıksal başlangıçlara sahip (Linux "
 "deÄŸil?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " fiziksel=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "mantıksal=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "%d disk bölümü farklı fiziksel/mantıksal bitişlere sahip:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "%i disk bölümünün başlangıcı silindir sınırları dışında:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) olmalıydı\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "%i. disk bölümü silindir sınırında bitmiyor.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) olmalıydı\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3101,7 +3018,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB %lld bayt\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3110,17 +3027,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bayt\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d kafa, %d sektör/iz, %d silindir"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", toplam %llu sektör"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3129,7 +3046,7 @@ msgstr ""
 "Birimler = %s / %d * %d = %d bayt\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3138,7 +3055,7 @@ msgstr ""
 "Hiçbir şey yapılmadı. Sıralama zaten doğru.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3149,16 +3066,16 @@ msgstr ""
 "Galiba yanlış aygıt seçtiniz.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Açılış    Başlangıç     Bitiş  BlokSayısı Kml Sistem\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Aygıt"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3167,7 +3084,7 @@ msgstr ""
 "\n"
 "Disk bölümleme tablosu girdileri diskteki sırasında değil\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3178,87 +3095,87 @@ msgstr ""
 "Disk %s: %d kafa, %d sektör, %d silindir\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "No AF  Hd Skt  Sln  Hd Skt  Sld    Başlangıç   Boy  Kml\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Uyarı: %d disk bölümü 0. sektörü içeriyor\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: kafa sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: sektör sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: silindir sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "%d disk bölümü: önceki sektör sayısı %d toplam %d ile çelişiyor\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Uyarı: %d disk bölümünün veri-başlangıcı hatalı\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Uyarı: %d ile %d disk bölümleri birbirine girmiş.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Uyarı: %d disk bölümü boş\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Mantıksal disk bölümü %d tamamen %d disk bölümünün içinde değil\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 "Tahsis edilen sektör sayısı %d en fazla olması gereken %lld değerinden "
 "büyük\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld sektör kullanılmamış\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "%d disk bölümü zaten atanmış. Yeniden eklemeden önce silmelisiniz.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Boşta sektör yok\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3271,23 +3188,23 @@ msgstr ""
 "\tbir DOS disk bölümleme tablosu oluşturun. (o ile)\n"
 "\tUYARI: Bu işlem ile diskteki tüm bilgile kaybalacaktır.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Önce bazı disk bölümlerini silip ondan sonra ek disk bölümünü eklemelisiniz\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Tüm mantıksal bölümler kullanımda\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Bir birincil disk bölümü ekleniyor\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3298,20 +3215,20 @@ msgstr ""
 "   %s\n"
 "   p   birincil disk bölümü (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   mantıksal (5 veya üzeri)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   ek"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Tür '%c' için disk bölümü numarası geçersiz\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3320,12 +3237,12 @@ msgstr ""
 "Disk bölümleme tablosu zaten değişmişti!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Disk bölümleme tablosunu yeniden okumak için ioctl() çağrılıyor.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3338,7 +3255,7 @@ msgstr ""
 "Çekirdek hala eski tabloyu kullanıyor.\n"
 "Yeni tablo makinayı yeniden başlattığınızda geçerli olacak.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3351,7 +3268,7 @@ msgstr ""
 "değişiklik yaptıysanız, lütfen fdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -3360,68 +3277,68 @@ msgstr ""
 "\n"
 "Dosya kapatılırken hata\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "%d disk bölümü veri alanına sahip değil\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Yeni veri başlangıcı"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Uzman komutları (yardım için m): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Silindir sayısı"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Kafa sayısı"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Sektör sayısı"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Uyarı: Sektör hizalaması DOS uyumlu olarak yapılıyor\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "%s diski geçerli bir disk bölümleme tablosu içermiyor\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: komut bilinmiyor\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Bu çekirdek sektör uzunluğunu kendisi bulur. - -b seçeneği yoksayıldı\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3430,18 +3347,17 @@ msgstr ""
 "Uyarı: -b (sektör uzunluğu ayarı) seçeneği tek aygıt ile kullanılmış "
 "olmalıydı\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s üzerinde OSF/1 disk etiketi saptandı, disk etiketi kipine giriliyor.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Komut (yardım için m): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3450,16 +3366,16 @@ msgstr ""
 "\n"
 "Şu anki önyükleme dosyası: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Lütfen yeni açılış dosyasının ismini giriniz:"
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Açılış dosyası değiştirilmedi\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3526,15 +3442,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux takas"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux doÄŸal"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3612,7 +3528,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektör%5u boy%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3670,7 +3585,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Birden fazla tüm disk girdisi var.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Atanmış disk bölümü yok\n"
@@ -3755,7 +3670,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tKullanışsız bir önyükleme dosyası seçtiniz.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3775,11 +3689,10 @@ msgstr ""
 "\"SGI volume\" onunla çelişebilir. Bu disk bölümünü farklı\n"
 "oluşturmak istiyorsanız EVET yazın.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "EVET\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3859,44 +3772,43 @@ msgstr "%d disk bölümünün parametreleri okunmaya çalışılıyor.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "Kimlik=%02x\tBaşlangıç=%d\tBoy=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "BoÅŸ"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS takas"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Tüm disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid otosaptama"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3909,12 +3821,12 @@ msgstr ""
 "belirlemeniz ya da baştan bir temiz etiket (ana menüden s komutu ile)\n"
 "oluşturmanız gerekebilecek.\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Otomatik yapılandırma tarafından bir %s%s%s bulundu\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3927,7 +3839,7 @@ msgstr ""
 "diskte bulunan tüm bilgiyi bir daha geri alamamak üzere\n"
 "kaybedeceksiniz.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3937,72 +3849,72 @@ msgstr ""
 "   ?   oto yapılandırma\n"
 "   0   özel (saptanan öntanımlara sahip donanımla)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Aygıt Türü (?: oto, 0: özel): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Otoyapılandırma hata verdi.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektör/iz"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Almaşık silindirler"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fiziksel silindirler"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Devir sayısı (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "SerpiÅŸtirme etkeni"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Silindir başına fazladan sektörler"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Tüm disk parametrelerini x menüsünden değiştirebilirsiniz"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" floppy"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux özel"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "%d disk bölümü silindir sınırında bitmiyor\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "%d disk bölümü diğerleriyle %d-%d sektörlerinde üstüste biniyor\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Kullanılmamış boşluk - 0-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kullanılmamış boşluk - %d-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4012,7 +3924,7 @@ msgstr ""
 "Tekrar denemeden önce bazılarını silmeniz ya da\n"
 "küçültmeniz gerek.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4023,7 +3935,7 @@ msgstr ""
 "diğer disk bölümlerine de geçiyor. Girdiğiniz değer %d %s olarak\n"
 "deÄŸiÅŸtirildi.\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4032,7 +3944,7 @@ msgstr ""
 "SunOS/Solaris uyumluluğu sağlamak isterseniz, bu disk bölümünü 0 dan\n"
 "başlayan %u sektörlük tüm disk (5) olarak bırakmayı gözönüne alabilirsiniz\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4046,7 +3958,7 @@ msgstr ""
 "82 etiketli (Linux takas) olmasını istediğinizden eminseniz lütfen\n"
 "EVET yazınız: "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4065,7 +3977,7 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4078,16 +3990,16 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flama Başlangıç    Bitiş   Blok#   Kiml Sistem\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Almaşık silindirlerin sayısı"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Fiziksel silindirlerin sayısı"
 
@@ -4111,32 +4023,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Ek"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX önyüklenebilir"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Önyükleme Yöneticisi"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4145,7 +4051,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4238,12 +4143,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4264,8 +4167,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4275,7 +4176,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD veya SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4296,12 +4196,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Eski Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / eski Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux takas / Solaris"
@@ -4330,12 +4228,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4344,7 +4240,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4409,30 +4304,22 @@ msgstr "DS-olmayan veri"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Uygulaması"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS eriÅŸimi"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4441,118 +4328,111 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC önyüklemesi"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS ikincil"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "%s üzerinde erişim hatası - %lu ya erişilemiyor\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erişim hatası: 0x%08x%08x istendi, 0x%08x%08x alındı\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "bellek yetersiz - bırakılıyor\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "%s üzerinde okuma hatası - %lu sektörü okunamıyor\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "HATA: %lu sektörü msdos imzası taşımıyor\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "%s üzerinde yazma hatası - %lu sektörüne yazılamıyor\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "disk bölümü sektör kayıt dosyası (%s) açılamıyor\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "%s üzerinde yazma hatası\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "disk bölümü tekrar oluşturma dosyası (%s) durum bilgileri alınamıyor\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "disk bölümü tekrar oluşturma dosyasının uzunluğu hatalı - tekrar "
 "oluşturulamıyor\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "bellek yetersiz?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "disk bölümü tekrar oluşturma dosyası (%s) açılamıyor\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "%s okunurken hata\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "%s aygıtı yazılmak üzere açılamıyor\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "%lu sektörünü %s üzerine yazmada hata\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: geometri alınamıyor\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: boyu alınamıyor\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4563,22 +4443,22 @@ msgstr ""
 "gibi görünüyor. fdisk kullanmak anlamlı olmayacak.\n"
 "[Bunu mutlaka yapmak istiyorsanız --force seçeneğini kullanabilirsiniz]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Uyarı: HDIO_GETGEO %lu kafa bildiriyor\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Uyarı: HDIO_GETGEO %lu sektör bildiriyor\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Uyarı: BLKGETSIZE/HDIO_GETGEO %lu silindir bildiriyor\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4588,7 +4468,7 @@ msgstr ""
 "sayısına benzemiyor. Bu chs adresleme kullanılan yazılımlarla sorun "
 "çıkarır.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4597,7 +4477,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu silindir, %lu kafa, %lu sektör/iz\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4605,7 +4485,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış kafa sayısı içeriyor: %lu (0-%lu arasında "
 "olmalıydı)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4614,7 +4494,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış sektör sayısı içeriyor: %lu (1-%lu arasında "
 "olmalıydı)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4623,7 +4503,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış silindir sayısı içeriyor: %lu (0-%lu "
 "arasında olmalıydı)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4632,12 +4512,12 @@ msgstr ""
 "Kiml Ä°sim\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Disk bölümleme tablosu yeniden okunuyor ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4645,31 +4525,31 @@ msgstr ""
 "Disk bölümleme tablosunun yeniden okunması başarılamadı\n"
 "mkfs kullanabilmek için sistemi yeniden başlatmalısınız.\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s kapatılırken hata\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: böyle bir disk bölümü yok\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "biçem bilinmiyor - sektör sayısı kullanılıyor\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s disk bölümleme tablosu\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "desteklenmeyen biçem - %s kullanılıyor\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4678,14 +4558,14 @@ msgstr ""
 "birimler = %lu baytlık silindir, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 "                              silindir   blok\n"
 "   Aygıt Önykl Balangıç Bitiş sayısı   sayısı\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4694,14 +4574,14 @@ msgstr ""
 "birimler = 512 baytlık sektör, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 "    Aygıt Önyükl Başlangıç   Bitiş   sektör  Kiml Sistem\n"
 "                                     sayısı\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4710,14 +4590,14 @@ msgstr ""
 "birim = 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 "   Aygıt Önyükl Başlangıç   Bitiş    blok    Kiml Sistem\n"
 "                                    sayısı\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4726,36 +4606,36 @@ msgstr ""
 "birimler = 1048576 baytlık mebibayt, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 "   Aygıt Önyük Başl   Bitiş    MiB     blok    Kiml Sistem\n"
 "                                     sayısı\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tbaşlangıç: (sld,kafa,sekt) (%ld,%ld,%ld) gerekirken (%ld,%ld,%ld) "
 "bulundu\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tbitiÅŸ: (sld,kafa,sekt) (%ld,%ld,%ld) gerekirken (%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "disk bölümü disk sonundan sonra, %ld. silindirde bitiyor\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Disk bölümü bulunamadı\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4766,51 +4646,51 @@ msgstr ""
 "(%ld/%ld/%ld yerine) yapılmış görünüyor.\n"
 "Bu listeleme bu geometriyle kabul ediliyor.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "disk bölümleme tablosu yok.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "tuhaf, sadece %d disk bölümü atanmış.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ama boş olarak imli değil\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ve önyüklenebilir\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ve başlangıcı 0 da değil\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Uyarı: %s disk bölümü "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "%s disk bölümünde değil\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Uyarı: %s disk bölümü "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "ve %s birbirine girmiÅŸ\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4819,17 +4699,17 @@ msgstr ""
 "Uyarı: %s disk bölümleme tablosunun bir kısmını içerdiğinden (sektör %lu)\n"
 "dolduÄŸunda onu bozacak\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Uyarı: %s disk bölümü 0. sektörde başlıyor\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Uyarı: %s disk bölümü disk sonunu aşıyor\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4837,17 +4717,17 @@ msgstr ""
 "Birincil disk bölümlerinden en çok biri ek disk bölümünde bulunabilir.\n"
 " (Şüphesiz Linux altında bu bir sorun değildir)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Uyarı: %s disk bölümü bir silindir sınırından başlamıyor\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Uyarı: %s disk bölümü bir silindir sınırında bitmiyor\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4855,7 +4735,7 @@ msgstr ""
 "Uyarı: birden fazla disk bölümü önyükleme flaması içeriyor.\n"
 "Bu LILO için sorun yaratmaz ama DOS MBR bu diski çalıştıramaz.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4863,7 +4743,7 @@ msgstr ""
 "Uyarı: birincil disk bölümlerinden sadece bir tanesi önyüklenebilir,\n"
 "LILO `bootable' flamasına aldırmaz.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4871,11 +4751,11 @@ msgstr ""
 "Uyarı hiçbir disk bölümü önyükleme bayrağı içermiyor\n"
 "Bu LILO için sorun oluşturmaz ama DOS MBR bu diski çalıştıramaz.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "başlangıç"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4883,23 +4763,23 @@ msgstr ""
 "%s: başlangıç: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "bitiÅŸ"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "%s: bitiş: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "%s diskin sonunu aÅŸarak %ld. silindirde bitiyor\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4908,7 +4788,7 @@ msgstr ""
 "Uyarı: ek disk bölümünün başlangıcı %ld den %ld ye kaydırıldı\n"
 "(Sadece liste uyumluluğu için. İçeriği değişmiyor.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4916,132 +4796,131 @@ msgstr ""
 "Uyarı: ek disk bölümü bir silindir sınırında başlamıyor.\n"
 "DOS ve Linux içerikleri farklı yorumlayacaktır.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "disk bölümü sayısı çok fazla - Bu sonuncusu (%d) disk bölümü\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "ağacında yok sayılsın mı?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk yöneticisi saptadı - bulunan DM6 imzası\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "ile çalışılamıyor - bırakılıyor\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "tuhaf..., sıfır uzunlukta bir ek disk bölümü?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "tuhaf..., sıfır uzunlukta bir BSD disk bölümü?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: disk bölümleme tablosu türü tanınmıyor\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n flaması verilmiş: Hiçbir şey değişmedi\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Eski sektörlere yazmada başarısızlık - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "uzun ve eksik girdi satırı - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "girdi hatası: %s alanından sonra bir `=' gerekli\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "girdi hatası: %c karakteri gereksiz (%s alanından sonra)\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "anlaşılmayan girdi: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "sayı çok büyük\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "sayıdan sonrasında süprüntü\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "disk bölümü betimleyici için yer yok\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "kuşatan ek disk bölümü kurgulanamıyor\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "girdi alanları çok fazla\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Daha fazla yer yok\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Kuraldışı tür\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Uyarı: belirtilen (%lu) uzunluk, izin verilen (%lu) uzunluktan fazla\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Uyarı: boş disk bölümü\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Uyarı: disk bölümü başlangıcı hatalı (en erken %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "anlaşılmayan önyükleme flaması; - ya da * seçiniz\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "kısmi sld,kafa,sekt özellikleri?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Ek disk bölümü gereken yerde değil\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "girdi hatalı\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "çok fazla disk bölümü var\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5054,46 +4933,42 @@ msgstr ""
 "Genellikle <başlangıç> ve <uzunluk> değerleri (ve tabii ki <türü>)\n"
 "belirtmek yeterlidir.\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "sürüm"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "aygıt: /dev/hda veya /dev/sda gibi"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "kullanışlı seçenekler:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s  --show-size     disk bölümü uzunlukları listelenir"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c  --id            disk bölümü kimliği değiştirilir ya da gösterilir"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l  --list          aygıtların disk bölümlerini listeler"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d  --dump          dökümler, ama sonraki girdiler için uygun biçemde"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i  --increment     silindir sayısı v.s. 0 yerine 1 den itibaren"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5101,60 +4976,61 @@ msgstr ""
 "    -uS, -uB, -uC, -uM  sektör/blok/silindir/MB birimleriyle değer alır/"
 "gösterir"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T  --list-types    bilinen disk bölümü türlerini listeler"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D  --DOS           DOS-uyumluluğu için: bir disk bölümünü çoraklaştırır"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R  --re-read       çekirdek yeniden okuma tablosu yapar"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N#                 sadece # numaralı disk alanı değiştirilir"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n                  gerçekte diske yazılmaz"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O dosya            üstüne yazarak sektörleri dosyaya kaydeder"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I dosya            sektörleri bu dosyadan tekrar oluşturur"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v  --version       sürüm bilgilerini gösterir"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -?  --help          bu yardım iletisini gösterir ve çıkar"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "tehlikeli seçenekler:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g  --show-geometry çekirdeğin geometri bilgisini gösterir"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
-msgstr "    -g  --show-geometry çekirdeğin geometri bilgisini gösterir"
+msgstr ""
+"    -G [veya --show-pt-geometry]: bölümleme tablosundan alınan geometriyi "
+"basar"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5162,119 +5038,119 @@ msgstr ""
 "    -x  --show-extended ek disk bölümlerini gösterir ve\n"
 "                        betimleyicileri için girdi bekler"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  --Linux         Linux ile alakasız şeyler hakkında hata üretmez"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  --quiet         uyarıları engeller"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "Saptanan geometriyi aşmak için seçenekler:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C#  --cylinders #  kullanılacak silindir sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H#  --heads #      kulanılacak kafa sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S#  --sectors #    kullanılacak sektör sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Kararlılık denetimlerini etkisizleştirme seçenekleri:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  --force         yapılacak işlem hatalı da olsa yapılır"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Kullanımı:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s aygıt\t\t aygıt üstündeki etkin disk bölümlerini gösterir\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s aygıt n1 n2 ... n1, n2 ile belirtilen disk bölümleri etkinleştirilir,\n"
 "                   diÄŸerleri etkisizleÅŸtirilir\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An aygıt\t n. disk bölümünü etkinleştirilir, diğerlerini "
 "etkisizleÅŸtirilir\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "Komut?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "toplam: %llu blok\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Kullanımı: sfdisk --print-id aygıt disk-bölümü-numarası\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "kullanımı: sfdisk --change-id aygıt disk-bölümü-numarası kimlik\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "kullanımı: sfdisk --id aygıt disk-bölümü-numarası [kimlik]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "sadece bir aygıt belirtilebilir (-l ya da -s ile gerekir)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s oku-yaz açılamıyor\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s okumak için açılamıyor\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: TAMAM\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld silindir, %ld kafa, %ld sektör/iz\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "%s gibi bir boyut alınamıyor\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "hatalı etkin bayt: 0x80 yerine 0x%x\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5282,7 +5158,7 @@ msgstr ""
 "Bitti\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5291,35 +5167,35 @@ msgstr ""
 "%d etkin birincil disk bölümü var. Bu LILO için sorun olmamakla beraber\n"
 "DOS MBR sadece 1 etkin disk bölümü önyüklemesi yapabilir.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "%s disk bölümünün kimliği %x ve gizli değil\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Kimlik %lx hatalı\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Bu disk şu an kullanılıyor.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ölümcül hata: %s bulunamıyor\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Uyarı: %s bir blok aygıtı değil\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Diskin kullanımda olup olmadığı denetleniyor...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5332,30 +5208,30 @@ msgstr ""
 "alanlarını swapoff ile kapatın. --no-reread bayrağını kullanarak\n"
 "yeniden okuma iÅŸlemini engelleyin.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Tüm denetimleri kaldırmak için --force seçeneğini kullanın.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "TAMAM\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Eski durum:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "%d. disk bölümü olmadığından geçilemiyor\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Yeni durum:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5363,21 +5239,21 @@ msgstr ""
 "Bu disk bölümlerinde hiç bir değişiklik yapılmadı.\n"
 "(Bunu gerçekten istiyorsanız --force seçeneğini kullanın.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Uygulanamıyor - siz de Hayır derdiniz, büyük ihtimalle\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bundan memnun musunuz? [ehs] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bunu diske yazmak ister misiniz? [ehs] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5386,16 +5262,16 @@ msgstr ""
 "\n"
 "sfdisk: girdi sonu eksik\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Çıkılıyor - Değişiklik yok\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Lütfen e, h, s harflerinden biri ile yanıtlayın\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5404,7 +5280,7 @@ msgstr ""
 "Yeni disk bölümleme tablosu başarıyla yazıldı\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5507,132 +5383,132 @@ msgstr "getopt (geliÅŸmiÅŸ) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "iç hata, yazara bildirin."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "MILO'dan açıldı\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD clock\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "saatportu 0x%x'e ayarlandı\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TimeOfYear!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: 1000 yineleme için atomik %s başarısız!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port açılamıyor: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Denenmediğinden erişim izinleri alınamadı.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s G/Ç portu erişimi alamıyor: iopl(3) çağrısı başarısız.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Size root yetkileri gerekli.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Donanım saatinin %s de tutulduğu varsayılıyor.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "yerel"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Uyarı: adjtime dosyasındaki üçüncü satır anlaşılamadı\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Gereken: `UTC', `LOCAL' ya da hiçbiri.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Son sapma ayarı 1969 dan sonraki %ld. saniyede yapıldı\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Son düzeltme 1969 dan sonraki %ld. saniyede yapıldı\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Donanım saati %s den beri açık\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "saat tiki için bekleniyor...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "... saat tiki alındı\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Donanım saatinde geçersiz değerler: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Donanım zamanı: %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 yılından beri %ld "
 "saniye\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Donanım saatinden okunan: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Donanım Saati %.2d:%.2d:%.2d = 1969 dan beri %ld saniye olarak ayarlanıyor\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Saat deÄŸiÅŸmeyecek - sadece test ediliyor.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5641,7 +5517,7 @@ msgstr ""
 "Başlangıç zamanından beri geçen zaman %.6f saniye oldu.\n"
 "Gecikme sonraki tam saniyeye kadar olandan daha fazla.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5650,22 +5526,22 @@ msgstr ""
 "Donanım saati yazmaçları hem geçersiz (ayın 50. günü gibi) hem de elde "
 "edilebilir olmayan bir aralıkta (2500 yılı gibi) değerler içeriyor.\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f saniye\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "--date seçeneği belirtilmemiş.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date ile verilen argüman çok uzun\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5674,22 +5550,22 @@ msgstr ""
 "--date seçeneğinin değeri geçersiz.\n"
 "Ayrıca tırnak işaretleri de içeriyor.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Verilen date komutu: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "'date' uygulaması /bin/sh kabuğunda çalıştırılamıyor. popen() başarısız"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date komutunun sonucu = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5704,7 +5580,7 @@ msgstr ""
 "Sonuç:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5721,12 +5597,12 @@ msgstr ""
 "Sonuç:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "tarih dizgesi %s 1969 dan beri %ld saniyeye eÅŸittir.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5735,36 +5611,36 @@ msgstr ""
 "Donanım Saati geçerli bir zaman değeri içermediğinden Sistem Zamanı o değere "
 "ayarlanamaz.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "settimeofday çağrısı:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Test kipinde çalışıldığından sistem saati değişmiyor.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Sistem saatinin ayarlanması root yetkisindedir.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() başarısız"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5773,7 +5649,7 @@ msgstr ""
 "Donanım saatinin önceki değerleri bozuk olduğundan sapma faktörü "
 "ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5782,7 +5658,7 @@ msgstr ""
 "Son düzeltme zamanı sıfır olduğndan sapma faktörü ayarsız,\n"
 "yani geçmiş hatalı ve bir düzeltme başlangıcı gerekiyor.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5791,7 +5667,7 @@ msgstr ""
 "Son düzeltmeden beri 1 günden az zaman geçtiğinden sapma faktörü "
 "ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5802,22 +5678,22 @@ msgstr ""
 "saniye saptı.\n"
 "Sapma faktörü %4$f saniye/gün olarak ayarlanıyor\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Son ayarlamadan beri %d saniye geçti\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "%d saniye girmek gerekli ve zaman %.6f saniye öncesine ait\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "adjtime dosyası test kipinde olunduğundan güncellenmiyor.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5826,38 +5702,38 @@ msgstr ""
 "Aşağıdaki %s e yazılmalı:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Sapma ayar parametreleri güncellenmedi.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr "Donanım saati geçerli bir zaman içermediğinden ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Gereken ayar bir saniyenin altında olduğundan saat ayarlanmıyor.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "%s kullanarak.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Kullanılabilir bir saat arayüzü yok.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Sistem saati ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5869,17 +5745,17 @@ msgstr ""
 "deÄŸeri saklar.\n"
 "hwclock'un bu kopyası bir Alpha için derlenmemiş. Bir şey yapılmadı.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Çekirdekten dönemsellik değeri alınamıyor.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Çekirdek dönemsellik değerini %lu varsayıyor\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5888,17 +5764,22 @@ msgstr ""
 "Dönemsellik değerinin ayarlanabilmesi için, ayarlanacak değeri 'epoch' "
 "seçeneği ile vermelisiniz.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Dönemsellik %d olarak ayarlanmayacak - sadece test ediliyor.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Çekirdekte dönemsellik değeri ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s (%s den)\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5957,7 +5838,7 @@ msgstr ""
 "  --noadjfile   /etc/adjtime okunmaz. Ya --utc ya da --localtime kullanmak\n"
 "                gerekir.\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5967,12 +5848,12 @@ msgstr ""
 "                Alpha'nızın hwclock türü belirtilir\n"
 "               (hwclock(8) man sayfasına bakınız)\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s seçeneği argüman almaz.  %d verildi.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5981,7 +5862,7 @@ msgstr ""
 "Çok sayıda işlev belirttiniz.\n"
 "Bir defada sadece bir iÅŸlev uygulanabilir.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5990,7 +5871,7 @@ msgstr ""
 "%s: --utc ve --localtime seçenekleri birbiriyle çelişiyor.  İkisi de "
 "belirtilmiÅŸ.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -5999,27 +5880,27 @@ msgstr ""
 "%s:  --adjust ve --noadjfile seçenekleri birbiriyle çelişir.\n"
 "Siz ikisini de belirtmiÅŸsiniz.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: --noadjfile ile ya --utc ya da --localtime belirtilmelidir\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Zaman ayarlama kullanımdışı.  Saat ayarlanamaz.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Donanım saati sadece root tarafından değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Sistem saati sadece root tarafından değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6028,12 +5909,12 @@ msgstr ""
 "Çekirdekteki Donanım Saati dönemsellik değeri sadece root tarafından "
 "deÄŸiÅŸtirilebilir.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Bilinen her hangi bir yöntemle Donanım Saatine erişilemiyor.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6069,7 +5950,6 @@ msgstr "ioctl() %s den zamanı okuyamadı"
 msgid "ioctl KDSHWCLK failed"
 msgstr "ioctl KDSHWCLK başarısız"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "/dev/tty1 veya /dev/vc/1 açılamıyor"
@@ -6164,9 +6044,6 @@ msgstr "ioctl(RTC_EPOCH_READ) %s için başarısız"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "RTC_EPOCH_READ ioctl ile dönemsellik %ld %s den okunabilir.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6193,7 +6070,6 @@ msgstr "ioctl(RTC_EPOCH_SET) %s için hata verdi"
 msgid "calling open_tty\n"
 msgstr "open_tty çağrılıyor\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "termio_init çağrılıyor\n"
@@ -6202,7 +6078,6 @@ msgstr "termio_init çağrılıyor\n"
 msgid "writing init string\n"
 msgstr "başlatma dizgesi yazılıyor\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "bağlantı hızı saptama öncesi\n"
@@ -6216,7 +6091,6 @@ msgstr "cr-lf için bekleniyor\n"
 msgid "read %c\n"
 msgstr "%c okundu\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "kullanıcı ismi okunuyor\n"
@@ -6270,7 +6144,6 @@ msgstr "/dev: chdir() başarısız: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: bir karakter aygıtı değil"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6285,12 +6158,10 @@ msgstr "/dev/%s: standart girdi olarak açılamıyor: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: oku/yaz için açık değil"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "çoğaltıyor\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6335,30 +6206,25 @@ msgstr ""
 "              [-I başlatmaDizgesi] [-H giriş_makinası] satır\n"
 "              bağlantı_hızı,... [terminalTürü]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "giriş: bellek az, giriş yapılamayabilir\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "ttyclass için bellek ayrılamadı"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "grplist için bellek ayrılamadı"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "%s üzerinden %s makinasına girişe öntanımlı olarak izin verilmedi.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "%s üzerinden %s makinasına girişe izin verilmedi.\n"
@@ -6404,8 +6270,8 @@ msgstr "%s için kullanıcı bilgileri değiştiriliyor.\n"
 msgid "Password error."
 msgstr "Parola hatası."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Parola: "
@@ -6583,34 +6449,6 @@ msgstr "Listeyi görmek için %s -l kullanın.\n"
 msgid "No known shells.\n"
 msgstr "Kullanılabilecek kabuklar belirlenmemiş.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "/dev/urandom açılamadı"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "/dev/urandom'dan rasgele veri okunamadı"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "%s okumak için açılamıyor"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "stat %s yapılamadı"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s doÄŸru dosya kiplerine sahip deÄŸil"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "%s dosyasından veri okunamıyor"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6621,11 +6459,11 @@ msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 "Kullanımı: last [-#] [-f dosya] [-t tty] [-h makinaAdı] [kullanıcı ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  ÅŸu an sistemde"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6634,15 +6472,15 @@ msgstr ""
 "\n"
 "wtmp kayıtlarının başlangıcı: %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: bellek ayrılamadı.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6651,51 +6489,45 @@ msgstr ""
 "\n"
 "durduruldu: %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ÖLÜMCÜL: tty tekrar açılamıyor: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "ÖLÜMCÜL: tty hatalı"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h sadece root tarafından kullanılabilir.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Kullanımı: login [-fp] [kullanıcı]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM hatası, çıkılıyor: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM başlatılamadı: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Kullanıcı ismi: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "%3$s %2$s ÃœZERÄ°NDEN %1$d DEFA GÄ°REMEDÄ°, %4$s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6704,17 +6536,17 @@ msgstr ""
 "Giriş başarısız\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "%3$s %2$s ÜZERİNDEN ÇOK FAZLA GİRİŞ DENEDİ (%1$d), %4$s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "%s MAKİNASINA %s İÇİN GİRİŞ OTURUMU KAPANDI, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6723,7 +6555,7 @@ msgstr ""
 "\n"
 "Giriş başarısız\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6732,136 +6564,121 @@ msgstr ""
 "\n"
 "Oturum ayarları sorunu, çıkılıyor.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "%s işlevinin %d. satırında kullanıcı ismi yok (NULL)."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 "%2$s işlevinin %3$d. satırında kullanıcı ismi \"%1$s\" geçersiz. Çıkılıyor."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Bellek yetersiz\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Kullanıcı ismi kuraldışı"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s için bu terminalden giriş reddedildi.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s İÇİN %s MAKİNASINDAN %s TERMİNALİNE GİRİŞ REDDEDİLDİ"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s İÇİN %s TERMİNALİNE GİRİŞ REDDEDİLDİ"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Giriş başarısız\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Kullanıcı sayısı sınırı aşıldı.\n"
-"Daha sonra tekrar deneyin.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Çalıştırabileceğiniz uygulama sayısını aştınız.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "%s ÃœZERÄ°NDEN %s Ä°SMÄ°YLE DIALUP"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s ÜZERİNDEN %s MAKİNASINA ROOT GİRİŞİ"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s ÜZERİNDE ROOT GİRİŞİ"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s ÃœZERÄ°NDEN %s, %s MAKÄ°NASINA GÄ°RDÄ°"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s ÃœZERÄ°NDEN %s SÄ°STEME GÄ°RDÄ°"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Yeni e-postanız var.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "E-postanız var.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: ast süreç oluşturma başarısız: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY başarısız: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() başarısız"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "%s dizini yok!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Ev dizini \"/\" ile giriÅŸ.\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: kabuk betiği için bellek yetersiz.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kabuk betiği çalıştırılamadı: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: kabuk yok: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6870,65 +6687,65 @@ msgstr ""
 "\n"
 "%s kullanıcı ismi: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Kullanıcı adınız çok uzun.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "İSİM çok uzun"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "kullanıcı isimleri bir '-' ile başlayamaz.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "çok fazla boş geçildi.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "HADDÄ°NDEN FAZLA boÅŸ giriÅŸ"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Giriş %d saniye sonra zaman aşımına uğradı\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Son giriÅŸ: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "sularında %.*s makinasına yapıldı\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "sularında %.*s konsoluna yapıldı\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s MAKİNASINDAN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ÜZERİNDEN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%3$s %2$s MAKÄ°NASINDAN %1$d KERE GÄ°REMEDÄ°"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%3$s %2$s ÃœZERÄ°NDEN %1$d KERE GÄ°REMEDÄ°"
@@ -6948,169 +6765,30 @@ msgstr "Başkaları uçbirime yazamaz.\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Kullanımı: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Siz kim siniz?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Böyle bir grup yok."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: EriÅŸim engellendi"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Kabuk yok"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Parola en az 6 karakter uzunlukta olmalıdır, tekrar deneyin.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Bir parola bu karakter gruplarının en az ikisindeki karakterleri\n"
-"içermelidir: büyük ve küçük harfler, rakamlar, işaretler.\n"
-"Daha fazla bilgi için: 'man 1 passwd'\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Eski parolanızı yeniden kullanamazsınız.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Lütfen parola olarak kullanıcı adınız gibi şeyleri kullanmayınız!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Lütfen parola olarak ad-soyadı gibi şeyleri kullanmayınız!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Kullanımı: passwd [kullanıcıİsmi [parola]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Argümanlı kullanım sadece root için mümkündür.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Kullanımı: passwd [-foqsvV] [kullanıcı [parola]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "%s çalıştırılamıyor: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kullanıcı ismi bulunamıyor"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Diğerlerinin parolasını sadece root değiştirebilir.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Çok fazla argüman belirtildi.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"Kullanıcı ismi hiçbir yerde bulunamıyor. `%s' gerçekten bir kullanıcı ismi "
-"mi?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Sadece yerel parolalar değiştirilebilir. Bunun yerine yppasswd kullanın."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "Kullanıcı kimliği ile kullanıcı ismi uyuşmuyor, sahtekar!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "%s için parola değiştiriliyor\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Eski parolanızı yazınız: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Kuraldışı parola."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Yeni parolanızı yazınız: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Parola deÄŸiÅŸtirildi."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Yeni parolanızı tekrar yazınız: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Yanlış yazdınız. Parola değiştirilmedi."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "%s için parola değiştirildi"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT PAROLASI DEĞİŞTİRİLDİ"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "%s için parola root tarafından değiştirildi"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "parolayı kaydetmek için setpwnam çağrılıyor.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Parola deÄŸiÅŸtirilmedi! Daha sonra tekrar deneyin.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Parola deÄŸiÅŸtirildi.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7157,7 +6835,6 @@ msgstr "%s tarafından yaeniden başlatıldı: %s"
 msgid "halted by %s: %s"
 msgstr "%s tarafından kapatıldı: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7194,7 +6871,6 @@ msgstr "\"%s\" uygulaması çalıştırılıyor ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Çalıştırma sırasında hata\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7284,7 +6960,6 @@ msgstr "/dev/initctl üstünde close-on-exec ayarlanırken hata"
 msgid "error running finalprog\n"
 msgstr "uç uygulama çalıştırılırken hata\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "uç uygulama ast sürece alınırken hata\n"
@@ -7313,7 +6988,7 @@ msgstr "dizine geçilemedi\n"
 msgid "fork failed\n"
 msgstr "ast süreç oluşturulamadı\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "çalıştırma başarısız\n"
 
@@ -7463,12 +7138,6 @@ msgstr "ay numarası kuraldışı: 1..12 arasında olmalı"
 msgid "illegal year value: use 1-9999"
 msgstr "yıl değeri kuraldışı: 1-9999 arasında olmalı"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7479,13 +7148,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "kullanımı: cal [-13smjyV] [[ay] yıl]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "kullanımı: %s [+biçem] [gün ay yıl]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tib Günü"
 
@@ -7617,7 +7285,7 @@ msgstr "%s: %s  %s olarak deÄŸiÅŸtirilemedi: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "çağrı: %s hangi dosyalarla çalışacak?\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7628,22 +7296,22 @@ msgstr ""
 "Gerçekten kullanmak istiyorsanız `%s [seçenekler] %s' ile kullanın.\n"
 "Betik başlatılmadı.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "kullanımı: script [-a] [-f] [-q] [-t] [dosya]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Betik başlatıldı, dosyası %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "%s de betik başlatıldı"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7652,254 +7320,253 @@ msgstr ""
 "\n"
 "%s üzerinde betik tamamlandı"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Betik tamamlandı, dosyası %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty başarısız\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "pty sayısı yetersiz\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argüman hatası, kullanımı\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_ismi ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-Konsol_nr] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-Konsol_nr] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dökümDosyası ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekans_nr ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "ekonomi kipi denetim dışı\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl hatası: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "%s okunurken hata\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Ekran dökümü yazılırken hata\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "%s okunamadı ve ioctl dökümlenemiyor\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM atanmamış.\n"
@@ -7974,10 +7641,6 @@ msgstr "uyarı: %s açılamıyor: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s açılamadı - yerine %s kullanılıyor\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8165,29 +7828,29 @@ msgid "; rest of file ignored"
 msgstr "; dosyanın kalanı yoksayıldı"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: etiket %s hem %s hem de %s için görünüyor\n"
+msgstr "%s: error: etiket %s hem %s hem de %s için kullanılmış\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: %s %s tarafından bağlanıyor\n"
+msgstr "mount: %s UUID'sine göre bağlanıyor\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: %s %s tarafından bağlanıyor\n"
+msgstr "mount: %s etiketine göre bağlanıyor\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr "mount: %s açılamadı, UUID ve ETİKET dönüşümü yapılmış olmayabilir.\n"
+msgstr "%s: %s açılamadı, UUID ve LABEL dönüşümü yapılmış olmayabilir.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: UUID hatalı"
+msgstr "%s: UUID hatalı"
 
 #: mount/mount.c:382
 #, c-format
@@ -8275,81 +7938,72 @@ msgstr "mount: hızı ayarlamak için %s açılamıyor"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ast süreç oluşturulamıyor: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: bu sürüm `nfs' türü için destek olmaksızın derlenmiş"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: nfs mount sürüm 4 ile başarısız, 3 deneniyor...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Dosya sistemi türü saptanamadı ve belirtilmemiş"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: dosya sistemi türünü belirtmelisiniz"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: bağlanamadı"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: bağlama noktası %s bir dizin değil"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: eriÅŸim engellendi"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: root tarafından kullanılmalı"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s meÅŸgul"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc zaten bağlı"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: ya %s zaten bağlı ya da %s meşgul"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: bağlama noktası %s yok"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: bağlama noktası %s hiçbir yere sembolik bağ sağlamıyor"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: özel aygıt %s yok"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8358,12 +8012,12 @@ msgstr ""
 "mount: özel aygıt %s yok\n"
 "       (dosya yolu öneki bir dizin değil)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s zaten bağlı değil, ya da seçenek yanlış"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8372,7 +8026,7 @@ msgstr ""
 "mount: dosya sistemi türü yanlış, seçenek yanlış, %s üzerinde superblok\n"
 "       hatalı, karakter kümesi eksik, ya da başka bir hata olabilir"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8380,7 +8034,7 @@ msgstr ""
 "       (fiilen ide-scsi kullanıldığına göre bu bir IDE aygıt\n"
 "        olabilir mi? Burada sr0, sda gibi birşeyler olmalı, değil mi?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8388,7 +8042,7 @@ msgstr ""
 "       (içindeki bir mantıksal disk bölümü yerine\n"
 "        bir ek disk bölümünü bağlamaya çalışmıyor musunuz?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8396,54 +8050,53 @@ msgstr ""
 "       Bazı durumlarda syslog'da bulunan bilgiler yararlıdır.\n"
 "       dmesg | tail  gibi birÅŸeyler deneyin\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "baÄŸ tablosu dolu"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok okunamıyor"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: aygıt bilinmiyor"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: dosya sistemi türü '%s' bilinmiyor"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: herhalde %s kastettiniz"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: 'iso9660' kastetmiÅŸ olabilir misiniz?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: 'vfat' kastetmiÅŸ olabilir misiniz?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s yanlış aygıt numarasına sahip ya da dosya sistemi türü %s "
 "desteklenmiyor"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 "mount: %s bir blok aygıtı olmayabilir mi ve durum bilgileri alınamayabilir "
 "mi?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8452,73 +8105,68 @@ msgstr ""
 "mount: çekirdek %s aygıtını bir blok aygıtı olarak tanımıyor\n"
 "       (`insmod sürücü' denenebilir?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s bir blok aygıtı değil ( `-o loop' denenebilir mi?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s bir blok aygıtı değil"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s geçerli bir blok aygıtı değil"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blok aygıtı "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s salt-okunur bağlanamıyor"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s yazma korumalı olduğu halde alenen `-w' seçeneği belirtilmiş"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s yazma korumalı, salt-okunur olarak bağlanıyor"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: tür belirtilmemiş - ':' içerdiğinden nfs varsayılıyor\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: tür belirtilmemiş - '//' öneki içerdiğinden smbfs varsayılıyor\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: \"%s\" artalana alınıyor\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: \"%s\" bırakılıyor\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s zaten %s üzerinde bağlı\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8570,34 +8218,34 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
 "Daha fazla bilgi edinmek için 'man 8 mount' yazabilirsiniz.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: bunu sadece root yapabilir"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s yok - oluÅŸturuluyor...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: böyle bir disk bölümü yok"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s bağlanıyor\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "hiçbir şey bağlanmadı"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s  %s içinde bulunamıyor"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s  %s ya da %s içinde bulunamıyor"
@@ -8632,98 +8280,98 @@ msgstr "       %s türü denenecek\n"
 msgid "Trying %s\n"
 msgstr "%s deneniyor\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: makina:dizin argümanı gereğinden uzun\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: uyarı: çoklu makina isimleri desteklenmiyor\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: bağlanılacak dizin makina:dizin biçeminde değil\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: %s için adres alınamıyor\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: yanlış hp->h_length alındı\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: seçenek argümanı gereğinden uzun\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Uyarı: proto= seçeneği bilinmiyor.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Uyarı: namlen seçeneği desteklenmiyor.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "bilinmeyen nfs baÄŸ parametresi: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Uyarı: nolock seçeneği desteklenmiyor.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "bilinmeyen nfs bağ seçeneği: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: yanlış hp->h_length alındı?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "TCP üzerinden NFS desteklenmiyor.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs soketi"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs sunucu servisi kullanımdışı olarak raporladı"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "NFS portunu bulmak için portmapper kullanıldı\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "nfs artalan süreci için %d portu kullanılıyor\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs bağlantısı"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "bilinmeyen nfs durum sonuç değeri: %d"
@@ -8732,8 +8380,8 @@ msgstr "bilinmeyen nfs durum sonuç değeri: %d"
 msgid "bug in xstrndup call"
 msgstr "xstrndup çağrısında yazılım hatası"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8742,16 +8390,10 @@ msgid ""
 msgstr ""
 "kullanımı: %s [-hV]\n"
 "           %s -a [-e] [-v]\n"
-"           %s [-v] [-p öncelik] özel ...\n"
+"           %s [-v] [-p öncelik] özel|LABEL=oylum_ismi ...\n"
 "           %s [-s]\n"
-"  -h          bu yardım iletisini gösterir.\n"
-"  -V          sürüm bilgilerini gösterir.\n"
-"  -s          bağlı takas aygıtlarını listeler.\n"
-"  -a          /etc/fstab dosyasındaki takas aygıtlarını bağlar.\n"
-"  -p öncelik  öncelik 0 ile 32767 arasında bir değerdir.\n"
-"Takas öncelikleri için: 'man 2 swapon'\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8762,138 +8404,136 @@ msgstr ""
 "           %s -a [-v]\n"
 "           %s [-v] özel ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s %s üzerinde\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: \"_stext\" %s içinde bulunamıyor\n"
+msgstr "%s: %s için aygıt ismi bulunamıyor\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: %s durum bilgileri alınamıyor: %s\n"
+msgstr "%s: %s durum bilgileri alınamıyor: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr "swapon: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
+msgstr "%s: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: %s atlanıyor - delikler içeriyor gibi görünüyor.\n"
+msgstr "%s: %s atlanıyor - bazı delikler içeriyor gibi görünüyor.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "root deÄŸil.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s açılamıyor: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: -f için destek içermeksizin derlenmiş\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ast süreç oluşturulamıyor: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "makina: %s, dizin: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: %s için adres alınamıyor\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: yanlış hostp->h_length alındı\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: blok aygıtı geçersiz"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: bağlanmadı"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superblok yazılamıyor"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: aygıt meşgul"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: yok"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bağı kaldırmak için root gerekli"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dosya sisteminde blok aygıtlara izin yok"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 yok, umount deneniyor...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "umount %s gerçekleştirilemedi- yerine %s deneniyor\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s meşgul- salt-okunur olarak yeniden bağlandı\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s salt okunur olarak yeniden bağlanamıyor\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s sistemden ayrıldı\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ayrılacak dosya sistemlerinin listesi bulunamıyor"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8919,47 +8559,46 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz\n"
 "Daha fazla bilgi edinmek için 'man 8 umount' yazınız.\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "\"\" ayrılamaz\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s sistemden ayrılmaya çalışılıyor\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab içinde %s bulunamadı\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s bağlı değil (mtab içinde yok)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s defalarca bağlanmış görünüyor"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s fstab içinde yok (ve siz root değilsiniz)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s bağı fstab ile çelişiyor"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: sadece %1$s %3$s aygıtını %2$s dizininden ayırabilir"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: bu sadece root tarafından yapılabilir"
 
@@ -9109,15 +8748,16 @@ msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Kullanımı: %s [-c] [-n seviye] [-s tamponBoyu]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: \"-%c\" diye bir seçenek bilinmiyor\n"
+msgstr "flock: bilinmeyen seçenek, çıkılıyor\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Kullanımı: flock [--shared | --timeout=saniye] dosyaismi komut {arg arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9286,8 +8926,6 @@ msgstr "çekirdek paylaşımlı bellek için yapılandırılmamış\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- Paylaşımlı Bellek Sınırları ----\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -10073,17 +9711,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e biçem] [-f biçemDosyası] [-n uzunluk] [-s atlanan] "
 "[dosya ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "kullanımı: %s [-dflpcsu] [+satırnum | +/kalıp] isim1 isim2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: \"-%c\" diye bir seçenek bilinmiyor\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10094,8 +9732,7 @@ msgstr ""
 "*** %s: dizin ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10106,45 +9743,45 @@ msgstr ""
 "******** %s: Bir metin dosyası değil ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Çıkmak için q ya da Q kullanın]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--BaÅŸka--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Sonraki dosya: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Devam etmek için boşluk çubuğuna, çıkmak için 'q' tuşuna basınız.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...kalan %d sayfa"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...kalan 1 sayfa"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...bir satır atlanıyor"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...%d satır atlanıyor"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10154,7 +9791,7 @@ msgstr ""
 "***Kalan***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10166,7 +9803,7 @@ msgstr ""
 "parantezlerle belirtilenler öntanımlıdır. Yıldız (*) işareti yeni öntanımlı\n"
 "değer olacağını belirtir.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10212,34 +9849,34 @@ msgstr ""
 ":f             Dosya ismini ve satır numarasını gösterir\n"
 ".              Önceki komut tekrarlanır\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Yardım başlıkları için 'h' tuşuna basınız]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" satır %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Dosya değil] satır %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  TaÅŸma\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...atlanıyor\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Düzenli ifade acemice"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10247,15 +9884,15 @@ msgstr ""
 "\n"
 "Kalıp bulunamadı\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Kalıp bulunamadı"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "ast süreç oluşturulamadı\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10263,19 +9900,19 @@ msgstr ""
 "\n"
 "...Atlanıyor "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Dosyaya atlanıyor: "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Önceki dosyaya atlanıyor: "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Satır çok uzun"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Yerini alacak öncesinde bir komut yok"
 
@@ -10328,7 +9965,7 @@ msgstr "hexdump: biçem hatalı {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: dönüşüm karakteri %%%s hatalı.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10336,84 +9973,81 @@ msgstr ""
 "%s: Kullanımı: %s [-number] [-p dizge] [-cefnrs] [+satır] [+/kalıp/] "
 "[dosyalar]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: seçenek bir argümanla kullanılır -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: kuraldışı seçenek -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...ileri atlanıyor\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...geri atlanıyor\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Sonrasında dosya yok"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Öncesinde dosya yok"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: %s dosyasından okuma hatası\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: %s doyasında beklenmedik dosya sonu\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: %s doyasında bilinmeyen hata\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: geçici dosya oluşturulamıyor.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE hatası:"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(DosyaSonu)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Arama dizgesi yok"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Açılamıyor"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "kaydedildi"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": rflag kipinde ! komutu kullanılmaz.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "Alt süreç oluşturulamadı, daha sonra tekrar deneyin\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Sonraki dosya: "
 
@@ -10428,14 +10062,14 @@ msgid "usage: rev [file ...]\n"
 msgstr "kullanımı: rev [dosya ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "%s okumak için açılamıyor\n"
+msgstr "\"%s\" okumak için açılamıyor\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "Kullanımı: %s [dosya]\n"
+msgstr "Kullanımı: tailf günlük_dosyası\n"
 
 #: text-utils/ul.c:141
 #, c-format
@@ -10467,6 +10101,157 @@ msgstr "Girdi satırı çok uzun.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Tampon büyütülürken bellek yetmedi.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Numara geçersiz: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Sözdizimi hatası: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Böyle bir parametre yok: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] aygıt isim\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] aygıt uzunluk sektor kafa iz gerilme boşluk oran özellik1 "
+#~ "fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] aygıt\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] aygıt\n"
+
+#~ msgid "version"
+#~ msgstr "sürüm"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "/dev/urandom açılamadı"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "/dev/urandom'dan rasgele veri okunamadı"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "%s okumak için açılamıyor"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "stat %s yapılamadı"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s doÄŸru dosya kiplerine sahip deÄŸil"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "%s dosyasından veri okunamıyor"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Kullanıcı sayısı sınırı aşıldı.\n"
+#~ "Daha sonra tekrar deneyin.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Çalıştırabileceğiniz uygulama sayısını aştınız.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Parola en az 6 karakter uzunlukta olmalıdır, tekrar deneyin.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Bir parola bu karakter gruplarının en az ikisindeki karakterleri\n"
+#~ "içermelidir: büyük ve küçük harfler, rakamlar, işaretler.\n"
+#~ "Daha fazla bilgi için: 'man 1 passwd'\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Eski parolanızı yeniden kullanamazsınız.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Lütfen parola olarak kullanıcı adınız gibi şeyleri kullanmayınız!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Lütfen parola olarak ad-soyadı gibi şeyleri kullanmayınız!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Kullanımı: passwd [kullanıcıİsmi [parola]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Argümanlı kullanım sadece root için mümkündür.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Kullanımı: passwd [-foqsvV] [kullanıcı [parola]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "%s çalıştırılamıyor: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kullanıcı ismi bulunamıyor"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Diğerlerinin parolasını sadece root değiştirebilir.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Çok fazla argüman belirtildi.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Kullanıcı ismi hiçbir yerde bulunamıyor. `%s' gerçekten bir kullanıcı "
+#~ "ismi mi?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Sadece yerel parolalar değiştirilebilir. Bunun yerine yppasswd kullanın."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "Kullanıcı kimliği ile kullanıcı ismi uyuşmuyor, sahtekar!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "%s için parola değiştiriliyor\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Eski parolanızı yazınız: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Kuraldışı parola."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Yeni parolanızı yazınız: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Parola deÄŸiÅŸtirildi."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Yeni parolanızı tekrar yazınız: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Yanlış yazdınız. Parola değiştirilmedi."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "%s için parola değiştirildi"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT PAROLASI DEĞİŞTİRİLDİ"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "%s için parola root tarafından değiştirildi"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "parolayı kaydetmek için setpwnam çağrılıyor.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Parola deÄŸiÅŸtirilmedi! Daha sonra tekrar deneyin.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Parola deÄŸiÅŸtirildi.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: bu sürüm `nfs' türü için destek olmaksızın derlenmiş"
+
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Uyarı: %d bölümünden sonrakiler atlanıyor\n"
 
diff --git a/po/uk.gmo b/po/uk.gmo
new file mode 100644
index 000000000..154e95226
--- /dev/null
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index b42b4a318..528a94636 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2004-02-24 10:45+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -114,7 +114,7 @@ msgstr "%s: помилка ioctl дл� %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "Чт  ПоЧт  РзмС РзмБл    ПочСект    Розмір  При�трій\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Викори�танн�:\n"
@@ -158,13 +158,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "викори�танн�: %s [ -n ] при�трій\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s з %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -189,7 +188,7 @@ msgstr "Дві"
 msgid "Single"
 msgstr "Одна"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -204,99 +203,99 @@ msgstr ""
 " -v         більше подробиць\n"
 " файл       файл дл� перевірки\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: помилка %d при декомпре�ії! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: помилковий розмір у �имволічному по�иланні `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  розти�каєть�� блок з %ld до %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: фіктивні права на `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  дірка на %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: �е-блочні (%ld) байти\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Безрозмірні (%ld проти %ld) байти\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: неправильний cramfs - помилкова довжина шл�ху\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: �компільовано без підтримки -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: попередженн� - не вдаєть�� визначити розмір файлової �и�теми\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s не є блочним при�троєм чи файлом\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: неправильний cramfs - довжина файлу надто коротка\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: неправильний cramfs - неправильна �игнатура\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: попередженн� - довжина файлу надто велика, доповнений образ?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: неправильний cramfs - помилка контрольної �уми\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: попередженн� - �тарий тип cramfs образу, немає контрольної �уми\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: неправильний cramfs - неправильний �уперблок\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: неправильний cramfs - кінець даних каталогу (%ld) != початку файлових "
 "даних (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: неправильний cramfs - неправильний з�ув файлових даних\n"
@@ -774,7 +773,7 @@ msgstr "надто багато вузлів - мак�имум 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "не ви�тачає про�тору, потрібно принаймні %lu блоків"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "При�трій: %s\n"
@@ -843,18 +842,18 @@ msgstr "помилка запи�у елемента '..'"
 msgid "error closing %s"
 msgstr "помилка закриванн� %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Викори�танн�: mkfs [-V] [-t типФС] [параметри-ФС] при�трій [розмір]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: �едо�татньо пам'�ті!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs вер�ії %s (%s)\n"
@@ -917,7 +916,6 @@ msgstr ""
 "Перевищено MAXENTRIES. Збільште це значенн� у mkcramfs.c та перекомпілюйте.\n"
 "Завершенн�.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -972,10 +970,6 @@ msgstr "не ви�тачає про�тору дл� ROM образу (виді
 msgid "ROM image write failed (%d %d)\n"
 msgstr "помилка запи�у ROM обрізу (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1051,7 +1045,6 @@ msgstr "не вдаєть�� запи�ати вузли"
 msgid "write failed in write_block"
 msgstr "помилка запи�у у функції write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1087,7 +1080,7 @@ msgstr "помилка позиціюванн� при перевірці бло
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "�езрозуміле значенн� у функції do_check: можливо помилка\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "помилка позиціюванн� у функції check_blocks"
 
@@ -1129,107 +1122,107 @@ msgstr "не вдаєть�� запу�тити %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "файлова �и�тема не буде �творена на '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "�еправильний вказаний кори�тувачем розмір �торінки %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Викори�товуєть�� вказаний кори�тувачем розмір �торінки %d, замі�ть �и�темних "
 "значень %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Передбачаєть�� розмір �торінки %d (а не %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "етикетка"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Викори�танн�: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/назва [блоки]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "надто багато пошкоджених �торінок"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "�едо�татньо пам'�ті"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "одна пошкоджена �торінка\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d пошкоджених �торінок\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: помилка: �е вказано де �творити підкачку?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: помилка: розмір %ld більший ніж розмір при�трою %d\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: помилка: невідома вер�і� %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: помилка: обла�ть підкачки повинна бути принаймні %ldкб\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: попередженн�: обла�ть підкачки від�ікаєть�� до %ldкб\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: помилка: �е вказано де �творити підкачку?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "�е буде �творено при�трій підкачки на '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "фатальна помилка: не вдаєть�� прочитати першу �торінку"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1243,123 +1236,85 @@ msgstr ""
 "на цьому розділі, тоді викори�товуйте параметр -f дл� приму�ового "
 "�творенн�.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "не вдаєть�� в�тановити про�тір підкачки: не вдаєть�� прочитати"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "В�тановлюєть�� обла�ть підкачки вер�ії %d, розмір = %llu кб\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "помилка позиціюванн� на початок при�трою підкачки"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "не вдаєть�� запи�ати �торінку підпи�у"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "помилка виконанн� fsync"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "�еправильне чи�ло: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Синтак�ична помилка: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "�емає такого набору параметрів: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] при�трій назва\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] при�трій розмір �ект головок доріжок stretch gap rate spec1 "
-"fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] при�трій\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] при�трій\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "�е викори�тано"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Вільний про�тір"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Ди�к було змінено.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Перезавантажте �и�тему щоб впевнити�ь, що таблиц� розділів коректно "
 "оновлена.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1372,340 +1327,321 @@ msgstr ""
 "DOS 6.x розділи, перегл�ньте man �торінку з cfdisk\n"
 "щоб отримати докладнішу інформацію.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "Ф�Т�ЛЬ�� ПОМИЛК�"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "�ати�ніть будь-�ку клавішу дл� завершенн� cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Помилка позиціюванн� на ди�ковому при�трої"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "не вдаєть�� прочитати ди�ковий при�трій"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "не вдаєть�� запи�ати на ди�ковий при�трій"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "�адто багато розділів"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Розділ починаєть�� перед �ектором 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Розділ закінчуєть�� перед �ектором 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Розділ починаєть�� пі�л� кінц� ди�ку"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Розділ закінчуєть�� пі�л� кінц� ди�ку"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Розділ закінчуєть�� у о�танньому неповному циліндрі"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "логічні розділи не у тому пор�дку �к на ди�ку"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "логічні розділи перекривають��"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "збільшені логічні розділи перекривають��"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Внутрішн� помилка �творенн� логічного при�трою без розширеного "
 "розділу !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "не вдаєть�� �творити тут логічний при�трій -- буде �творено два розширених "
 "розділи"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Пункт меню надто довгий. Меню вигл�датиме дивно."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Меню без орієнтації. Типова орієнтаці� - горизонтальна."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "�еправильний ключ"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "�ати�ніть будь-�ку клавішу дл� продовженн�"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Первинний"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Створити новий розділ"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Логічний"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Створити новий логічний при�трій"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "�е �творювати розділ"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Внутрішн� помилка !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Розмір (у MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Початок"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Додати розділ на початку вільного про�тору"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Кінець"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Додати розділ наприкінці вільного про�тору"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "�едо�татньо про�тору дл� �творенн� розширеного розділу"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "від�утн� таблиц� розділів.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "�емає таблиці розділів або невідома �игнатура таблиці розділів"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Про�то виве�ти таблицю розділів"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "від�утн� таблиц� розділів.\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Бажаєте почати з нульової таблиці [y/N] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Ви вказали більше циліндрів ніж є на ди�ку"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "не вдаєть�� відкрити при�трій ди�ку"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Відкритий ди�к лише дл� читанн� - у ва� немає прав дл� запи�у"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "не вдаєть�� отримати розмір ди�ку"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "�еправильний первинний розділ"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "�еправильний логічний розділ"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Увага!! Це може знищити дані на ди�ку!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Ви впевнені, що бажаєте запи�ати таблицю розділів на ди�к? (yes або no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "�е запи�увати таблицю розділів на ди�к"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Введіть `yes'(так) або `no'(ні)"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Запи�уєть�� таблиц� розділів на ди�к..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Таблиц� розділів запи�ана на ди�к"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Таблиц� розділів запи�ана, але виникла помилка при її перечитуванні. "
 "Перезавантажте�ь дл� оновленн� таблиці."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "�емає первинних розділів позначених �к завантажувальні. DOS MBR не зможе "
 "завантажувати�ь."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Більш ніж один розділ позначений �к завантажувальний. DOS MBR не зможе "
 "завантажувати�ь."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Введіть назву файлу або нати�ніть Enter, щоб відобразити екран: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "не вдаєть�� відкрити файл '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Ди�ковий при�тій: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Сектор 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Сектор %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   �емає    "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Перв/Лог "
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Первинний"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Логічний "
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "�евідомий"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Заван."
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "�емає"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Таблиц� розділів дл� %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "            Перший    О�танній\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 " # Тип      Сектор   Сектор   З�ув    Довжина  Тип файл. �и�теми(ID) Ознаки\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1713,469 +1649,466 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Початок---       ----Кінець----   Початк.   Кільк.\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Ознак Гол  Сект Цил   ID  Гол  Сект Цил    Сектор  Секторів\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "�еформатов."
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Виве�ти таблицю у 'неформатованому' вигл�ді"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Сектори"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Виве�ти таблицю �ортовану за �екторами"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Таблиц�"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Про�то виве�ти таблицю розділів"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "�е виводити таблицю"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Екран з довідкою дл� cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Це cfdisk - кон�ольна програма роботи з розділами на базі curses, �ка"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "дозвол�є �творювати, видал�ти та змінювати розділи вашого"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "жор�ткого ди�ку."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Команда      Призначенн�"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -----------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Перемикнути ознаку завантаженн� поточного розділу"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Видалити поточний розділ"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Змінити параметри: циліндри, головки, �ектори-на-доріжку"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             УВ�Г�: Цей параметр повинен викори�товувати�ь лише людьми"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             �кі знають, що вони робл�ть."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Виве�ти цю довідку"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Мак�имізувати викори�танн� ди�ку поточним розділом"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Зауважте: це може зробити розділ не�умі�ним з"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Створити новий розділ у вільному про�торі"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Виве�ти таблицю розділів на екран або у файл"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Є декілька форматів виводу розділів:"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr " "
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - не форматовані дані (у вигл�ді, в �кому вони запишуть�� "
 "на ди�к)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Таблиц� �ортована по �екторам"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - таблиц� не форматованих даних"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Вийти з програми без запи�у таблиці розділів"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Змінити тип файлової �и�теми"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Змінити одиниці вимірюванн� розміру розділів"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Перемикає між Мб, �екторами та циліндрами"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Запи�ати таблицю розділів на ди�к ( W повинен бути в верхньому "
 "регі�трі)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Це може зруйнувати дані на ди�ку, тому необхідно або"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             підтвердити або відмовити�ь від запи�у набравши `yes' чи "
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "СтрілкаВгору Перемі�тити кур�ор на попередню позицію"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "СтрілкаВниз  Перемі�тити кур�ор у на�тупну позицію"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Оновлює вмі�т екрану"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Виводить цю довідку"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Зауважте: В�і команди ввод�ть�� або у нижньому або у верхньому"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "регі�трах (за вин�тком (W)запи�у)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Циліндрів"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Змінити геометрію циліндру"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Головки"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Змінити геометрію головки"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Змінити геометрію �ектору"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Виконано"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Завершити зміну геометрії"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Введіть кількі�ть циліндрів: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "�едопу�тиме значенн� циліндрів"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Введіть геометрію головок: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "�едопу�тиме значенн� головок"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Введіть кількі�ть �екторів на доріжку: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "�едопу�тиме значенн� �екторів"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Введіть тип файлової �и�теми: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Тип ФС не може бути порожнім"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "�е можна змінювати тип ФС на розширений"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "�евід(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", �К"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "�К"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Перв/Лог"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "�евідомий (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "При�тій ди�ку: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Розмір: %lld байт, %lld Мб"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Розмір: %lld байт, %lld.%lld Гб"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Головок: %d   Секторів на доріжку: %d   Циліндрів: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "�азва"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Ознаки"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Тип розд."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Тип ФС"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Позначка]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Секторів"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Циліндрів"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "Розмір (Мб)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "Розмір (Гб)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Завантаж."
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Перемикнути ознаку завантаженн� поточного розділу"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Видалити"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Видалити поточний розділ"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Геометрі�"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Змінити геометрію ди�ку (лише дл� фахівців)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Довідка"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Виве�ти вікно з довідкою"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Мак�имум"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Мак�имізувати викори�танн� ди�ку поточним розділом (дл� фахівців)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "�овий"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Створити новий розділ у вільному про�торі"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Виве�ти"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Виве�ти таблицю розділів на екран або у файл"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Вихід"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Вийти з програми без запи�у таблиці розділів"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Тип"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Змінити тип файлової �и�теми (DOS, Linux, OS/2 та ін.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Одиниці"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Змінити одиниці вимірюванн� розмірів розділу (МБ. �ект, цил)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Запи�ати"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Запи�ати таблицю розділів на ди�к (може зіп�увати дані)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "не вдаєть�� зробити розділ завантажувальним"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "не вдаєть�� видалити порожній розділ"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "не вдаєть�� мак�имізувати цей розділ"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Цей розділ не викори�товуєть��"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Цей розділ вже викори�товуєть��"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "не вдаєть�� змінити тип порожнього розділу"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "�емає більше розділів"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "�еправильна команда"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2246,9 +2179,9 @@ msgstr ""
 "\n"
 "BSD етикетка при�трою: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Команда ді�"
 
@@ -2268,10 +2201,9 @@ msgstr "   i   в�тановити bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   перелік відомих типів файлових �и�тем"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   виве�ти це меню"
 
@@ -2283,14 +2215,14 @@ msgstr "   n   додати новий BSD розділ"
 msgid "   p   print BSD partition table"
 msgstr "   p   виве�ти таблицю розділів BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   вийти без збереженн� змін"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   повернути�ь до головного меню"
 
@@ -2333,13 +2265,13 @@ msgstr "�емає *BSD розділів на %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Команда режиму BSD етикетки ди�ку (m - довідка): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Перший %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "О�танній %s або +size або +sizeM або +sizeK"
@@ -2384,8 +2316,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " пошк.�ект"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2486,8 +2416,8 @@ msgstr "�екторів/доріжку"
 msgid "tracks/cylinder"
 msgstr "доріжок/циліндр"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "циліндри"
 
@@ -2544,7 +2474,7 @@ msgstr "В�тановлено у %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Розділ (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Вже �творено мак�имальну кількі�ть розділів\n"
@@ -2568,7 +2498,7 @@ msgstr ""
 "\n"
 "Синхронізують�� ди�ки.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2588,7 +2518,7 @@ msgstr ""
 "-u: виводити початковий та кінцевий �ектори (замі�ть циліндрів)\n"
 "-b 2048: (дл� де�ких MO ди�ків) викори�товують�� 2048-байтові �ектори\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2604,198 +2534,184 @@ msgstr ""
 "  або: fdisk /dev/rd/c0d0  або: fdisk /dev/ida/c0d0  (RAID при�трої)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "не вдаєть�� відкрити %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "не вдаєть�� прочитати %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "не вдаєть�� перейти на %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "не вдаєть�� запи�ати %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "помилка BLKGETSIZE ioctl на %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "не вдаєть�� виділити додаткову пам'�ть\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Фатальна помилка\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   перемикнути ознаку лише-дл�-читанн�"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   редагувати bsd етикетку ди�ку"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   перемикнути ознаку монтуванн�"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   видалити розділ"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   перелік відомих типів розділів"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   додати новий при�трій"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   �творити нову порожню DOS таблицю розділів"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   виве�ти таблицю розділів"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   �творити нову порожню Sun етикетку ди�ку"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   змінити �и�темний ідентифікатор розділу"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   змінити одиниці відображенн�/вводу"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   перевірити таблицю розділів"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   запи�ати таблицю на ди�к та вийти"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   додаткова функціональні�ть (дл� фахівців)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   вибрати завантажувальний розділ"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   редагувати елемент завантажувального файлу"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   вибрати sgi розділ підкачки"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   перемикнути ознаку завантаженн�"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   перемикнути ознаку �умі�но�ті з dos"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   змінити кількі�ть запа�них циліндрів"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   змінити кількі�ть циліндрів"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   виве�ти таблицю розділів у не форматованому вигл�ді"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e  змінити кількі�ть додаткових �екторів на циліндр"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   змінити кількі�ть головок"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   змінити фактор чергуванн�"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   змінити швидкі�ть обертанн� (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   змінити кількі�ть �екторів/доріжку"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   змінити кількі�ть фізичних циліндрів"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   перемі�тити початок даних розділу"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   виве�ти �пи�ок розширених розділів"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   �творити IRIX (SGI) таблицю розділів"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   виправити пор�док розділів"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "�еобхідно в�тановити"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "головки"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "�ектори"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2804,11 +2720,11 @@ msgstr ""
 "%s%s.\n"
 "Ви можете зробити це з меню додаткових функцій.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " та "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2827,29 +2743,29 @@ msgstr ""
 "2) завантаженн�м та зміною розділів з інших операційних �и�тем\n"
 "   (наприклад, DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "�еправильний з�ув у головному розширеному розділі\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Попередженн�: додатковий вказівник у таблиці розділів %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Попередженн�: додаткові дані у таблиці розділів проігноровано %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2862,17 +2778,17 @@ msgstr ""
 "буде втрачено.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Примітка: розмір �ектору %d (не %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Ви не зможете запи�ати таблицю розділів.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2881,7 +2797,7 @@ msgstr ""
 "Цей ди�к має �к DOS �игнатуру, так і BSD.\n"
 "Дайте команду 'b', щоб перейти у BSD режим.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2890,17 +2806,17 @@ msgstr ""
 "При�трій не мі�тить ані правильної DOS таблиці розділів, ані Sun, SGI чи OSF "
 "етикетки ди�ку\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Внутрішн� помилка\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Додаткові розширені розділи ігнорують�� %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2909,7 +2825,7 @@ msgstr ""
 "Попередженн�: неправильна ознака 0x%04x таблиці розділів %d буде виправлена "
 "при w(запи�у)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2918,83 +2834,83 @@ msgstr ""
 "\n"
 "тричі отримано EOF - завершенн�..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Ші�тнадц�тковий код (наберіть L щоб перегл�нути перелік кодів)"
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, типово %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Викори�товуєть�� типове значенн� %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Значенн� за межами діапазону.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "�омер розділу"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Попередженн�: розділ %d має порожнє поле типу\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Вибраний розділ %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ще не визначено жодного розділу!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "В�і первинні розділи вже були визначені!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "циліндр"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "�ектор"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Змінюють�� одиниці відображенн�/вводу на %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "УВ�Г�: Розділ %d є розширеним розділом\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Ознаку �умі�но�ті з DOS в�тановлено\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Ознаку �умі�но�ті з DOS не в�тановлено\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Розділ %d ще не і�нує!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3007,7 +2923,7 @@ msgstr ""
 "можливо, нероз�удливо. Ви можете видалити\n"
 "розділ викори�товуючи команду `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3016,7 +2932,7 @@ msgstr ""
 "�е можна перетворювати первинний розділ у розширений, або навпаки\n"
 "Спочатку видаліть його.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3027,7 +2943,7 @@ msgstr ""
 "тому що на це покладають�� SunOS/Solaris, та Linux також це �приймає.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3038,52 +2954,52 @@ msgstr ""
 "та розділу 11 на ве�ь том (6), тому що IRIX на це покладаєть��.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Змінено тип �и�теми розділу %d на %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "У розділу %d відрізн�ють�� фізичний та логічний початок (не-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     фіз=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "логічний=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "У розділу %d відрізн�ють�� фізичний та логічний кінці:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Розділ %i не починаєть�� на межі циліндру:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "повинно бути (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Розділ %i не закінчуєть�� на межі циліндру.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "повинно бути (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3092,7 +3008,7 @@ msgstr ""
 "\n"
 "Ди�к %s: %ld Мб, %lld байт\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3101,17 +3017,17 @@ msgstr ""
 "\n"
 "Ди�к %s: %ld.%ld Гб, %lld байт\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d головок, %d �екторів/доріжку, %d циліндрів"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", загалом %llu �екторів"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3120,7 +3036,7 @@ msgstr ""
 "Одиниці виміру = %s з %d * %d = %d байт\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3129,7 +3045,7 @@ msgstr ""
 "�емає що робити. Пор�док вже коректний.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3137,16 +3053,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Завант  Початок     Кінець     Блоків  Ід  Си�тема\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "При�трій"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3155,7 +3071,7 @@ msgstr ""
 "\n"
 "Елементи таблиці розділів не у тому пор�дку, �к на ди�ку\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3166,83 +3082,83 @@ msgstr ""
 "Ди�к %s: %d головок, %d �екторів, %d циліндрів\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "№ �кт Гол Сек Цил Гол Сек  Цил  Початок   Розмір Ід\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Попередженн�: розділ %d мі�тить нульовий �ектор\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Розділ %d: головка %d перевищує мак�имум %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Розділ %d: �ектор %d перевищує мак�имум %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Розділ %d: циліндр %d перевищує мак�имум %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Розділ %d: кількі�ть попередніх �екторів %d відрізн�єть�� від загальної %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Попередженн�: неправильна обла�ть початку даних у розділі %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Попередженн�: розділ %d перекриваєть�� з розділом %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Попередженн�: розділ %d порожній\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Логічний розділ %d не вміщуєть�� цілком у розділ %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Загальна кількі�ть розподілених �екторів %d перевищує мак�имум %d\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%d нерозподілених �екторів\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Розділ %d вже визначений.  Видаліть його перед повторним додаванн�м.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "�емає на�вних вільних �екторів\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3255,23 +3171,23 @@ msgstr ""
 "\tDOS таблицю розділів. (Викори�товуйте команду o.)\n"
 "\tЗ�СТЕРЕЖЕ��Я: Це призведе до знищенн� поточного вмі�ту ди�ку.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Спочатку необхідно видалити де�кий розділ та додати розширений розділ\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "логічні розділи не у тому пор�дку �к на ди�ку"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "�еправильний первинний розділ"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3282,20 +3198,20 @@ msgstr ""
 "   %s\n"
 "   p   первинний розділ (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   логічний (5 або більше)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   розширений"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "�еправильний номер розділу дл� типу `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3304,12 +3220,12 @@ msgstr ""
 "Таблиц� розділів була змінена!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Викликаєть�� ioctl(), щоб перечитати таблицю розділів.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3322,7 +3238,7 @@ msgstr ""
 "Ядро до�і викори�товує �тару таблицю розділів.\n"
 "�ова таблиц� розділів викори�товуватиметь�� пі�л� перезавантаженн�.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3335,75 +3251,75 @@ msgstr ""
 "розділи, перегл�ньте man-�торінку з fdisk дл� отриманн� додаткової\n"
 "інформації.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Помилка закриванн� %s\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Синхронізаці� ди�ків.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Розділ %d не має обла�ті даних\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "�овий початок даних"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Команди ек�пертного режиму(m - довідка): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Кількі�ть циліндрів"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Кількі�ть головок"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Кількі�ть �екторів"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Попередженн�: в�тановлюєть�� з�ув �ектору дл� �умі�но�ті з DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Ди�к %s не мі�тить правильної таблиці розділів\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "не вдаєть�� відкрити %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "не вдаєть�� відкрити %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: невідома команда\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Це �дро визначає розмір �ектору �аме, тому -b параметри проігноровано\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3412,17 +3328,16 @@ msgstr ""
 "Попередженн�: з вказаним при�троєм повинен викори�товувати�ь параметр -b "
 "(в�тановити розмір �ектора)\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Знайдено OSF/1 етикетку ди�ку на %s, перехід у режим етикетки ди�ку.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Команда (m - довідка): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3431,16 +3346,16 @@ msgstr ""
 "\n"
 "Поточний файл завантаженн�: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Введіть назву нового файлу завантаженн�: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Файл завантаженн� не змінено\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3507,15 +3422,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3594,7 +3509,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s �ектор%5u розмір%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3651,7 +3565,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "При�утній більш ніж один елемент ди�ку.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "�е визначено розділів\n"
@@ -3736,7 +3650,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tВи вибрали незвичайну назву файлу завантаженн�.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3756,11 +3669,10 @@ msgstr ""
 "�е дотримувати�ь цього можуть лише \"SGI volume\" на ве�ь ди�к.\n"
 "Введіть YES, �кщо ви впевнені, що хочете позначити цей розділ по-іншому.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "YES\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3834,44 +3746,43 @@ msgstr "Спроба зберегти параметри розділу %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ІД=%02x\tПОЧ�ТОК=%d\tДОВЖИ��=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Порожн"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Ве�ь ди�к"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3884,12 +3795,12 @@ msgstr ""
 "такі �к головки, �ектори, циліндри та розділи\n"
 "або приму�ово очи�тити етикетку (команда s у головному меню)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "�втоматичне визначенн� знайшло %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3902,7 +3813,7 @@ msgstr ""
 "буде втрачено.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3912,72 +3823,72 @@ msgstr ""
 "   ?   авто конфігураці�\n"
 "   0   вла�ний (з автоматично знайденими типовими значенн�ми)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Виберіть тип (? автоматично, 0 вла�ний): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Помилка при автоматичному визначенні.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Секторів/доріжку"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Запа�ні циліндри"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Фізичні �ектори"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Швидкі�ть обертанн� (об/хв)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Фактор чергуванн�"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Додаткових �екторів у циліндрі"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Ви можете змінити в�і параметри ди�ку з меню x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" ди�кета"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Розділ %d не закінчуєть�� на межі циліндру\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Розділ %d перекриваєть�� з іншим у �екторах %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "�евикори�таний про�тір - �ектори 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "�евикори�таний про�тір - �ектори %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3986,7 +3897,7 @@ msgstr ""
 "Інші розділи вже займають ве�ь ди�к.\n"
 "Видаліть ча�тину/зменшіть їх розмір перед �пробою.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3997,7 +3908,7 @@ msgstr ""
 "%d %s перекриває де�кий інший розділ. Ваш елемент було змінено\n"
 "на %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4007,7 +3918,7 @@ msgstr ""
 "�к\n"
 "ве�ь ди�к(5), починаючи з 0, розміром %u �екторів\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4021,7 +3932,7 @@ msgstr ""
 "Введіть YES, �кщо ви �правді впевнені, що бажаєте позначити розділ\n"
 "типом 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4040,7 +3951,7 @@ msgstr ""
 "Одиниці виміру = %s з %d * 512 байт\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4053,16 +3964,16 @@ msgstr ""
 "Одиниці виміру = %s з %d * 512 байт\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Ознака Початок    Кінець     Блоки   Ід  Си�тема\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Кількі�ть запа�них циліндрів"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Кількі�ть фізичних циліндрів"
 
@@ -4086,32 +3997,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Extended"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX bootable"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4120,7 +4025,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4213,12 +4117,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4239,8 +4141,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4250,7 +4150,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD or SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4271,12 +4170,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old  Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4307,12 +4204,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4321,7 +4216,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4387,30 +4281,22 @@ msgstr "�е-ФС дані"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4419,117 +4305,110 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secondary"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "помилка позиціюванн� %s - не вдаєть�� перейти на %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "помилка позиціюванн�: очікувало�ь 0x%08x%08x, отримано 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "недо�татньо пам'�ті - відмова\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "помилка читанн� %s - не вдаєть�� прочитати �ектор %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ПОМИЛК�: �ектор %lu немає msdos �игнатури\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "помилка запи�у на %s - не вдаєть�� запи�ати �ектор %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "не вдаєть�� відкрити файл збереженн� �ектору розділу (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "помилка запи�у на %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "не вдаєть�� отримати інформацію про файл відновленн� розділу (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "файл відновленн� розділу має неправильний розмір - відміна відновленн�\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "недо�татньо пам'�ті\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "не вдаєть�� відкрити файл відновленн� (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "помилка читанн� %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "не вдаєть�� відкрити при�трій %s дл� запи�у\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "помилка запи�у �ектору %lu на %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Ди�к %s: не вдаєть�� отримати геометрію\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Ди�к %s: не вдаєть�� отримати розмір\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4540,22 +4419,22 @@ msgstr ""
 "Викори�танн� fdisk дл� нього мабуть безглуздо..\n"
 "[Викори�товуйте параметр --force, �кщо ви дій�но цього бажаєте]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Попередженн�: HDIO_GETGEO вказує, що є %lu головок\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Попередженн�: HDIO_GETGEO вказує, що є %lu �екторів\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Попередженн�: BLKGETSIZE/HDIO_GETGEO вказує, що є %lu циліндрів\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4565,7 +4444,7 @@ msgstr ""
 "63\n"
 "Це буде �причин�ти проблеми з у�ім ПЗ, �ке викори�товує C/H/S адре�ацію.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4574,7 +4453,7 @@ msgstr ""
 "\n"
 "Ди�к %s: %lu циліндрів, %lu головок, %lu �екторів/доріжку\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4582,7 +4461,7 @@ msgstr ""
 "%s з розділу %s має неможливе значенн� кілько�ті головок: %lu (му�ить бути 0-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4591,7 +4470,7 @@ msgstr ""
 "%s з розділу %s має неможливе значенн� кілько�ті �екторів: %lu (му�ить бути "
 "1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4600,7 +4479,7 @@ msgstr ""
 "%s з розділу %s має неможливе значенн� кілько�ті циліндрів: %lu (му�ить бути "
 "0-%lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4609,12 +4488,12 @@ msgstr ""
 "Ідентиф. �азва\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Перечитуєть�� таблиц� розділів ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4622,31 +4501,31 @@ msgstr ""
 "Команда перечитуванн� таблиці розділів завершила�ь аварійно\n"
 "Перезавантажте �и�тему перед викори�танн�м mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Помилка закриванн� %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: немає такого розділу\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "нерозпізнаний формат - викори�товують�� �ектори\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# таблиц� розділів ди�ку %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "нереалізований формат - викори�товуєть�� %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4655,12 +4534,12 @@ msgstr ""
 "Одиниці виміру = циліндри по %lu байт, блоки по 1024 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "При�трій Завант Початок Кінець Циліндрів Блоків   Ід  Си�тема\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4669,12 +4548,12 @@ msgstr ""
 "Одиниці виміру = �ектори по 512 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "При�трій Завант Початок    Кінець   Секторів  Ід  Си�тема\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4683,12 +4562,12 @@ msgstr ""
 "Одиниц� виміру = блоки по 1024 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "При�трій Завант Початок   Кінець     Блоків   Ід  Си�тема\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4698,32 +4577,32 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "  При�трій Завант Початок Кінець Мб     Блоків   Ід  Си�тема\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tпочаток: (c,h,s) очікувало�ь (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tкінець: (c,h,s) очікувало�ь (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "розділ закінчуєть�� на циліндрі  %ld, за межею об��гу ди�ку\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "�е знайдено розділів\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4734,51 +4613,51 @@ msgstr ""
 "  дл� C/H/S=*/%ld/%ld (замі�ть %ld/%ld/%ld).\n"
 "Дл� цього виводу вважатиметь�� ц� геометрі�.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "від�утн� таблиц� розділів.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "дивно, визначено лише %d розділів.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Попередженн�: розділ %s має розмір 0, але не позначений порожнім\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Попередженн�: розділ %s має розмір 0 та позначений завантажувальним\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Попередженн�: розділ %s має розмір 0 але починаєть�� не з нул�\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Попередженн�: розділ %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "не розташований у розділі %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Попередженн�: розділи %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "та %s перекривають��\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4787,17 +4666,17 @@ msgstr ""
 "Попередженн�: розділ %s мі�тить ча�тину таблиці розділів (�ектор %lu),\n"
 "та її буде знищено при його заповненні\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Попередженн�: розділ %s починаєть�� з �ектор 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Попередженн�: розділ %s поширюєть�� за межі ди�ку\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4805,17 +4684,17 @@ msgstr ""
 "Крім первинних розділів, принаймні один може бути розширеним\n"
 " (хоча це не проблема дл� Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Попередженн�: розділ %s починаєть�� не з межі циліндра\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Попередженн�: розділ %s не закінчуєть�� на межі циліндра\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4825,7 +4704,7 @@ msgstr ""
 "Це не має значенн� дл� Lilo, але DOS MBR не зможе завантажувати�ь з цього "
 "ди�ку.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4833,7 +4712,7 @@ msgstr ""
 "Попередженн�: зазвичай можна завантажувати�ь лише з первинних розділів\n"
 "LILO не звертає уваги на ознаку `завантажувальний'.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4842,11 +4721,11 @@ msgstr ""
 "(активним)\n"
 "Це не�уттєво дл� LILO, але DOS MBR не зможе завантажувати�ь з цього ди�ку.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "початок"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4854,22 +4733,22 @@ msgstr ""
 "розділ %s: початок: (c,h,s) очікувало�ь (%ld,%ld,%ld) знайдено (%ld,%ld,%"
 "ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "кінець"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "розділ %s: кінець: (c,h,s) очікувало�ь (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "розділ %s закінчуєть�� на циліндрі %ld, за межами ди�ку\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4878,7 +4757,7 @@ msgstr ""
 "Попередженн�: зміщено початок розширеного розділу з %ld на %ld\n"
 "(Лише дл� відображенн�. �е змінюйте вмі�т.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4886,133 +4765,132 @@ msgstr ""
 "Попередженн�: розширений розділ не починаєте�� на межі циліндра.\n"
 "DOS та Linux будуть інтерпретувати вмі�т по-різному.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "надто багато розділів - ігноруєть�� попередній nr (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "дерево розділів?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "знайдено Disk Manager - це нне вдаєть��обробити\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "знайдено DM6 �игнатуру - відміна операції\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "дивно..., розширений розділ нульового розміру?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "дивно..., BSD розмір нульового розміру?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: нерозпізнаний розділ\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "вказано параметр -n: �ічого не змінено\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "не вдаєть�� зберегти �тарі �ектори - виконанн� перервано\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "не вдаєть�� запи�ати розділ на %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "довгий або незавершений вхідний р�док - завершенн�\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "помилка вводу: очікував�� �имвол `=' пі�л� пол� %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "помилка вводу: очікував�� �имвол %c пі�л� пол� %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "нерозпізнаний ввід: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "чи�ло занадто велике\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "не цифри пі�л� чи�ла\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "немає мі�ц� дл� де�криптору розділу\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "не вдаєть�� �творити оточуючий розширений розділ\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "надто багато вхідних полів\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "�емає більше мі�ц�\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "�едопу�тимий тип\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Попередженн�: вказаний розмір (%lu) перевищує допу�тимий розмір (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Попередженн�: порожній розділ\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Попередженн�: неправильний початок розділу (раніше %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "не розпізнана завантажувальна ознака - виберіть - або *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "ча�ткова �пецифікаці� цил,гол,�ект?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Розширений розділ не там де має бути розширений\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "неправильний ввід\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "надто багато розділів\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5024,108 +4902,104 @@ msgstr ""
 "Зазвичай, вам необхідно лише вказати <початок> та <розмір> (та можливо "
 "<тип>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "вер�і�"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Викори�танн�: %s [параметри] при�трій ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "при�трій: що�ь на зразок /dev/hda чи /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "кори�ні параметри:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [або --show-size]: виве�ти розмір розділу"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [або --id]:        виве�ти або змінити ідентифікатор розділу"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [або --list]:      виве�ти розділи кожного при�трою"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [або --dump]:      те ж �аме, але у форматі прийн�тному дл� "
 "подальшого вводу"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [або --increment]: кількі�ть циліндрів починаєть�� з 1, а не з 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:   ввід/вивід у одиниц�х �ектори/блоки/циліндри/Мб"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [або --list-types]:виве�ти в�і відомі типи розділів"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [або --DOS]:       дл� DOS-�умі�но�ті: втрачаєть�� трохи про�тору"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [або --re-read]:   зму�ити �дро перечитати таблицю розділів"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                 змінити лише розділ з номером #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                  не запи�увати нічого на ди�к"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O file :             зберегти у файл �ектори, �кі будуть перезапи�ані"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :             відновити ці �ектори знову"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [або --version]:   виве�ти вер�ію"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [або --help]:      виве�ти це повідомленн�"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "небезпечні параметри:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [або --show-geometry]: виве�ти видану �дром геометрію"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -g [або --show-geometry]: виве�ти видану �дром геометрію"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5133,115 +5007,115 @@ msgstr ""
 "    -x [або --show-extended]: також виве�ти перелік розширених розділів\n"
 "                              або очікувати їх де�криптори при вводі"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [або --Linux]:      не �каржити�ь на не�уттєві дл� Linux речі"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [або --quiet]:      не виводити попередженн�"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Ви можете перевизначити ви�влену геометрію викори�товуючи:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [або --cylinders #]:в�тановити кількі�ть циліндрів"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [або --heads #]:    в�тановити кількі�ть головок"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [або --sectors #]:  в�тановити кількі�ть �екторів"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Ви можете вимкнути перевірку логічно�ті за допомогою:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [або --force]:      виконувати команди приму�ово, навіть безглузді"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Викори�танн�:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s при�трій\t\t виве�ти активні розділи при�трою\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s при�трій n1 n2 ... активувати розділ n1 ..., де-активувати решту\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An при�трій\t активувати розділ n, де-активувати решту розділів\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "немає команди?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "загалом: %d блоків\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "викори�танн�: sfdisk --print-id при�трій номер_розділу\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "викори�танн�: sfdisk --change-id при�трій номер_розділу ідентиф.\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "викори�танн�: sfdisk --id при�трій номер_при�трою [ідентиф.]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "можна вказувати лише один при�трій (за вин�тком -l чи -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "неможливі відкрити %s дл� читанн�-запи�у\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "неможливі відкрити %s дл� читанн�\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Гаразд\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld циліндрів, %ld головок, %ld �екторів/трек\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "не вдаєть�� отримати розмір %s"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "неправильний 'активний' байт 0x%x замі�ть 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5249,7 +5123,7 @@ msgstr ""
 "Виконано\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5258,35 +5132,35 @@ msgstr ""
 "Позначено активними %d розділів. Це немає значенн� дл� LILO,\n"
 "�ле DOS MBR може завантажувати�ь лише з ди�ків, у �ких 1 активний розділ.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "розділ %s має ідентиф. %x та він не прихований\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "�еправильний Ідент. %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Цей ди�к наразі викори�товуєть��.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Фатальна помилка: не вдаєть�� знайти %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Попередженн�: %s не є блочним при�троєм\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Перевір�єть��, що ніхто наразі не викори�товує ди�к ...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5299,30 +5173,30 @@ msgstr ""
 "ди�ку.\n"
 "Викори�товуйте параметр --no-reread щоб обминути цю перевірку.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Викори�товуйте параметр --force, щоб відхилити в�і перевірки.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "Гаразд\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Старий �тан:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Розділ %d не і�нує, не вдаєть�� його змінити\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "�овий �тан:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5330,21 +5204,21 @@ msgstr ""
 "Ці розділи вигл�дають неправильно - нічого не змінено.\n"
 "(Якщо ви дій�но цього бажаєте, викори�товуйте параметр --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Ці розділи вигл�дають неправильно - можливо �лід відпові�ти No\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Ви цим задоволені? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Бажаєте запи�ати на ди�к? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5353,16 +5227,16 @@ msgstr ""
 "\n"
 "sfdisk: передча�не закінченн� вводу\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Завершенн� - нічого не змінено\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Відповідайте одне з y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5371,7 +5245,7 @@ msgstr ""
 "У�пішно запи�ано нову таблицю розділів\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5477,135 +5351,135 @@ msgstr "getopt (розширена) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "внутрішн� помилка, зв'�жіть�� з автором."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "�и�тема завантажена з MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD годинник\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "порт годинника на�троєно на 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "бо�зливий TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: помилка атомарної операці� %s за 1000 ітерацій!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "не вдаєть�� відкрити /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "не вдаєть�� отримати дозвіл, тому-що не було зроблено �проби.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s не вдаєть�� отримати до�туп до порту I/O:  помилка �и�темного виклику iopl"
 "(3).\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Можливо �лід мати права адміні�тратора.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Вважаєть��, що апаратний годинник �инхронізований з %s ча�ом.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "локальний"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Попередженн�: нерозпізнаний третій р�док у adjtime файлі\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Очікувало�ь: або `UTC', або `LOCAL', або порожній р�док.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "О�танн� корекці� відхиленн� виконана у %ld �екунд пі�л� 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "О�таннє калібруванн� виконано у %ld �екунд пі�л� 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "�паратний годинник налаштований на %s ча�\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "невідомий"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Очікуєть�� �игнал годинника...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...отримано �игнал годинника\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "�еправильне значенн� у апаратному годиннику: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Ча� апаратного годинника: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld �екунд пі�л� "
 "1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Ча� прочитаний з апаратного годинника: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "�паратний годинник в�тановлюєть�� у %.2d:%.2d:%.2d = %ld �екунд пі�л� 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Годинник не змінено - лише перевірка.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5614,7 +5488,7 @@ msgstr ""
 "Ча�, що минув з �инхронізації ча�у %.6f �екунд.\n"
 "Очікуєть�� до��гненн� на�тупної повної �екунди.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5624,22 +5498,22 @@ msgstr ""
 "(наприклад 50-й день мі��ц�), або за межами, �кі може обробити програма "
 "(наприклад 2095рік).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f �екунд\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "�е було вказано параметр --date.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "аргумент --date надто довгий\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5648,22 +5522,22 @@ msgstr ""
 "Значенн� аргументу --date не є правильною датою.\n"
 "Зокрема, воно мі�тить лапки.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Виконуєть�� команда date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "не вдаєть�� виконати команду 'date' у оболонці /bin/sh. Помилка popen()"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "вивід команди date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5678,7 +5552,7 @@ msgstr ""
 "Результат:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5695,12 +5569,12 @@ msgstr ""
 "Результат:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "р�док дати %s дорівнює %ld �екундам з 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5709,38 +5583,38 @@ msgstr ""
 "�паратний годинник мі�тить неправильний ча�, програма не може в�тановити по "
 "ньому �и�темний ча�.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Запу�каєть�� settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "Си�темний ча� не в�тановлюєть��, тому що запущений у те�товому режимі.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr ""
 "Дл� в�тановленн� �и�темного ча�у необхідно мати права адміні�тратора.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "помилка у settimeofday()"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5749,7 +5623,7 @@ msgstr ""
 "Коефіцієнт відхиленн� не корегуєть��, тому що попереднє значенн� апаратного "
 "годинника було неправильним.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5759,7 +5633,7 @@ msgstr ""
 "дорівнює нулю,\n"
 "тому попереднє значенн� неправильне та необхідне рекалібруванн�.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5768,7 +5642,7 @@ msgstr ""
 "Коефіцієнт відхиленн� не корегуєть��, тому що минуло менше доби з моменту "
 "о�таннього калібруванн�.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5779,24 +5653,24 @@ msgstr ""
 "поправочний коефіцієнт відхиленн� %f �екунд/добу.\n"
 "Коефіцієнт відхиленн� корегуєть�� на %f �екунд/добу\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "З моменту о�таннього корегуванн� минуло %d �екунд\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "�еобхідно в�тавити %d �екунд та знову перевірити ча� знову %.6f �екунд "
 "назад\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "У те�товому режимі файл adjtime не оновлюєть��.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5805,12 +5679,12 @@ msgstr ""
 "У файл %s було б запи�ано:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Параметри корекції відхиленн� не оновлені.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5818,28 +5692,28 @@ msgstr ""
 "У апаратному годиннику в�тановлено некоректний ча�, тому його не "
 "вдаєть���корегувати.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "�еобхідна корекці� менше ніж на одну �екунду, тому годинник не оновлюєть��.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Викори�товуєть�� %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "�е знайдено підтримуваного інтерфей�у годинника.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "не вдаєть�� в�тановити �и�темний ча�.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5851,17 +5725,17 @@ msgstr ""
 "Ц� копі� hwclock �компільована дл� іншої архітектури, ніж Alpha\n"
 "(тож, напевно, ц� �и�тема не є �и�темою Alpha). �і�ких дій не виконано.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "не вдаєть�� отримати значенн� епохи від �дра.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Ядро вважає, що значенн� епохи - %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5870,17 +5744,22 @@ msgstr ""
 "Щоб в�тановити значенн� епохи, необхідно викори�товувати параметр 'epoch' із "
 "зазначенн�м в�тановлюваного значенн�.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Епоха не в�тановлюєть�� у %d - лише те�туванн�.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "не вдаєть�� в�тановити значенн� епохи у �дрі.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s з %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5940,7 +5819,7 @@ msgstr ""
 "  --noadjfile   не обробл�ти /etc/adjtime. Вимагає викори�танн� або --utc,\n"
 "                або --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5950,12 +5829,12 @@ msgstr ""
 "                вказати hwclock тип вашої �и�теми alpha (дивіть�� hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s не очікує параметрів без ключів. Ви вказали %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5964,7 +5843,7 @@ msgstr ""
 "Ви вказали декілька функцій.\n"
 "Можна виконувати лише одну функцію одноча�но.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5973,7 +5852,7 @@ msgstr ""
 "%s: Параметри --utc та --localtime виключають одне одного. � ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -5982,28 +5861,28 @@ msgstr ""
 "%s: Параметри --adjust та --noadjfile виключають одне одного. � ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Разом з --noadjfile, необхідно вказувати або --utc, або --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Вказано неправильне значенн� ча�у. не вдаєть�� в�тановити годинник.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Змінювати значенн� апаратного годинника може лише адміні�тратор.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Змінювати �и�темний ча� може лише адміні�тратор.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6012,14 +5891,14 @@ msgstr ""
 "Змінювати значенн� епохи апаратного годинника у �дрі може лише "
 "адміні�тратор.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "не вдаєть�� отримати до�туп до апаратного годинника викори�товуючи будь-�кий "
 "відомий метод.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6053,7 +5932,6 @@ msgstr "помилка зчитуванн� ча�у у ioctl() з %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "помилка ioctl KDSHWCLK"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "не вдаєть�� відкрити /dev/tty1 чи /dev/vc/1"
@@ -6147,9 +6025,6 @@ msgstr "помилка у ioctl(RTC_EPOCH_READ) дл� %s"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "прочитано значенн� епохи %ld з %s через RTC_EPOCH_READ ioctl.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6176,7 +6051,6 @@ msgstr "помилка у ioctl(RTC_EPOCH_SET) дл� %s"
 msgid "calling open_tty\n"
 msgstr "викликаєть�� open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "викликаєть�� termio_init\n"
@@ -6185,7 +6059,6 @@ msgstr "викликаєть�� termio_init\n"
 msgid "writing init string\n"
 msgstr "запи�уєть�� р�док ініціалізації\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "перед auto_baud\n"
@@ -6199,7 +6072,6 @@ msgstr "пошук �имволу нового р�дка\n"
 msgid "read %c\n"
 msgstr "прочитано %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "читаєть�� реє�траційне ім'�\n"
@@ -6253,7 +6125,6 @@ msgstr "помилка chdir(\"/dev\"): %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: не є �имвольним при�троєм"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6268,12 +6139,10 @@ msgstr "/dev/%s: не вдаєтьÑ�Ñ� відкрити Ñ�тандартний Ð
 msgid "%s: not open for read/write"
 msgstr "%s: не вдаєть�� відкрити дл� читанн�/запи�у"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "виклик dup()\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6317,30 +6186,25 @@ msgstr ""
 "або\t[-hiLmw] [-l програма_входу] [-t ча�_очікуванн�] [-I р�док_ініц] [-H "
 "реє�трац_вузол] р�док швидкі�ть_передачі,... [тип_терміналу]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: недо�татньо пам'�ті, login може зазнати невдачі\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "не вдаєть�� виділити пам'�ть дл� ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "не вдаєть�� виділити пам'�ть дл� grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Вхід на %s з %s заборонений перманентно.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Вхід на %s з %s заборонений.\n"
@@ -6387,8 +6251,8 @@ msgstr "Зміна finger інформації дл� %s.\n"
 msgid "Password error."
 msgstr "Помилка паролю."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Пароль: "
@@ -6564,34 +6428,6 @@ msgstr "ВикориÑ�товуйте %s -l щоб переглÑ�нути Ñ�пиÑ
 msgid "No known shells.\n"
 msgstr "�емає відомих оболонок.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "не вдаєть�� відкрити /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "не вдаєть�� прочитати дані з /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "не вдаєть�� відкрити %s дл� читанн�"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "помилка при stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s не має правильних прав файлу"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "не вдаєть�� прочитати дані з %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6603,11 +6439,11 @@ msgstr ""
 "Викори�танн�: last [-#] [-f file] [-t tty] [-h назва_вузла] "
 "[кори�тувач ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  до�і у �и�темі"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6616,15 +6452,15 @@ msgstr ""
 "\n"
 "wtmp починаєть�� %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: помилка виділенн� пам'�ті.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: помилка gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6633,51 +6469,45 @@ msgstr ""
 "\n"
 "перервано %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Ф�Т�ЛЬ�� ПОМИЛК�: не вдаєть�� відкрити tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "Ф�Т�ЛЬ�� ПОМИЛК�: неправильний tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: параметр -h може викори�товувати лише адміні�тратор.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "викори�танн�: login [-fp] [ім'�_кори�тувача]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: помилка PAM, перервано: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "не вдаєть�� ініціалізувати PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Ім'�:"
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "ПОМИЛОК ВХОДУ %d З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6686,17 +6516,17 @@ msgstr ""
 "�екоректний вхід\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "��ДТО Б�Г�ТО ПОМИЛОК ВХОДУ (%d) З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "�ЕВД�ЛИЙ СЕ��С ВХОДУ З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6705,7 +6535,7 @@ msgstr ""
 "\n"
 "�екоректний вхід\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6714,135 +6544,120 @@ msgstr ""
 "\n"
 "Помилка в�тановленн� �еан�у, перервано.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL ім'� кори�тувача у %s:%d. Вихід."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "�еправильне ім'� кори�тувача \"%s\" у %s:%d. Вихід."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: �едо�татньо пам'�ті\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "�едопу�тиме ім'� кори�тувача"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s заборонено входити на цьому терміналі.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s З�БОРО�Е�О ВХОДИТИ З %s �� TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "ВХІД %s З�БОРО�Е�ИЙ �� TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "�екоректний вхід\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"�аразі у �и�темі надто багато кори�тувачів.\n"
-"Спробуйте пізніше.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Ви запу�тили надто багато проце�ів.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "ВХІД �� %s ВІД %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ВХІД ROOT �� %s З %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ВХІД ROOT �� %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "ВХІД �� %s КОРИСТУВ�Ч %s З %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "ВХІД �� %s КОРИСТУВ�Ч %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Дл� ва� є нова пошта.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Дл� ва� є пошта.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: помилка розгалуженн�: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "помилка TIOCSCTTY: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "помилка setuid()"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "�емає каталогу %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Вхід з домашнім каталогом = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: недо�татньо пам'�ті дл� �ценарію оболонки.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: не вдаєть�� виконати �ценарій оболонки: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: немає оболонки: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6851,65 +6666,65 @@ msgstr ""
 "\n"
 "%s ім'�: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "реє�траційне ім'� надто довге.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "Ім'� надто довге"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "реє�траційне ім'� не може починати�ь з '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "надто багато надмірних нових р�дків.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "��ДМІР�І �имволи нового р�дка"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Вийшов ча� очікуванн� входу пі�л� %d �екунд\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "О�танній вхід: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "з %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "на %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ПОМИЛК� ВХОДУ З %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ПОМИЛК� ВХОДУ �� %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ПОМИЛОК ВХОДУ З %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ПОМИЛОК ВХОДУ �� %s, %s"
@@ -6929,170 +6744,30 @@ msgstr "в�тановлено  n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "викори�танн�: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Ви хто?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: немає такої групи."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: До�туп заборонено"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "�емає оболонки"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Пароль повинен �кладати�� принаймні з 6 �имволів, �пробуйте ще раз.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Пароль повинен мі�тити �имволи двох на�тупних груп категорій:\n"
-"літери у верхньому та нижньому регі�трі, цифри та не алфавітно-цифрові\n"
-"�имволи. Додаткову інформацію дивіть�� у passwd(1).\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "�е можна викори�товувати �вій �тарий пароль.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "�е викори�товуйте ваше ім'� у �ко�ті паролю!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "�е викори�товуйте ваше �правжнє ім'� у �ко�ті паролю!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Викори�танн�: passwd [ім'�_кори�тувача [пароль]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-"Лише адміні�тратор може викори�товувати варіант з одним чи двома "
-"параметрами.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Викори�танн�: passwd [-foqsvV] [кори�тувач [пароль]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "не вдаєть�� виконати %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "не вдаєть�� знайти реє�траційне ім'�"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Лише адміні�тратор може змінювати пароль інших кори�тувачів.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "�адто багато параметрів.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"не вдаєть�� ніде знайти ім'� кори�тувача. Чи `%s' �правді ім'� кори�тувача?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Можна змінювати лише локальні паролі. Викори�товуйте yppasswd натомі�ть."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID та ім'� кори�тувача не відповідають одне одному, ви шахрай!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Змінюєть�� пароль дл� %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Введіть �тарий пароль: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "�еправильний пароль, шахрай."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Введіть новий пароль: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Пароль не змінено."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Введіть пароль повторно: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Паролі не �півпадають. Пароль не змінено."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "пароль змінено, кори�тувач %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "П�РОЛЬ �ДМІ�ІСТР�ТОР� ЗМІ�Е�О"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "пароль змінено адміні�тратором, кори�тувач %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "викликаєть�� setpwnam дл� в�тановленн� паролю.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Пароль �Е змінено. Спробуйте ще раз пізніше.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Пароль змінено.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7139,7 +6814,6 @@ msgstr "перезавантаженн� ініційоване %s: %s"
 msgid "halted by %s: %s"
 msgstr "завершенн� �и�теми ініційоване %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7176,7 +6850,6 @@ msgstr "Запу�каєть�� програма \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Помилка виконанн�\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7266,7 +6939,6 @@ msgstr "помилка в�тановленн� close-on-exec на /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "помилка запу�ку final_prog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "помилка �творенн� проце�у final_prog\n"
@@ -7295,7 +6967,7 @@ msgstr "помилка відкриванн� каталогу\n"
 msgid "fork failed\n"
 msgstr "помилка �творенн� проце�у\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "помилка запу�ку\n"
 
@@ -7444,12 +7116,6 @@ msgstr "неправильне значенн� мі��ц�: викори�то
 msgid "illegal year value: use 1-9999"
 msgstr "неправильне значенн� року: викори�товуйте 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7460,13 +7126,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "викори�танн�: cal [-13smjyV] [[мі��ць] рік]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "викори�танн�: %s [+формат] [день мі��ць рік]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "День �в�того Tib"
 
@@ -7598,7 +7263,7 @@ msgstr "%s: помилка перейменуванн� %s на %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "виклик: %s звідки куди файли...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7610,22 +7275,22 @@ msgstr ""
 "викори�товувати.\n"
 "Сценарій не запущено.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "викори�танн�: script [-a] [-f] [-q] [-t] [файл]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Сценарій запущено, файл - %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Сценарій запущено на %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7634,254 +7299,253 @@ msgstr ""
 "\n"
 "Сценарій завершено на %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Сценарій завершено, файл %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "помилка openpty\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Скінчили�ь pty-при�трої\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Помилка у параметрах, викори�танн�\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term назва_терміналу ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ табул1 табул2 табул3 ... ] ]     (табулn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ табул1 табул2 табул3 ... ] ]  (табулn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file назва_файлу_дампу ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq ча�тота_звуку ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "не вдаєть�� в�тановити/зн�ти режим енергозбереженн�\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "помилка klogctl %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Помилка читанн� %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Помилка запи�у знімку екрану \n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "не вдаєть�� прочитати %s, або не вдаєть�� виконати ioctl дампу\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: не визначено $TERM.\n"
@@ -7956,10 +7620,6 @@ msgstr "Попередженн�: не вдаєть�� відкрити %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: не вдаєть�� відкрити %s - натомі�ть викори�товуєть�� %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8262,82 +7922,73 @@ msgstr "mount: помилка відкриваннÑ� %s длÑ� вÑ�тановлÐ
 msgid "mount: cannot set speed: %s"
 msgstr "mount: помилка в�тановленн� швидко�ті: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: помилка �творенн� проце�у: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: цю вер�ію програми �компільовано без підтримки `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: помилка підключенн� nfs вер�ії 4, пробуєть�� 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: не вдаєть�� визначити тип файлової �и�теми, та тип �вно не вказаний"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: необхідно вказати тип файлової �и�теми"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: помилка підключенн�"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: точка монтуванн� %s не є каталогом"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: до�туп заборонено"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: дл� викори�танн� mount необхідно мати права адміні�тратора"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s зайн�тий"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc вже підключено"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s вже підключено або %s зайн�тий"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: точка монтуванн� %s не і�нує"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: точка монтуванн� %s є �имволічним по�иланн�м, �ке вказує нікуди"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: �пеціальний при�трій %s не і�нує"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8346,12 +7997,12 @@ msgstr ""
 "mount: �пеціальний при�трій %s не і�нує\n"
 "       (префік� шл�ху не є каталогом)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ще не підключений, або неправильний параметр"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8361,72 +8012,71 @@ msgstr ""
 "неправильний �уперблок на %s,\n"
 "       або підключено надто багато файлових �и�тем"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "таблиц� монтуванн� переповнена"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: не вдаєть�� прочитати �уперблок"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: невідомий при�трій"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   перелік відомих типів файлових �и�тем"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: можливо ви мали на увазі %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: можливо ви мали на увазі iso9660 ?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: можливо ви мали на увазі iso9660 ?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s має неправильний номер при�трою або файлова �и�тема типу %s не "
 "підтримуєть��"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s не є блочним при�троєм, та stat зазнав невдачі?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8435,72 +8085,67 @@ msgstr ""
 "mount: �дро не розпізнало %s �к блочний при�трій\n"
 "       (можливо треба виконати `insmod драйвер'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s не є блочним при�троєм (можливо, �пробуйте `-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s не є блочним при�троєм"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s не є правильним блочним при�троєм"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "блочний при�трій "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: не вдаєть�� підключити %s%s лише дл� читанн�"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s захищений від запи�у, але було вказано ключ `-w'"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s захищений від запи�у, монтуєть�� лише дл� читанн�"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: не вказано тип - вважаєть�� nfs, через на�вні�ть двокрапки\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: не вказано тип - вважаєть�� smbfs, через на�вні�ть префік�у //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: продовженн� �проб у фоні \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: залишено �проби підключити \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s вже підключений у %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8549,34 +8194,34 @@ msgstr ""
 "Інші параметри: [-nfFrsvw] [-o параметри] [-p пароль].\n"
 "Додаткову інформацію дивіть�� у man 8 mount .\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: це може робити лише адміні�тратор(root)"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: не знайдено %s - �творюєть��..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: не знайдено такого розділу"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: підключенн� %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "нічого не було підключено"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: не вдаєть�� знайти %s у %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: не вдаєть�� знайти %s у %s або %s"
@@ -8611,98 +8256,98 @@ msgstr "       буде випробувано тип %s\n"
 msgid "Trying %s\n"
 msgstr "Випробовуєть�� %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: надмірна довжина аргументу вузол:каталог\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: попередженн�: вказуванн� кількох назв вузлів не підтримуєть��\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: каталог дл� підключенн� не у форматі вузол:каталог\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: не вдаєть�� отримати адре�у дл� %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: отримано неправильний hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: надмірно довгий параметр\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Попередженн�: �ерозпізнаний параметр proto=.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Попередженн�: параметр namlen не підтримуєть��.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "невідомий параметр підключенн� nfs: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Попередженн�: параметр nolock не підтримуєть��.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "невідомий параметр підключенн� nfs: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: отримано неправильний hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS через TCP не підтримуєть��.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs �окет"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs �ервер повідомив, що �лужба недо�тупна"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "викори�тано portmapper, щоб знайти NFS порт\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "викори�товуєть�� порт %d �лужби nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "повернений невідомий код �тану nfs: %d"
@@ -8711,7 +8356,7 @@ msgstr "повернений невідомий код �тану nfs: %d"
 msgid "bug in xstrndup call"
 msgstr "помилка при виклику xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8724,7 +8369,7 @@ msgstr ""
 "       %s [-v] [-p пріоритет] �пец_файл ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8735,140 +8380,138 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] �пец_файл ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s на %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: не вдаєть�� знайти \"_stext\" у %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: не вдаєть�� отримати �тати�тику %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: попередженн�: %s має небезпечні права %04o, пропонуєть�� %04o\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: пропу�каєть�� файл %s - �хоже, що він мі�тить дірки.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "�е адміні�тратор.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: не вдаєть�� відкрити %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: �компільовано без підтримки -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: помилка �творенн� проце�у: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "вузол: %s, каталог: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: не вдаєть�� отримати адре�у дл� %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: отримано неправильний hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: неправильний блочний при�трій"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: не підключений"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: не вдаєть�� запи�ати �уперблок"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: при�трій зайн�тий"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: не і�нує"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 "umount: %s: дл� викори�танн� umount необхідно мати права адміні�тратора"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: блочні при�трої не дозволено на файловій �и�темі"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "немає umount2, пробуєть�� umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "не вдаєть�� відключити umount %s - натомі�ть пробуєть�� %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s зайн�тий - перепідключено у режим лише-дл�-читанн�\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: не вдаєть�� перепідключити %s у режим лише-дл�-читанн�\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s відключено\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: не вдаєть�� знайти перелік файлових �и�тем дл� відключенн�"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8879,48 +8522,47 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t тип_ф�] [-O параметри]\n"
 "       umount [-f] [-r] [-n] [-v] �пец_файл | каталог...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "не вдаєть�� відкрити "
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Спроба відключити %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "не вдаєть�� знайти %s у mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s не є підключеним (згідно mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: здаєть�� %s підключений декілька разів"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s від�утній у fstab (та ви не адміні�тратор)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: підключений %s відрізн�єть�� від fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, fuzzy, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: лише адміні�тратор може відключити %s від %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: це може робити лише адміні�тратор(root)"
 
@@ -9078,7 +8720,7 @@ msgstr "%s: невідомий �игнал %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9246,8 +8888,6 @@ msgstr "підтримку Ñ�пільної пам'Ñ�Ñ‚Ñ– не налаштовÐ
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Обмеженн� �пільної пам'�ті --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
@@ -10037,17 +9677,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e формат] [-f файл_формату] [-n довжина] [-s з�ув] "
 "[файл ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "викори�танн�: %s [-dflpcsu] [+linenum | +/pattern] назва1 назва2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: невідомий �игнал %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10058,8 +9698,7 @@ msgstr ""
 "*** %s: каталог ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10070,45 +9709,45 @@ msgstr ""
 "******** %s: не є тек�товим файлом ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Викори�товуйте q чи Q щоб вийти]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Далі--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(�а�тупний файл: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[�ати�ніть пробіл, щоб продовжити, або 'q', щоб вийти.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...назад %d �торінок"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...назад 1 �торінку"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...пропу�каєть�� один р�док"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...пропу�каєть�� %d р�дків"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10118,7 +9757,7 @@ msgstr ""
 "***�азад***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10130,7 +9769,7 @@ msgstr ""
 "значенн� у кутових дужках.\n"
 "Зірочка (*) означає, що параметр �тає новим типовим значенн�м.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10177,34 +9816,34 @@ msgstr ""
 ":f                      Відобразити назву поточного файлу та номер р�дка\n"
 ".                       Повторити попередню команду\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[�ати�ніть 'h' щоб перегл�нути довідку.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" р�док %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[�е файл] р�док %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Переповненн�\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...перехід\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "�евдалий регул�рний вираз"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10212,15 +9851,15 @@ msgstr ""
 "\n"
 "Шаблон не знайдено\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Шаблон не знайдено"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "не вдаєть�� �творити проце�\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10228,19 +9867,19 @@ msgstr ""
 "\n"
 "...Перехід "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Перехід до файлу"
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Перехід назад до файлу"
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Р�док надто довгий"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "�емає попередньої команди дл� заміни"
 
@@ -10293,7 +9932,7 @@ msgstr "hexdump: неправильний формат {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: неправильний �имвол перетворенн� %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10301,84 +9940,81 @@ msgstr ""
 "%s: Викори�танн�: %s [-number] [-p р�док] [-cefnrs] [+line] [+/pattern/] "
 "[файли]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: параметр потребує вказуванн� аргументу -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: неправильний параметр -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...перехід вперед\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...перехід назад\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "�емає на�тупного файлу"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "�емає попереднього файлу"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Помилка читанн� з файлу %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: �еочікуваний кінець файла у файлі %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: �евідома помилка у файлі %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: не вдаєть�� �творити тимча�овий файл\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "Помилка РВ: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(Кінець файлу)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "�емає збереженого у пам'�ті р�дку пошуку"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "не вдаєть�� відкрити "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "збережено"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": команда ! не допу�тима у режимі rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "помилка виконанн� fork(), �пробуйте пізніше ще раз\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(�а�тупний файл: "
 
@@ -10432,6 +10068,160 @@ msgstr "Вхідний р�док надто довгий.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "�едо�татньо пам'�ті дл� збільшенн� буфера.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "�еправильне чи�ло: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Синтак�ична помилка: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "�емає такого набору параметрів: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] при�трій назва\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] при�трій розмір �ект головок доріжок stretch gap rate spec1 "
+#~ "fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] при�трій\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] при�трій\n"
+
+#~ msgid "version"
+#~ msgstr "вер�і�"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "не вдаєть�� відкрити /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "не вдаєть�� прочитати дані з /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "не вдаєть�� відкрити %s дл� читанн�"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "помилка при stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s не має правильних прав файлу"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "не вдаєть�� прочитати дані з %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "�аразі у �и�темі надто багато кори�тувачів.\n"
+#~ "Спробуйте пізніше.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Ви запу�тили надто багато проце�ів.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "Пароль повинен �кладати�� принаймні з 6 �имволів, �пробуйте ще раз.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Пароль повинен мі�тити �имволи двох на�тупних груп категорій:\n"
+#~ "літери у верхньому та нижньому регі�трі, цифри та не алфавітно-цифрові\n"
+#~ "�имволи. Додаткову інформацію дивіть�� у passwd(1).\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "�е можна викори�товувати �вій �тарий пароль.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "�е викори�товуйте ваше ім'� у �ко�ті паролю!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "�е викори�товуйте ваше �правжнє ім'� у �ко�ті паролю!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Викори�танн�: passwd [ім'�_кори�тувача [пароль]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr ""
+#~ "Лише адміні�тратор може викори�товувати варіант з одним чи двома "
+#~ "параметрами.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Викори�танн�: passwd [-foqsvV] [кори�тувач [пароль]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "не вдаєть�� виконати %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "не вдаєть�� знайти реє�траційне ім'�"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Лише адміні�тратор може змінювати пароль інших кори�тувачів.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "�адто багато параметрів.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "не вдаєть�� ніде знайти ім'� кори�тувача. Чи `%s' �правді ім'� "
+#~ "кори�тувача?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Можна змінювати лише локальні паролі. Викори�товуйте yppasswd натомі�ть."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID та ім'� кори�тувача не відповідають одне одному, ви шахрай!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Змінюєть�� пароль дл� %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Введіть �тарий пароль: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "�еправильний пароль, шахрай."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Введіть новий пароль: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Пароль не змінено."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Введіть пароль повторно: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Паролі не �півпадають. Пароль не змінено."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "пароль змінено, кори�тувач %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "П�РОЛЬ �ДМІ�ІСТР�ТОР� ЗМІ�Е�О"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "пароль змінено адміні�тратором, кори�тувач %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "викликаєть�� setpwnam дл� в�тановленн� паролю.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Пароль �Е змінено. Спробуйте ще раз пізніше.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Пароль змінено.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: цю вер�ію програми �компільовано без підтримки `nfs'"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Попередженн�: видаленн� розділів пі�л� %d\n"
diff --git a/po/update-potfiles b/po/update-potfiles
index 2b7baf8c7..737202a20 100644..100755
--- a/po/update-potfiles
+++ b/po/update-potfiles
@@ -2,15 +2,8 @@
 #
 #
 
-> POTFILES
-> .null
 > POTFILES.in
 
-for x in ../*/*.c; do
-echo "$x \\" >> POTFILES
-done
-echo .null   >> POTFILES
-
 cd ..
 for x in */*.c; do
 echo "$x" >> po/POTFILES.in
diff --git a/po/util-linux.pot b/po/util-linux.pot
index 5b6786f13..57390392a 100644
--- a/po/util-linux.pot
+++ b/po/util-linux.pot
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
+# Copyright (C) YEAR Adrian Bunk <bunk@stusta.de>
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +114,7 @@ msgstr ""
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr ""
@@ -155,13 +156,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr ""
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
 #, c-format
-msgid "%s from %s\n"
+msgid "%s from %s%s\n"
 msgstr ""
 
 #: disk-utils/fdformat.c:130
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Single"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -196,97 +196,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -742,7 +742,7 @@ msgstr ""
 msgid "not enough space, need at least %lu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
@@ -811,18 +811,18 @@ msgstr ""
 msgid "error closing %s"
 msgstr ""
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr ""
@@ -865,7 +865,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -918,10 +917,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -994,7 +989,6 @@ msgstr ""
 msgid "write failed in write_block"
 msgstr ""
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1028,7 +1022,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1070,105 +1064,105 @@ msgstr ""
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr ""
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr ""
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr ""
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1177,118 +1171,82 @@ msgid ""
 "the -f option to force it.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr ""
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr ""
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr ""
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr ""
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr ""
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr ""
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr ""
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1297,788 +1255,766 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr ""
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr ""
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr ""
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr ""
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr ""
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr ""
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr ""
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr ""
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr ""
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr ""
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr ""
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr ""
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr ""
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr ""
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr ""
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr ""
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr ""
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr ""
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr ""
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr ""
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr ""
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr ""
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr ""
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr ""
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr ""
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr ""
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr ""
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 msgstr ""
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr ""
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr ""
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr ""
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr ""
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr ""
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr ""
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr ""
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr ""
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr ""
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr ""
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr ""
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr ""
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr ""
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr ""
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr ""
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr ""
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr ""
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr ""
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr ""
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr ""
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr ""
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr ""
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr ""
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr ""
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr ""
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr ""
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr ""
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2121,9 +2057,9 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr ""
 
@@ -2143,10 +2079,9 @@ msgstr ""
 msgid "   l   list known filesystem types"
 msgstr ""
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr ""
 
@@ -2158,14 +2093,14 @@ msgstr ""
 msgid "   p   print BSD partition table"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr ""
 
@@ -2208,13 +2143,13 @@ msgstr ""
 msgid "BSD disklabel command (m for help): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2259,8 +2194,6 @@ msgstr ""
 msgid " badsect"
 msgstr ""
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2359,8 +2292,8 @@ msgstr ""
 msgid "tracks/cylinder"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr ""
 
@@ -2417,7 +2350,7 @@ msgstr ""
 msgid "Partition (a-%c): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr ""
@@ -2439,7 +2372,7 @@ msgid ""
 "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2451,7 +2384,7 @@ msgid ""
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2461,209 +2394,195 @@ msgid ""
 "  ...\n"
 msgstr ""
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr ""
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr ""
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr ""
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr ""
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr ""
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr ""
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr ""
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr ""
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr ""
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr ""
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr ""
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr ""
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr ""
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr ""
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr ""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr ""
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr ""
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr ""
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr ""
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr ""
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr ""
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr ""
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr ""
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2675,29 +2594,29 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2706,131 +2625,131 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr ""
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr ""
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr ""
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr ""
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr ""
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2839,14 +2758,14 @@ msgid ""
 "a partition using the `d' command.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2854,7 +2773,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -2862,90 +2781,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr ""
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -2953,23 +2872,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr ""
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -2977,82 +2896,82 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3061,22 +2980,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3084,32 +3003,32 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr ""
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr ""
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3118,7 +3037,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3127,107 +3046,106 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3291,15 +3209,15 @@ msgstr ""
 msgid "SGI xvm"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr ""
 
@@ -3360,7 +3278,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr ""
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3404,7 +3321,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr ""
@@ -3479,7 +3396,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr ""
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3494,11 +3410,10 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr ""
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3563,44 +3478,43 @@ msgstr ""
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr ""
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3609,12 +3523,12 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3623,86 +3537,86 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3710,14 +3624,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3726,7 +3640,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3738,7 +3652,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -3747,16 +3661,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -3780,32 +3694,26 @@ msgstr ""
 msgid "Extended"
 msgstr ""
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr ""
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr ""
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr ""
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr ""
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr ""
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr ""
@@ -3814,7 +3722,6 @@ msgstr ""
 msgid "W95 FAT32 (LBA)"
 msgstr ""
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr ""
@@ -3907,12 +3814,10 @@ msgstr ""
 msgid "OnTrack DM6 Aux1"
 msgstr ""
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr ""
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr ""
@@ -3933,8 +3838,6 @@ msgstr ""
 msgid "Priam Edisk"
 msgstr ""
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -3944,7 +3847,6 @@ msgstr ""
 msgid "GNU HURD or SysV"
 msgstr ""
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr ""
@@ -3965,12 +3867,10 @@ msgstr ""
 msgid "Old Minix"
 msgstr ""
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr ""
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr ""
@@ -3999,12 +3899,10 @@ msgstr ""
 msgid "Amoeba BBT"
 msgstr ""
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr ""
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr ""
@@ -4013,7 +3911,6 @@ msgstr ""
 msgid "FreeBSD"
 msgstr ""
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr ""
@@ -4078,30 +3975,22 @@ msgstr ""
 msgid "CP/M / CTOS / ..."
 msgstr ""
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr ""
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr ""
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr ""
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr ""
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr ""
@@ -4110,116 +3999,109 @@ msgstr ""
 msgid "EFI GPT"
 msgstr ""
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr ""
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr ""
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr ""
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr ""
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr ""
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4227,165 +4109,165 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4393,519 +4275,514 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr ""
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr ""
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr ""
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -4913,73 +4790,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5073,179 +4950,179 @@ msgstr ""
 msgid "internal error, contact the author."
 msgstr ""
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr ""
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr ""
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr ""
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr ""
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr ""
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr ""
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr ""
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr ""
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr ""
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr ""
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr ""
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr ""
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr ""
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr ""
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr ""
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr ""
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr ""
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr ""
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr ""
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5255,7 +5132,7 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5266,69 +5143,69 @@ msgid ""
 " %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr ""
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr ""
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr ""
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr ""
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5336,60 +5213,60 @@ msgid ""
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr ""
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5398,34 +5275,39 @@ msgid ""
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, c-format
+msgid "%s from util-linux-%s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5457,72 +5339,72 @@ msgid ""
 "                either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5556,7 +5438,6 @@ msgstr ""
 msgid "ioctl KDSHWCLK failed"
 msgstr ""
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr ""
@@ -5648,9 +5529,6 @@ msgstr ""
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -5676,7 +5554,6 @@ msgstr ""
 msgid "calling open_tty\n"
 msgstr ""
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr ""
@@ -5685,7 +5562,6 @@ msgstr ""
 msgid "writing init string\n"
 msgstr ""
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr ""
@@ -5699,7 +5575,6 @@ msgstr ""
 msgid "read %c\n"
 msgstr ""
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr ""
@@ -5753,7 +5628,6 @@ msgstr ""
 msgid "/dev/%s: not a character device"
 msgstr ""
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr ""
@@ -5768,12 +5642,10 @@ msgstr ""
 msgid "%s: not open for read/write"
 msgstr ""
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr ""
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -5812,30 +5684,25 @@ msgid ""
 "line baud_rate,... [termtype]\n"
 msgstr ""
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr ""
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr ""
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr ""
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr ""
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr ""
@@ -5880,8 +5747,8 @@ msgstr ""
 msgid "Password error."
 msgstr ""
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr ""
@@ -6051,34 +5918,6 @@ msgstr ""
 msgid "No known shells.\n"
 msgstr ""
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr ""
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr ""
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr ""
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr ""
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr ""
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr ""
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6088,299 +5927,280 @@ msgstr ""
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr ""
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
 "wtmp begins %s"
 msgstr ""
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr ""
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr ""
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr ""
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr ""
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr ""
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr ""
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr ""
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr ""
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr ""
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr ""
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr ""
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr ""
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr ""
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr ""
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr ""
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr ""
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr ""
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr ""
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr ""
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr ""
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr ""
@@ -6400,163 +6220,30 @@ msgstr ""
 msgid "usage: mesg [y | n]\n"
 msgstr ""
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr ""
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr ""
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr ""
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr ""
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr ""
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr ""
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr ""
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr ""
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr ""
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr ""
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr ""
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr ""
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr ""
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr ""
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr ""
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr ""
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr ""
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr ""
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr ""
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr ""
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr ""
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr ""
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr ""
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr ""
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr ""
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr ""
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr ""
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr ""
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -6603,7 +6290,6 @@ msgstr ""
 msgid "halted by %s: %s"
 msgstr ""
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -6636,7 +6322,6 @@ msgstr ""
 msgid "Error executing\t%s\n"
 msgstr ""
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -6726,7 +6411,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr ""
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr ""
@@ -6753,7 +6437,7 @@ msgstr ""
 msgid "fork failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr ""
 
@@ -6902,12 +6586,6 @@ msgstr ""
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -6918,13 +6596,12 @@ msgstr ""
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr ""
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr ""
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr ""
 
@@ -7054,7 +6731,7 @@ msgstr ""
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7062,276 +6739,275 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr ""
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr ""
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -7406,10 +7082,6 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -7693,232 +7365,217 @@ msgstr ""
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr ""
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -7944,34 +7601,34 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr ""
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8006,98 +7663,98 @@ msgstr ""
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr ""
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr ""
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr ""
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr ""
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr ""
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr ""
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr ""
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr ""
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr ""
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr ""
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr ""
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr ""
@@ -8106,7 +7763,7 @@ msgstr ""
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8115,7 +7772,7 @@ msgid ""
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8123,138 +7780,136 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr ""
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr ""
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr ""
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr ""
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr ""
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr ""
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8262,47 +7917,46 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8447,7 +8101,7 @@ msgstr ""
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -8601,8 +8255,6 @@ msgstr ""
 msgid "------ Shared Memory Limits --------\n"
 msgstr ""
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9356,17 +9008,17 @@ msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr ""
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9374,8 +9026,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9383,52 +9034,52 @@ msgid ""
 "\n"
 msgstr ""
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr ""
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr ""
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr ""
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr ""
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr ""
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr ""
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr ""
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr ""
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9436,7 +9087,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9459,66 +9110,66 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr ""
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr ""
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr ""
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr ""
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr ""
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr ""
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr ""
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr ""
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr ""
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr ""
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -9571,90 +9222,87 @@ msgstr ""
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr ""
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr ""
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr ""
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr ""
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr ""
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr ""
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr ""
 
diff --git a/po/vi.gmo b/po/vi.gmo
new file mode 100644
index 000000000..5bf072f70
--- /dev/null
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 000000000..80586b163
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,10162 @@
+# translation of util-linux-2.12q.po to Vietnamese
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Phan Vinh Thinh <teppi82@gmail.com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-04-05 00:53+0400\n"
+"Last-Translator: Phan Vinh Thinh <teppi82@gmail.com>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+
+#: disk-utils/blockdev.c:62
+msgid "set read-only"
+msgstr "thiết lập chỉ đ�c"
+
+#: disk-utils/blockdev.c:63
+msgid "set read-write"
+msgstr "thiết lập đ�c-viết"
+
+#: disk-utils/blockdev.c:66
+msgid "get read-only"
+msgstr "lấy chỉ đ�c"
+
+#: disk-utils/blockdev.c:69
+msgid "get sectorsize"
+msgstr "lấy kích thước sector"
+
+#: disk-utils/blockdev.c:72
+msgid "get blocksize"
+msgstr "lấy kích thước block"
+
+#: disk-utils/blockdev.c:75
+msgid "set blocksize"
+msgstr "lấy kích thước block"
+
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr "lấy số sector 32 bit"
+
+#: disk-utils/blockdev.c:81
+msgid "get size in bytes"
+msgstr "lấy kích thước theo byte"
+
+#: disk-utils/blockdev.c:84
+msgid "set readahead"
+msgstr "đặt readahead"
+
+#: disk-utils/blockdev.c:87
+msgid "get readahead"
+msgstr "lấy readahead"
+
+#: disk-utils/blockdev.c:90
+msgid "flush buffers"
+msgstr "làm tràn bộ đệm"
+
+#: disk-utils/blockdev.c:94
+msgid "reread partition table"
+msgstr "đ�c lại bảng phân vùng"
+
+#: disk-utils/blockdev.c:103
+#, c-format
+msgid "Usage:\n"
+msgstr "Sử dụng:\n"
+
+#: disk-utils/blockdev.c:105
+#, c-format
+msgid "  %s --report [devices]\n"
+msgstr "   %s --báo cáo [thiết bị]\n"
+
+#: disk-utils/blockdev.c:106
+#, c-format
+msgid "  %s [-v|-q] commands devices\n"
+msgstr "  %s [-v|-q] câu_lệnh thiết_bị\n"
+
+#: disk-utils/blockdev.c:107
+#, c-format
+msgid "Available commands:\n"
+msgstr "Những câu lệnh có:\n"
+
+#: disk-utils/blockdev.c:254
+#, c-format
+msgid "%s: Unknown command: %s\n"
+msgstr "%s: Câu lệnh không rõ: %s\n"
+
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
+#, c-format
+msgid "%s requires an argument\n"
+msgstr "%s yêu cầu một tham số\n"
+
+#: disk-utils/blockdev.c:323
+#, c-format
+msgid "%s succeeded.\n"
+msgstr "%s thành công.\n"
+
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
+#, c-format
+msgid "%s: cannot open %s\n"
+msgstr "%s: không thể mở %s\n"
+
+#: disk-utils/blockdev.c:384
+#, c-format
+msgid "%s: ioctl error on %s\n"
+msgstr "%s: lỗi ioctl trên %s\n"
+
+#: disk-utils/blockdev.c:391
+#, c-format
+msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
+msgstr "RO    RA   SSZ   BSZ   Secđầu     Kíchthước    Thiếtbị\n"
+
+#: disk-utils/elvtune.c:50
+#, c-format
+msgid "usage:\n"
+msgstr "sử dụng:\n"
+
+#: disk-utils/fdformat.c:31
+#, c-format
+msgid "Formatting ... "
+msgstr "�ang định dạng ... "
+
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
+#, c-format
+msgid "done\n"
+msgstr "xong\n"
+
+#: disk-utils/fdformat.c:60
+#, c-format
+msgid "Verifying ... "
+msgstr "�ang kiểm tra ... "
+
+#: disk-utils/fdformat.c:71
+msgid "Read: "
+msgstr "��c: "
+
+#: disk-utils/fdformat.c:73
+#, c-format
+msgid "Problem reading cylinder %d, expected %d, read %d\n"
+msgstr "Có vấn đ� khi đ�c cylinder %d, mong ch� %d, đ�c %d\n"
+
+#: disk-utils/fdformat.c:79
+#, c-format
+msgid ""
+"bad data in cyl %d\n"
+"Continuing ... "
+msgstr ""
+"dữ liệu xấu tại cyl %d\n"
+"�ang tiếp tục ... "
+
+#: disk-utils/fdformat.c:94
+#, c-format
+msgid "usage: %s [ -n ] device\n"
+msgstr "sử dụng: %s [ -n ] thiết bị\n"
+
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
+msgstr "%s từ %s\n"
+
+#: disk-utils/fdformat.c:130
+#, c-format
+msgid "%s: not a block device\n"
+msgstr "%s: không phải là thiết bị khối\n"
+
+#: disk-utils/fdformat.c:140
+msgid "Could not determine current format type"
+msgstr "Không thể xác định được định dạng hiện th�i"
+
+#: disk-utils/fdformat.c:141
+#, c-format
+msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
+msgstr "%s mặt, %d track, %d sec/track. Tổng dung lượng %d kB.\n"
+
+#: disk-utils/fdformat.c:142
+msgid "Double"
+msgstr "�ôi"
+
+#: disk-utils/fdformat.c:142
+msgid "Single"
+msgstr "�ơn"
+
+#: disk-utils/fsck.cramfs.c:107
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h         print this help\n"
+" -x dir     extract into dir\n"
+" -v         be more verbose\n"
+" file       file to test\n"
+msgstr ""
+"sử dụng: %s [-hv] [-x dir] file\n"
+" -h\t\t in ra hướng dẫn này\n"
+" -x dir\t ghi thông tin vào thư mục dir\n"
+" -v\t\t hiện thị nhi�u thông báo khi thực hiện\n"
+" file\t\t tệp tin để thử nghiệm\n"
+
+#: disk-utils/fsck.cramfs.c:200
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr "%s: lỗi %d trong khi giải nén! %p(%d)\n"
+
+#: disk-utils/fsck.cramfs.c:250
+#, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: lỗi kích thước trong symlink `%s'\n"
+
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
+#, c-format
+msgid "  uncompressing block at %ld to %ld (%ld)\n"
+msgstr "  giải nén khối tại %ld tới %ld (%ld)\n"
+
+#: disk-utils/fsck.cramfs.c:294
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr "%s: chế độ không có thật trên `%s' (%o)\n"
+
+#: disk-utils/fsck.cramfs.c:326
+#, c-format
+msgid "  hole at %ld (%d)\n"
+msgstr "  lỗ trống tại %ld (%d)\n"
+
+#: disk-utils/fsck.cramfs.c:344
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr "%s: Không khối (%ld) byte\n"
+
+#: disk-utils/fsck.cramfs.c:350
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr "%s: Không kích thước (%ld với %ld) byte\n"
+
+#: disk-utils/fsck.cramfs.c:399
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr "%s: cramfs bị lỗi--độ dài đư�ng dẫn xấu\n"
+
+#: disk-utils/fsck.cramfs.c:479
+#, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: không biên dịch hỗ trợ -x\n"
+
+#: disk-utils/fsck.cramfs.c:505
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr "%s: cảnh báo--không thể xác định kích thước hệ thống tập tin\n"
+
+#: disk-utils/fsck.cramfs.c:515
+#, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s không phải là thiết bị không hay tập tin\n"
+
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr "%s: cramfs bị lỗi--kích thước tập tin quá ngắn\n"
+
+#: disk-utils/fsck.cramfs.c:548
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr "%s: cramfs bị lỗi--sai magic\n"
+
+#: disk-utils/fsck.cramfs.c:561
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr "%s: cảnh báo--tập tin quá dài, hình ảnh lớn?\n"
+
+#: disk-utils/fsck.cramfs.c:571
+#, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: cramfs bị lỗi--lỗi crc\n"
+
+#: disk-utils/fsck.cramfs.c:577
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr "%s: cảnh báo--hình ảnh cramfs cũ, không có CRC\n"
+
+#: disk-utils/fsck.cramfs.c:599
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr "%s: cramfs bị lỗi--superblock xấu\n"
+
+#: disk-utils/fsck.cramfs.c:615
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+"%s: cramfs bị lỗi--điểm kết thúc dữ liệu thư mục (%ld) != khởi đầu dữ liệu "
+"tập tin (%ld)\n"
+
+#: disk-utils/fsck.cramfs.c:623
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr "%s: cramfs bị lỗi--bộ dữ liệu tập tin bị lỗi\n"
+
+#: disk-utils/fsck.minix.c:186
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "Sử dụng: %s [-larvsmf] /dev/name\n"
+
+#: disk-utils/fsck.minix.c:293
+#, c-format
+msgid "%s is mounted.\t "
+msgstr "%s đã được gắn.\t"
+
+#: disk-utils/fsck.minix.c:295
+msgid "Do you really want to continue"
+msgstr "Bạn có thực sự muốn tiếp tục"
+
+#: disk-utils/fsck.minix.c:299
+#, c-format
+msgid "check aborted.\n"
+msgstr "kiểm tra bị dừng.\n"
+
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
+#, c-format
+msgid "Zone nr < FIRSTZONE in file `%s'."
+msgstr "Vùng nr < VÙNG�ẦUTIÊN trong tập tin `%s'."
+
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
+#, c-format
+msgid "Zone nr >= ZONES in file `%s'."
+msgstr "Vùng nr >= C�CVÙNG trong tập tin `%s'."
+
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
+msgid "Remove block"
+msgstr "Xóa khối"
+
+#: disk-utils/fsck.minix.c:368
+#, c-format
+msgid "Read error: unable to seek to block in file '%s'\n"
+msgstr "Lỗi đ�c: không thể tìm tới khối trong tập tin '%s'\n"
+
+#: disk-utils/fsck.minix.c:374
+#, c-format
+msgid "Read error: bad block in file '%s'\n"
+msgstr "Lỗi đ�c: khối xấu trong tập tin '%s'\n"
+
+#: disk-utils/fsck.minix.c:389
+#, c-format
+msgid ""
+"Internal error: trying to write bad block\n"
+"Write request ignored\n"
+msgstr ""
+"Lỗi nội bộ: ghi vào khối xấu\n"
+"Yêu cầu ghi bị b� qua\n"
+
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
+msgid "seek failed in write_block"
+msgstr "tìm kiếm bị lỗi trong ghi_khối"
+
+#: disk-utils/fsck.minix.c:398
+#, c-format
+msgid "Write error: bad block in file '%s'\n"
+msgstr "Lỗi ghi: khối xấu trong tập tin '%s'\n"
+
+#: disk-utils/fsck.minix.c:514
+msgid "seek failed in write_super_block"
+msgstr "tìm kiếm bị lỗi trong ghi_khối_super"
+
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
+msgid "unable to write super-block"
+msgstr "không thể ghi khối super"
+
+#: disk-utils/fsck.minix.c:526
+msgid "Unable to write inode map"
+msgstr "Không thể ghi bảng inode"
+
+#: disk-utils/fsck.minix.c:528
+msgid "Unable to write zone map"
+msgstr "Không thể ghi bảng vùng"
+
+#: disk-utils/fsck.minix.c:530
+msgid "Unable to write inodes"
+msgstr "Không thể ghi các chỉ mục inode"
+
+#: disk-utils/fsck.minix.c:557
+msgid "seek failed"
+msgstr "tìm kiếm bị lỗi"
+
+#: disk-utils/fsck.minix.c:559
+msgid "unable to read super block"
+msgstr "không thể đ�c khối super"
+
+#: disk-utils/fsck.minix.c:577
+msgid "bad magic number in super-block"
+msgstr "số magic xấu trong siêu khối"
+
+#: disk-utils/fsck.minix.c:579
+msgid "Only 1k blocks/zones supported"
+msgstr "Chỉ hỗ trợ khối/vùng 1k"
+
+#: disk-utils/fsck.minix.c:581
+msgid "bad s_imap_blocks field in super-block"
+msgstr "vùng s_imap_blocks xấu trong khối super"
+
+#: disk-utils/fsck.minix.c:583
+msgid "bad s_zmap_blocks field in super-block"
+msgstr "vùng s_zmap_blocks xấu trong khối super"
+
+#: disk-utils/fsck.minix.c:590
+msgid "Unable to allocate buffer for inode map"
+msgstr "Không thể phân phối bộ đệm cho bảng inode"
+
+#: disk-utils/fsck.minix.c:598
+msgid "Unable to allocate buffer for inodes"
+msgstr "Không thể phân phối bộ đệm cho các chỉ mục inode"
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inode count"
+msgstr "Không thể phân phối bộ đệm cho việc đếm inode"
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for zone count"
+msgstr "Không thể phân phối bộ đệm cho việc đếm vùng"
+
+#: disk-utils/fsck.minix.c:606
+msgid "Unable to read inode map"
+msgstr "Không thể đ�c bảng inode"
+
+#: disk-utils/fsck.minix.c:608
+msgid "Unable to read zone map"
+msgstr "Không thể đ�c bảng vùng"
+
+#: disk-utils/fsck.minix.c:610
+msgid "Unable to read inodes"
+msgstr "Không thể đ�c các chỉ mục inodes"
+
+#: disk-utils/fsck.minix.c:612
+#, c-format
+msgid "Warning: Firstzone != Norm_firstzone\n"
+msgstr "Cảnh báo: Firszone != Norm_firstzone\n"
+
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
+#, c-format
+msgid "%ld inodes\n"
+msgstr "%ld chỉ mục inode\n"
+
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
+#, c-format
+msgid "%ld blocks\n"
+msgstr "%ld khối\n"
+
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
+#, c-format
+msgid "Firstdatazone=%ld (%ld)\n"
+msgstr "Vùngdữliệuđầutiên=%ld (%ld)\n"
+
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
+#, c-format
+msgid "Zonesize=%d\n"
+msgstr "Kíchthướcvùng=%d\n"
+
+#: disk-utils/fsck.minix.c:621
+#, c-format
+msgid "Maxsize=%ld\n"
+msgstr "Kíchthướclớnnhất=%ld\n"
+
+#: disk-utils/fsck.minix.c:622
+#, c-format
+msgid "Filesystem state=%d\n"
+msgstr "Trạng thái hệ thống tập tin=%d\n"
+
+#: disk-utils/fsck.minix.c:623
+#, c-format
+msgid ""
+"namelen=%d\n"
+"\n"
+msgstr ""
+"chi�udàitên=%d\n"
+"\n"
+
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
+#, c-format
+msgid "Inode %d marked unused, but used for file '%s'\n"
+msgstr "inode %d đánh dấu không sử dụng, nhưng lại dùng cho tập tin '%s'\n"
+
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
+msgid "Mark in use"
+msgstr "Dấu sử dụng"
+
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
+#, c-format
+msgid "The file `%s' has mode %05o\n"
+msgstr "Tập tin `%s' có chế độ %05o\n"
+
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+#, c-format
+msgid "Warning: inode count too big.\n"
+msgstr "Cảnh báo: số đếm chỉ mục inode quá lớn.\n"
+
+#: disk-utils/fsck.minix.c:731
+msgid "root inode isn't a directory"
+msgstr "chỉ mục inode gốc (root inode) không phải là một thư mục"
+
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
+#, c-format
+msgid "Block has been used before. Now in file `%s'."
+msgstr "Không đã được sử dụng trước đó. Bây gi� trong tập tin `%s'."
+
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
+msgid "Clear"
+msgstr "Xóa"
+
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
+#, c-format
+msgid "Block %d in file `%s' is marked not in use."
+msgstr "�ánh dấu khối %d trong tập tin `%s' là chưa sử dụng."
+
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
+msgid "Correct"
+msgstr "Sá»­a"
+
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
+#, c-format
+msgid "The directory '%s' contains a bad inode number for file '%.*s'."
+msgstr "Thư mục '%s' chứa một số inode xấu cho tập tin '%.*s'."
+
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
+msgid " Remove"
+msgstr " Dỡ b�"
+
+#: disk-utils/fsck.minix.c:956
+#, c-format
+msgid "`%s': bad directory: '.' isn't first\n"
+msgstr "`%s': thư mục xấu: '.' không phải đứng đầu\n"
+
+#: disk-utils/fsck.minix.c:964
+#, c-format
+msgid "`%s': bad directory: '..' isn't second\n"
+msgstr "`%s': thư mục xấu: '..' không phải đứng đứng thứ hai\n"
+
+#: disk-utils/fsck.minix.c:1023
+#, c-format
+msgid "%s: bad directory: '.' isn't first\n"
+msgstr "%s: thư mục xấu: '.' không phải đứng đầu\n"
+
+#: disk-utils/fsck.minix.c:1032
+#, c-format
+msgid "%s: bad directory: '..' isn't second\n"
+msgstr "%s: thư mục xấu: '..' không phải đứng đứng thứ hai\n"
+
+#: disk-utils/fsck.minix.c:1066
+msgid "internal error"
+msgstr "lá»—i ná»™i bá»™"
+
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
+#, c-format
+msgid "%s: bad directory: size < 32"
+msgstr "%s: thư mục xấu: kích thước < 32"
+
+#: disk-utils/fsck.minix.c:1100
+msgid "seek failed in bad_zone"
+msgstr "tìm kiếm không thành công trong bad_zone (vùng_xấu)"
+
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
+#, c-format
+msgid "Inode %d mode not cleared."
+msgstr "Không xóa chế độ của chỉ mục inode %d."
+
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
+#, c-format
+msgid "Inode %d not used, marked used in the bitmap."
+msgstr ""
+"Chưa sử dụng chỉ mục inode %d, đánh dấu thành đã dùng trong sơ đồ bitmap."
+
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
+#, c-format
+msgid "Inode %d used, marked unused in the bitmap."
+msgstr ""
+"�ã sử dụng chỉ mục inode %d, đánh dấu thành chưa dùng trong sơ đồ bitmap."
+
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
+#, c-format
+msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgstr "Chỉ mục inode %d (chế độ = %07o), i_nlinks=%d, đếm=%d."
+
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
+msgid "Set i_nlinks to count"
+msgstr "�ặt i_nlinks cho số đếm"
+
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
+#, c-format
+msgid "Zone %d: marked in use, no file uses it."
+msgstr "Vùng %d: được đánh dấu là đang dùng, không tập tin nào dùng nó."
+
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
+msgid "Unmark"
+msgstr "B� đánh dấu"
+
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
+#, c-format
+msgid "Zone %d: in use, counted=%d\n"
+msgstr "Vùng %d: đang dùng, đếm=%d\n"
+
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
+#, c-format
+msgid "Zone %d: not in use, counted=%d\n"
+msgstr "Vùng %d: không dùng, đếm=%d\n"
+
+#: disk-utils/fsck.minix.c:1181
+msgid "Set"
+msgstr "�ặt"
+
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
+msgid "bad inode size"
+msgstr "kích thước inode xấu"
+
+#: disk-utils/fsck.minix.c:1256
+msgid "bad v2 inode size"
+msgstr "kích thước inode v2 xấu"
+
+#: disk-utils/fsck.minix.c:1282
+msgid "need terminal for interactive repairs"
+msgstr "cần terminal cho những sửa chữa tương tác qua lại (interactive)"
+
+#: disk-utils/fsck.minix.c:1286
+#, c-format
+msgid "unable to open '%s'"
+msgstr "không mở được '%s'"
+
+#: disk-utils/fsck.minix.c:1301
+#, c-format
+msgid "%s is clean, no check.\n"
+msgstr "%s sạch sẽ, không kiểm tra.\n"
+
+#: disk-utils/fsck.minix.c:1305
+#, c-format
+msgid "Forcing filesystem check on %s.\n"
+msgstr "Bắt buộc hệ thống tập tin kiểm tra trên %s.\n"
+
+#: disk-utils/fsck.minix.c:1307
+#, c-format
+msgid "Filesystem on %s is dirty, needs checking.\n"
+msgstr "Hệ thống tập tin %s bẩn, cần kiểm tra.\n"
+
+#: disk-utils/fsck.minix.c:1333
+#, c-format
+msgid ""
+"\n"
+"%6ld inodes used (%ld%%)\n"
+msgstr ""
+"\n"
+"%6ld inode được dùng (%ld%%)\n"
+
+#: disk-utils/fsck.minix.c:1338
+#, c-format
+msgid "%6ld zones used (%ld%%)\n"
+msgstr "%6ld vùng được dùng (%ld%%)\n"
+
+#: disk-utils/fsck.minix.c:1340
+#, c-format
+msgid ""
+"\n"
+"%6d regular files\n"
+"%6d directories\n"
+"%6d character device files\n"
+"%6d block device files\n"
+"%6d links\n"
+"%6d symbolic links\n"
+"------\n"
+"%6d files\n"
+msgstr ""
+"\n"
+"%6d tập tin thông thư�ng\n"
+"%6d thư mục\n"
+"%6d tập tin thiết bị ký tự\n"
+"%6d tập tin thiết bị khối\n"
+"%6d liên kết\n"
+"%6d liên kết m�m\n"
+"------\n"
+"%6d tập tin\n"
+
+#: disk-utils/fsck.minix.c:1353
+#, c-format
+msgid ""
+"----------------------------\n"
+"FILE SYSTEM HAS BEEN CHANGED\n"
+"----------------------------\n"
+msgstr ""
+"----------------------------\n"
+"HỆ TH�NG TẬP TIN �à THAY �ỔI\n"
+"----------------------------\n"
+
+#: disk-utils/isosize.c:129
+#, c-format
+msgid "%s: failed to open: %s\n"
+msgstr "%s: không mở được: %s\n"
+
+#: disk-utils/isosize.c:135
+#, c-format
+msgid "%s: seek error on %s\n"
+msgstr "%s: lỗi tìm kiếm trên %s\n"
+
+#: disk-utils/isosize.c:141
+#, c-format
+msgid "%s: read error on %s\n"
+msgstr "%s: lỗi đ�c trên %s\n"
+
+#: disk-utils/isosize.c:150
+#, c-format
+msgid "sector count: %d, sector size: %d\n"
+msgstr "số sector: %d, kích thước sector: %d\n"
+
+#: disk-utils/isosize.c:198
+#, c-format
+msgid "%s: option parse error\n"
+msgstr "%s: lỗi phân tích tùy ch�n\n"
+
+#: disk-utils/isosize.c:206
+#, c-format
+msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
+msgstr "Sử dụng: %s [-x] [-d <số>] tập-tin-ảnh-iso9660\n"
+
+#: disk-utils/mkfs.bfs.c:88
+#, c-format
+msgid ""
+"Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
+"       [-F fsname] device [block-count]\n"
+msgstr ""
+"Sử dụng: %s [-v] [-N nr-of-inodes] [-V tên-volume]\n"
+"       [-F fsname] thiếtbị [đếm-khối]\n"
+
+#: disk-utils/mkfs.bfs.c:135
+msgid "volume name too long"
+msgstr "tên volume quá dài"
+
+#: disk-utils/mkfs.bfs.c:142
+msgid "fsname name too long"
+msgstr "tên fsname quá dài"
+
+#: disk-utils/mkfs.bfs.c:167
+#, c-format
+msgid "cannot stat device %s"
+msgstr "không thể stat thiết bị %s"
+
+#: disk-utils/mkfs.bfs.c:171
+#, c-format
+msgid "%s is not a block special device"
+msgstr "%s không phải là thiết bị khối đặc biệt"
+
+#: disk-utils/mkfs.bfs.c:176
+#, c-format
+msgid "cannot open %s"
+msgstr "không mở được %s"
+
+#: disk-utils/mkfs.bfs.c:187
+#, c-format
+msgid "cannot get size of %s"
+msgstr "không lấy được kích thước %s"
+
+#: disk-utils/mkfs.bfs.c:192
+#, c-format
+msgid "blocks argument too large, max is %lu"
+msgstr "tham số khối quá lớn, max là %lu"
+
+#: disk-utils/mkfs.bfs.c:207
+msgid "too many inodes - max is 512"
+msgstr "quá nhi�u inode - lớn nhất là 512"
+
+#: disk-utils/mkfs.bfs.c:216
+#, c-format
+msgid "not enough space, need at least %lu blocks"
+msgstr "Không đủ chỗ trống, cần ít nhất %lu khối"
+
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
+#, c-format
+msgid "Device: %s\n"
+msgstr "Thiết bị: %s\n"
+
+#: disk-utils/mkfs.bfs.c:229
+#, c-format
+msgid "Volume: <%-6s>\n"
+msgstr "Bá»™ Ä‘Ä©a: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:230
+#, c-format
+msgid "FSname: <%-6s>\n"
+msgstr "Tên FS: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:231
+#, c-format
+msgid "BlockSize: %d\n"
+msgstr "Kích thước khối: %d\n"
+
+#: disk-utils/mkfs.bfs.c:233
+#, c-format
+msgid "Inodes: %d (in 1 block)\n"
+msgstr "Chỉ mục Inodes: %d (trong 1 khối)\n"
+
+#: disk-utils/mkfs.bfs.c:236
+#, c-format
+msgid "Inodes: %d (in %ld blocks)\n"
+msgstr "Chỉ mục Inodes: %d (trong %ld khối)\n"
+
+#: disk-utils/mkfs.bfs.c:238
+#, c-format
+msgid "Blocks: %ld\n"
+msgstr "Khối: %ld\n"
+
+#: disk-utils/mkfs.bfs.c:239
+#, c-format
+msgid "Inode end: %d, Data end: %d\n"
+msgstr "Kết thúc inode: %d, Kết thúc dữ liệu: %d\n"
+
+#: disk-utils/mkfs.bfs.c:244
+msgid "error writing superblock"
+msgstr "lỗi ghi nhớ siêu khối (superblock)"
+
+#: disk-utils/mkfs.bfs.c:264
+msgid "error writing root inode"
+msgstr "lỗi ghi inode gốc (root)"
+
+#: disk-utils/mkfs.bfs.c:269
+msgid "error writing inode"
+msgstr "lỗi ghi chỉ mục inode"
+
+#: disk-utils/mkfs.bfs.c:272
+msgid "seek error"
+msgstr "lỗi tìm kiếm"
+
+#: disk-utils/mkfs.bfs.c:278
+msgid "error writing . entry"
+msgstr "lỗi ghi phần tử . "
+
+#: disk-utils/mkfs.bfs.c:282
+msgid "error writing .. entry"
+msgstr "lỗi ghi phần tử .. "
+
+#: disk-utils/mkfs.bfs.c:286
+#, c-format
+msgid "error closing %s"
+msgstr "lỗi đóng %s"
+
+#: disk-utils/mkfs.c:73
+#, c-format
+msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
+msgstr "Sử dụng: mkfs [-V] [-t fstype] [tùych�n-fs] thiếtbị [kíchthước]\n"
+
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
+#: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
+#, c-format
+msgid "%s: Out of memory!\n"
+msgstr "%s: Tràn bộ nhớ!\n"
+
+#: disk-utils/mkfs.c:103
+#, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr "mkfs phiên bản %s (%s)\n"
+
+#: disk-utils/mkfs.cramfs.c:124
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
+"outfile\n"
+" -h         print this help\n"
+" -v         be verbose\n"
+" -E         make all warnings errors (non-zero exit status)\n"
+" -b blksz   use this blocksize, must equal page size\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file    insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name    set name of cramfs filesystem\n"
+" -p         pad by %d bytes for boot code\n"
+" -s         sort directory entries (old option, ignored)\n"
+" -z         make explicit holes (requires >= 2.3.39)\n"
+" dirname    root of the filesystem to be compressed\n"
+" outfile    output file\n"
+msgstr ""
+"Sử dụng: %s [-h] [-v] [-b blksz] [-e edition] [-i tậptin] [-n tên] tênthưmục "
+"tậptinra\n"
+" -h         in ra trợ giúp này\n"
+" -v         thông báo chi tiết\n"
+" -E         khiến tất cả cảnh báo thành lỗi (trạng thái thoát khác không)\n"
+" -b blksz   sử dụng kích thước khối chỉ ra, phải bằng kích thước trang\n"
+" -e edition đặt số lần in (một phần của fsid)\n"
+" -i file    chèn một ảnh tập tin vào hệ thống tập tin (yêu cầu >= 2.4.0)\n"
+" -n name    đặt tên của hệ thống tập tin cramfs\n"
+" -p         dán %d byte cho mã khởi động\n"
+" -s         sắp xếp các mục cho thư mục (tùy ch�n cũ, bị l� đi)\n"
+" -z         tạo các hố rõ ràng (yêu cầu >= 2.3.39)\n"
+" tênthưmục    gốc của hệ thống tập tin cần được nén\n"
+" tậptinra    tập tin chứa kết quả in ra\n"
+
+#: disk-utils/mkfs.cramfs.c:335
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
+msgstr ""
+"Tên (%u bytes) quá dài cho tập tin `%s'.\n"
+" Xin hãy tăng MAX_INPUT_NAMELEN trong mkcramfs.c và biên dịch lại.  �ang "
+"thoát.\n"
+
+#: disk-utils/mkfs.cramfs.c:463
+#, c-format
+msgid "filesystem too big.  Exiting.\n"
+msgstr "hệ thống tập tin quá lớn.  �ang thoát.\n"
+
+#: disk-utils/mkfs.cramfs.c:514
+#, c-format
+msgid ""
+"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
+"Exiting.\n"
+msgstr ""
+"Vượt quá MAXENTRIES.  Tăng giá trị này trong mkcramfs.c và biên dịch lại.  "
+"�ang thoát.\n"
+
+#: disk-utils/mkfs.cramfs.c:622
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr "AIEEE: khối \"đã nén\" > 2*chi�udàikhối (%ld)\n"
+
+#: disk-utils/mkfs.cramfs.c:641
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr "%6.2f%% (%+d byte)\t%s\n"
+
+#: disk-utils/mkfs.cramfs.c:819
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB.  We might die prematurely.\n"
+msgstr ""
+"cảnh báo: số lượng của kích thước yêu cầu (giới hạn trên) là %LdMB, nhưng "
+"kíchthước ảnh lớn nhất là %uMB.  Chúng ta có thể chết non.\n"
+
+#: disk-utils/mkfs.cramfs.c:860
+#, c-format
+msgid "Including: %s\n"
+msgstr "Bao gồm: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:866
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr "Dữ liệu thư mục: %d byte\n"
+
+#: disk-utils/mkfs.cramfs.c:874
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr "M�i thứ: %d kilô byte\n"
+
+#: disk-utils/mkfs.cramfs.c:879
+#, c-format
+msgid "Super block: %d bytes\n"
+msgstr "Siêu khối: %d byte\n"
+
+#: disk-utils/mkfs.cramfs.c:886
+#, c-format
+msgid "CRC: %x\n"
+msgstr "CRC: %x\n"
+
+#: disk-utils/mkfs.cramfs.c:891
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr "không đủ khoảng trống phân phối cho ảnh ROM (phân phối %Ld, dùng %d)\n"
+
+#: disk-utils/mkfs.cramfs.c:903
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr "Ghi ảnh ROM không thành công (%d %d)\n"
+
+#: disk-utils/mkfs.cramfs.c:912
+#, c-format
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "cảnh báo: tên tập tin bị cắt ngắn thành 255 byte.\n"
+
+#: disk-utils/mkfs.cramfs.c:915
+#, c-format
+msgid "warning: files were skipped due to errors.\n"
+msgstr "cảnh báo: các tập tin bị b� qua vì có lỗi.\n"
+
+#: disk-utils/mkfs.cramfs.c:918
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr "cảnh báo: kích thước tập tin bị cắt ngắn thành %luMB (trừ 1 byte).\n"
+
+#: disk-utils/mkfs.cramfs.c:923
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"cảnh báo: uid bị cắt ngắn thành %u bit.  (�ây có thể là sự lo ngại bảo "
+"mật.)\n"
+
+#: disk-utils/mkfs.cramfs.c:928
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"cảnh báo: gid bị cắt ngắn thành %u bit.  (�ây có thể là sự lo ngại bảo "
+"mật.)\n"
+
+#: disk-utils/mkfs.cramfs.c:933
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+"CẢNH B�O: số thiết bị cắt ngắn thành %u bit.  �i�u này thư�ng có nghĩa là\n"
+"một vài tập tin thiết bị sẽ bị h�ng.\n"
+
+#: disk-utils/mkfs.minix.c:163
+#, c-format
+msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
+msgstr "Sử dụng: %s [-c | -l têntậptin] [-nXX] [-iXX] /dev/name [khối]\n"
+
+#: disk-utils/mkfs.minix.c:187
+#, c-format
+msgid "%s is mounted; will not make a filesystem here!"
+msgstr "%s đã được gắn, sẽ không tạo hệ thống tập tin ở đây!"
+
+#: disk-utils/mkfs.minix.c:248
+msgid "seek to boot block failed in write_tables"
+msgstr "tìm tới khối khởi động không thành công trong write_tables"
+
+#: disk-utils/mkfs.minix.c:250
+msgid "unable to clear boot sector"
+msgstr "không xóa được sector khởi động"
+
+#: disk-utils/mkfs.minix.c:252
+msgid "seek failed in write_tables"
+msgstr "tìm tới không thành công trong write_tables"
+
+#: disk-utils/mkfs.minix.c:256
+msgid "unable to write inode map"
+msgstr "không ghi nhớ được bản đồ inode"
+
+#: disk-utils/mkfs.minix.c:258
+msgid "unable to write zone map"
+msgstr "không ghi nhớ được bản đồ vùng (zone)"
+
+#: disk-utils/mkfs.minix.c:260
+msgid "unable to write inodes"
+msgstr "không ghi nhớ được các inode"
+
+#: disk-utils/mkfs.minix.c:269
+msgid "write failed in write_block"
+msgstr "khi nhớ không thành công trong write_block"
+
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
+msgid "too many bad blocks"
+msgstr "quá nhi�u khối xấu"
+
+#: disk-utils/mkfs.minix.c:285
+msgid "not enough good blocks"
+msgstr "không đủ khối tốt"
+
+#: disk-utils/mkfs.minix.c:497
+msgid "unable to allocate buffers for maps"
+msgstr "không thể phân phối các bộ đệm cho bản đồ"
+
+#: disk-utils/mkfs.minix.c:506
+msgid "unable to allocate buffer for inodes"
+msgstr "không thể phân phối các bộ đệm cho inode"
+
+#: disk-utils/mkfs.minix.c:512
+#, c-format
+msgid ""
+"Maxsize=%ld\n"
+"\n"
+msgstr ""
+"Kíchthướclớnnhất=%ld\n"
+"\n"
+
+#: disk-utils/mkfs.minix.c:526
+msgid "seek failed during testing of blocks"
+msgstr "tìm tới không thành công trong khi kiểm tra (test) các khối"
+
+#: disk-utils/mkfs.minix.c:534
+#, c-format
+msgid "Weird values in do_check: probably bugs\n"
+msgstr "Giá trị kỳ lạ trong do_check: có thể là lỗi (bug)\n"
+
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
+msgid "seek failed in check_blocks"
+msgstr "tìm tới không thành công trong check_blocks"
+
+#: disk-utils/mkfs.minix.c:574
+msgid "bad blocks before data-area: cannot make fs"
+msgstr "khối xấu trước vùng dữ liệu: không thể tạo ra hệ thống tập tin"
+
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
+#, c-format
+msgid "%d bad blocks\n"
+msgstr "%d khối xấu\n"
+
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
+#, c-format
+msgid "one bad block\n"
+msgstr "một khối xấu\n"
+
+#: disk-utils/mkfs.minix.c:592
+msgid "can't open file of bad blocks"
+msgstr "không mở được tập tin của các khối xấu"
+
+#: disk-utils/mkfs.minix.c:674
+#, c-format
+msgid "strtol error: number of blocks not specified"
+msgstr "lỗi strtol: không chỉ ra số khối"
+
+#: disk-utils/mkfs.minix.c:704
+#, c-format
+msgid "unable to open %s"
+msgstr "không mở được %s"
+
+#: disk-utils/mkfs.minix.c:706
+#, c-format
+msgid "unable to stat %s"
+msgstr "không stat được %s"
+
+#: disk-utils/mkfs.minix.c:710
+#, c-format
+msgid "will not try to make filesystem on '%s'"
+msgstr "sẽ không thử tạo hệ thống tập tin trên '%s'"
+
+#: disk-utils/mkswap.c:177
+#, c-format
+msgid "Bad user-specified page size %d\n"
+msgstr "Kích thước trang do ngư�i dùng chỉ ra xấu %d\n"
+
+#: disk-utils/mkswap.c:186
+#, c-format
+msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
+msgstr ""
+"Sử dụng kích thước trang do ngư�i dùng chỉ ra %d, thay cho giá trị hệ thống %"
+"d/%d\n"
+
+#: disk-utils/mkswap.c:190
+#, c-format
+msgid "Assuming pages of size %d (not %d)\n"
+msgstr "Coi như trang có kích thước %d (chứ không phải %d)\n"
+
+#: disk-utils/mkswap.c:233
+#, c-format
+msgid "Bad swap header size, no label written.\n"
+msgstr "Kích thước phần đầu swap xấu, không ghi nhãn nào.\n"
+
+#: disk-utils/mkswap.c:243
+#, c-format
+msgid "Label was truncated.\n"
+msgstr "Nhãn bị cắt ngắn.\n"
+
+#: disk-utils/mkswap.c:249
+#, c-format
+msgid "no label, "
+msgstr "không nhãn, "
+
+#: disk-utils/mkswap.c:257
+#, c-format
+msgid "no uuid\n"
+msgstr "không uuid\n"
+
+#: disk-utils/mkswap.c:381
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
+msgstr "Sử dụng: %s [-c] [-v0|-v1] [-pPAGESZ] [-L nhãn] /dev/name [khối]\n"
+
+#: disk-utils/mkswap.c:404
+msgid "too many bad pages"
+msgstr "quá nhi�u trang xấu"
+
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
+msgid "Out of memory"
+msgstr "Không đủ bộ nhớ"
+
+#: disk-utils/mkswap.c:435
+#, c-format
+msgid "one bad page\n"
+msgstr "một trang xấu\n"
+
+#: disk-utils/mkswap.c:437
+#, c-format
+msgid "%lu bad pages\n"
+msgstr "%lu trang xấu\n"
+
+#: disk-utils/mkswap.c:573
+#, c-format
+msgid "%s: error: Nowhere to set up swap on?\n"
+msgstr "%s: lỗi: Không có chỗ nào để đặt swap lên?\n"
+
+#: disk-utils/mkswap.c:591
+#, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
+msgstr "%s: lỗi: kích thước %lu lớn hơn kích thước thiết bị %lu\n"
+
+#: disk-utils/mkswap.c:614
+#, c-format
+msgid "%s: error: unknown version %d\n"
+msgstr "%s: lỗi: không rõ phiên bản %d\n"
+
+#: disk-utils/mkswap.c:621
+#, c-format
+msgid "%s: error: swap area needs to be at least %ldkB\n"
+msgstr "%s: lỗi: vùng swap cần ít nhất %ldkB\n"
+
+#: disk-utils/mkswap.c:638
+#, c-format
+msgid "%s: warning: truncating swap area to %ldkB\n"
+msgstr "%s: cảnh báo: cắt ngắn vùng swap thành %ldkB\n"
+
+#: disk-utils/mkswap.c:644
+#, c-format
+msgid "%s: error: label only with v1 swap area\n"
+msgstr "%s: lỗi: chỉ ghi nhãn với vùng swap v1\n"
+
+#: disk-utils/mkswap.c:659
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr "Sẽ không thử tạo thiết bị swap trên '%s'"
+
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
+msgid "fatal: first page unreadable"
+msgstr "lỗi nặng: trang đầu tiên là không thể đ�c"
+
+#: disk-utils/mkswap.c:674
+#, c-format
+msgid ""
+"%s: Device '%s' contains a valid Sun disklabel.\n"
+"This probably means creating v0 swap would destroy your partition table\n"
+"No swap created. If you really want to create swap v0 on that device, use\n"
+"the -f option to force it.\n"
+msgstr ""
+"%s: Thiết bị '%s' chứa một nhãn đĩa Sun đúng.\n"
+"�i�u này có nghĩa việc tạo swap v0 sẽ hủy diệt bảng phân vùng của bạn\n"
+"Không tạo ra swap. Nếu bạn thực sự muốn tạo swap v0 trên thiết bị đó,\n"
+"thì hãy dùng tùy ch�n -f để bắt buộc.\n"
+
+#: disk-utils/mkswap.c:698
+msgid "Unable to set up swap-space: unreadable"
+msgstr "Không thể cấu hình không gian swap: không thể đ�c"
+
+#: disk-utils/mkswap.c:699
+#, c-format
+msgid "Setting up swapspace version %d, size = %llu kB\n"
+msgstr "�ặt không gian swap phiên bản %d, kích thước = %llu kB\n"
+
+#: disk-utils/mkswap.c:708
+msgid "unable to rewind swap-device"
+msgstr "không thể \"tua lại\" thiết bị swap"
+
+#: disk-utils/mkswap.c:711
+msgid "unable to write signature page"
+msgstr "không thể ghi nhớ trang chữ ký"
+
+#: disk-utils/mkswap.c:719
+msgid "fsync failed"
+msgstr "fsync không thành công"
+
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
+msgid "Unusable"
+msgstr "Không thể sử dụng"
+
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+msgid "Free Space"
+msgstr "Không gian trống"
+
+#: fdisk/cfdisk.c:375
+msgid "Linux ext2"
+msgstr "Linux ext2"
+
+#: fdisk/cfdisk.c:377
+msgid "Linux ext3"
+msgstr "Linux ext3"
+
+#: fdisk/cfdisk.c:379
+msgid "Linux XFS"
+msgstr "Linux XFS"
+
+#: fdisk/cfdisk.c:381
+msgid "Linux JFS"
+msgstr "Linux JFS"
+
+#: fdisk/cfdisk.c:383
+msgid "Linux ReiserFS"
+msgstr "Linux ReiserFS"
+
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
+#: fdisk/cfdisk.c:388
+msgid "OS/2 HPFS"
+msgstr "OS/2 HPFS"
+
+#: fdisk/cfdisk.c:390
+msgid "OS/2 IFS"
+msgstr "OS/2 IFS"
+
+#: fdisk/cfdisk.c:394
+msgid "NTFS"
+msgstr "NTFS"
+
+#: fdisk/cfdisk.c:405
+#, c-format
+msgid "Disk has been changed.\n"
+msgstr "�ĩa đã được thay đổi.\n"
+
+#: fdisk/cfdisk.c:407
+#, c-format
+msgid "Reboot the system to ensure the partition table is correctly updated.\n"
+msgstr ""
+"Khởi động lại hệ thống để đảm bảo là bảng phân vùng được cập nhật đúng.\n"
+
+#: fdisk/cfdisk.c:411
+#, c-format
+msgid ""
+"\n"
+"WARNING: If you have created or modified any\n"
+"DOS 6.x partitions, please see the cfdisk manual\n"
+"page for additional information.\n"
+msgstr ""
+"\n"
+"CẢNH B�O: Nếu bạn phải tạo hay sử đổi bất kỳ\n"
+"phân vùng DOS 6.x nào, xin hãy xem hướng dẫn ngư�i\n"
+"dùng cfdisk để biết thêm thông tin.\n"
+
+#: fdisk/cfdisk.c:506
+msgid "FATAL ERROR"
+msgstr "LỖI NGHIÊM TRỌNG"
+
+#: fdisk/cfdisk.c:507
+msgid "Press any key to exit cfdisk"
+msgstr "Hãy nhấn phím bất kỳ để thoát kh�i cfdisk"
+
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
+msgid "Cannot seek on disk drive"
+msgstr "Không thể tìm kiếm trên ổ đĩa"
+
+#: fdisk/cfdisk.c:556
+msgid "Cannot read disk drive"
+msgstr "Không thể đ�c ổ đĩa"
+
+#: fdisk/cfdisk.c:564
+msgid "Cannot write disk drive"
+msgstr "Không thể ghi vào ổi đĩa"
+
+#: fdisk/cfdisk.c:907
+msgid "Too many partitions"
+msgstr "Quá nhi�u phân vùng"
+
+#: fdisk/cfdisk.c:912
+msgid "Partition begins before sector 0"
+msgstr "Phân vùng bắt đầu trước sector 0"
+
+#: fdisk/cfdisk.c:917
+msgid "Partition ends before sector 0"
+msgstr "Phân vùng kết thúc trước sector 0"
+
+#: fdisk/cfdisk.c:922
+msgid "Partition begins after end-of-disk"
+msgstr "Phân vùng bắt đầu trước kết thúc-của-đĩa"
+
+#: fdisk/cfdisk.c:927
+msgid "Partition ends after end-of-disk"
+msgstr "Phân vùng bắt đầu sau kết thúc-của-đĩa"
+
+#: fdisk/cfdisk.c:932
+msgid "Partition ends in the final partial cylinder"
+msgstr "Phân vùng kết thúc trong cylinder đóng phân vùng"
+
+#: fdisk/cfdisk.c:956
+msgid "logical partitions not in disk order"
+msgstr "Phân vùng lôgíc không trong thứ tự đĩa"
+
+#: fdisk/cfdisk.c:959
+msgid "logical partitions overlap"
+msgstr "phân vùng lôgíc chồng lên nhau"
+
+#: fdisk/cfdisk.c:963
+msgid "enlarged logical partitions overlap"
+msgstr "phân vùng lôgíc mở rộng chồng lên nhau"
+
+#: fdisk/cfdisk.c:993
+msgid ""
+"!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr "!!!! Lỗi nội bộ khi tạo các ổ lôgíc mà không có phân vùng mở rộng !!!!"
+
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
+msgstr "Không thể tạo ổ lôgíc ở đây -- vì như thế sẽ tạo hai phân vùng mở rộng"
+
+#: fdisk/cfdisk.c:1158
+msgid "Menu item too long. Menu may look odd."
+msgstr "Trình đơn của mục quá dài. Trình đơn có thể trông lạc lõng."
+
+#: fdisk/cfdisk.c:1214
+msgid "Menu without direction. Defaulting horizontal."
+msgstr "Trình đơn không có phương hướng. Mặc định nằm ngang."
+
+#: fdisk/cfdisk.c:1345
+msgid "Illegal key"
+msgstr "Phím không thích hợp"
+
+#: fdisk/cfdisk.c:1368
+msgid "Press a key to continue"
+msgstr "Nhấn một phím để tiếp tục"
+
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
+msgid "Primary"
+msgstr "Chính"
+
+#: fdisk/cfdisk.c:1415
+msgid "Create a new primary partition"
+msgstr "Tạo một phân vùng chính mới"
+
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
+msgid "Logical"
+msgstr "Lôgíc"
+
+#: fdisk/cfdisk.c:1416
+msgid "Create a new logical partition"
+msgstr "Tạo một phân vùng lôgíc mới"
+
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
+msgid "Cancel"
+msgstr "Hủy b�"
+
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
+msgid "Don't create a partition"
+msgstr "�ừng tạo một phân vùng"
+
+#: fdisk/cfdisk.c:1433
+msgid "!!! Internal error !!!"
+msgstr "!!! Lá»—i ná»™i bá»™ !!!"
+
+#: fdisk/cfdisk.c:1436
+msgid "Size (in MB): "
+msgstr "Kích thước (theo MB): "
+
+#: fdisk/cfdisk.c:1470
+msgid "Beginning"
+msgstr "Bắt đầu"
+
+#: fdisk/cfdisk.c:1470
+msgid "Add partition at beginning of free space"
+msgstr "Thêm một phân vùng tại đầu vùng đĩa trống"
+
+#: fdisk/cfdisk.c:1471
+msgid "End"
+msgstr "Kết thúc"
+
+#: fdisk/cfdisk.c:1471
+msgid "Add partition at end of free space"
+msgstr "Thêm một phân vùng tại cuối vùng đĩa trống"
+
+#: fdisk/cfdisk.c:1489
+msgid "No room to create the extended partition"
+msgstr "Không còn chỗ để tạo phân vùng mở rộng"
+
+#: fdisk/cfdisk.c:1563
+msgid "No partition table.\n"
+msgstr "Không có bảng phân vùng\n"
+
+#: fdisk/cfdisk.c:1567
+msgid "No partition table. Starting with zero table."
+msgstr "Không có bảng phân vùng. Khởi động với một bảng trắng."
+
+#: fdisk/cfdisk.c:1577
+msgid "Bad signature on partition table"
+msgstr "Chữ ký xấu trong bảng phân vùng"
+
+#: fdisk/cfdisk.c:1581
+msgid "Unknown partition table type"
+msgstr "Loại bảng phân vùng không xác định"
+
+#: fdisk/cfdisk.c:1583
+msgid "Do you wish to start with a zero table [y/N] ?"
+msgstr "Bạn có muốn khởi động với một bảng trắng [y/N] ?"
+
+#: fdisk/cfdisk.c:1631
+msgid "You specified more cylinders than fit on disk"
+msgstr "Bạn đã đưa ra số cylinder lớn hơn số có trên đĩa"
+
+#: fdisk/cfdisk.c:1663
+msgid "Cannot open disk drive"
+msgstr "Không thể mở ổ đĩa"
+
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
+msgid "Opened disk read-only - you have no permission to write"
+msgstr "Mở ổ đĩa chỉ đ�c - bạn phải có quy�n ghi"
+
+#: fdisk/cfdisk.c:1686
+msgid "Cannot get disk size"
+msgstr "Không thể lấy kích thước đĩa"
+
+#: fdisk/cfdisk.c:1712
+msgid "Bad primary partition"
+msgstr "Phân vùng chính xấu"
+
+#: fdisk/cfdisk.c:1742
+msgid "Bad logical partition"
+msgstr "Phân vùng lôgíc xấu"
+
+#: fdisk/cfdisk.c:1857
+msgid "Warning!!  This may destroy data on your disk!"
+msgstr "Cảnh báo!!  Có thể sẽ xóa hết dữ liệu trên đĩa của bạn!"
+
+#: fdisk/cfdisk.c:1861
+msgid "Are you sure you want write the partition table to disk? (yes or no): "
+msgstr "Bạn có chắc muốn ghi bảng phân vùng lên đĩa? (yes hoặc no): "
+
+#: fdisk/cfdisk.c:1867
+msgid "no"
+msgstr "no (không)"
+
+#: fdisk/cfdisk.c:1868
+msgid "Did not write partition table to disk"
+msgstr "Bảng phân vùng đã không được ghi lên đĩa"
+
+#: fdisk/cfdisk.c:1870
+msgid "yes"
+msgstr "yes (có)"
+
+#: fdisk/cfdisk.c:1873
+msgid "Please enter `yes' or `no'"
+msgstr "Xin hãy nhập `yes' hoặc `no'"
+
+#: fdisk/cfdisk.c:1877
+msgid "Writing partition table to disk..."
+msgstr "�ang viết bảng phân vùng lên đĩa..."
+
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
+msgid "Wrote partition table to disk"
+msgstr "�ã viết bảng phân vùng lên đĩa"
+
+#: fdisk/cfdisk.c:1904
+msgid ""
+"Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr ""
+"�ã ghi bảng phân vùng, nhưng việc đ�c lại thất bại.  Hãy khởi động lại để "
+"cập nhật bảng."
+
+#: fdisk/cfdisk.c:1914
+msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Không có phân vùng chính nào được đánh dấu có thể khởi động. MBR của DOS "
+"không thể khởi động trong trư�ng hợp này."
+
+#: fdisk/cfdisk.c:1916
+msgid ""
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Có vài phân vùng chính được đánh dấu là có thể khởi động. MBR của DOS không "
+"thể khởi động trong trư�ng hợp này."
+
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
+msgid "Enter filename or press RETURN to display on screen: "
+msgstr "Nhập tên tập tin hoặc nhấn RETURN để hiển thị trên màn hình: "
+
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
+#, c-format
+msgid "Cannot open file '%s'"
+msgstr "Không thể mở tập tin '%s'"
+
+#: fdisk/cfdisk.c:1994
+#, c-format
+msgid "Disk Drive: %s\n"
+msgstr "á»” Ä‘Ä©a: %s\n"
+
+#: fdisk/cfdisk.c:1996
+msgid "Sector 0:\n"
+msgstr "Sector 0:\n"
+
+#: fdisk/cfdisk.c:2003
+#, c-format
+msgid "Sector %d:\n"
+msgstr "Sector %d:\n"
+
+#: fdisk/cfdisk.c:2023
+msgid "   None   "
+msgstr "   Không   "
+
+#: fdisk/cfdisk.c:2025
+msgid "   Pri/Log"
+msgstr "   Chính/Lôgíc"
+
+#: fdisk/cfdisk.c:2027
+msgid "   Primary"
+msgstr "   Chính"
+
+#: fdisk/cfdisk.c:2029
+msgid "   Logical"
+msgstr "   Lôgíc"
+
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
+msgid "Boot"
+msgstr "Khởi động"
+
+#: fdisk/cfdisk.c:2075
+#, c-format
+msgid "(%02X)"
+msgstr "(%02X)"
+
+#: fdisk/cfdisk.c:2077
+msgid "None"
+msgstr "Không"
+
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
+#, c-format
+msgid "Partition Table for %s\n"
+msgstr "Bảng Phân Vùng cho %s\n"
+
+#: fdisk/cfdisk.c:2114
+msgid "               First       Last\n"
+msgstr "               �ầu         Cuối\n"
+
+#: fdisk/cfdisk.c:2115
+msgid ""
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+msgstr ""
+" # Loại       Sector      Sector   Offset    �ộ dài    Hệ thống  Loại (ID) "
+"C�\n"
+
+#: fdisk/cfdisk.c:2116
+msgid ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+
+#: fdisk/cfdisk.c:2199
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ---Bắt đầu---      ----Kết thúc----    Bắt_đầu     Số của\n"
+
+#: fdisk/cfdisk.c:2200
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " #C� �ầuđ�c Sect Cyl   ID  �ầuđ�c Sect Cyl     Sector    Sectors\n"
+
+#: fdisk/cfdisk.c:2201
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+
+#: fdisk/cfdisk.c:2234
+msgid "Raw"
+msgstr "Thô sơ"
+
+#: fdisk/cfdisk.c:2234
+msgid "Print the table using raw data format"
+msgstr "In bảng ra sử dụng định dạng dữ liệu thô"
+
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
+msgid "Sectors"
+msgstr "Các Sector"
+
+#: fdisk/cfdisk.c:2235
+msgid "Print the table ordered by sectors"
+msgstr "In bảng theo thứ tự sector"
+
+#: fdisk/cfdisk.c:2236
+msgid "Table"
+msgstr "Bảng"
+
+#: fdisk/cfdisk.c:2236
+msgid "Just print the partition table"
+msgstr "Chỉ in bảng phân vùng"
+
+#: fdisk/cfdisk.c:2237
+msgid "Don't print the table"
+msgstr "�ừng in bảng phân vùng"
+
+#: fdisk/cfdisk.c:2265
+msgid "Help Screen for cfdisk"
+msgstr "Trợ giúp của cfdisk"
+
+#: fdisk/cfdisk.c:2267
+msgid "This is cfdisk, a curses based disk partitioning program, which"
+msgstr "�ây là cfdisk, một chương trình phân vùng đĩa dựa trên curse, "
+
+#: fdisk/cfdisk.c:2268
+msgid "allows you to create, delete and modify partitions on your hard"
+msgstr "chương trình cho phép bạn tạo, xóa và sửa đổi các phân vùng"
+
+#: fdisk/cfdisk.c:2269
+msgid "disk drive."
+msgstr "ổ đĩa cứng."
+
+#: fdisk/cfdisk.c:2271
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Bản quy�n (C) 1994-1999 Kevin E. Martin & aeb"
+
+#: fdisk/cfdisk.c:2273
+msgid "Command      Meaning"
+msgstr "Câu lệnh      � nghĩa"
+
+#: fdisk/cfdisk.c:2274
+msgid "-------      -------"
+msgstr "-------      -------"
+
+#: fdisk/cfdisk.c:2275
+msgid "  b          Toggle bootable flag of the current partition"
+msgstr "  b          Bật/tắt khả năng khởi động của phân vùng hiện tại"
+
+#: fdisk/cfdisk.c:2276
+msgid "  d          Delete the current partition"
+msgstr "  d          Xóa phân vùng hiện th�i"
+
+#: fdisk/cfdisk.c:2277
+msgid "  g          Change cylinders, heads, sectors-per-track parameters"
+msgstr ""
+"   g          Thay đổi các tham số: cylinders, heads, sectors-per-track"
+
+#: fdisk/cfdisk.c:2278
+msgid "             WARNING: This option should only be used by people who"
+msgstr "             CẢNH B�O: Tùy ch�n này chỉ dành cho những ngư�i dùng"
+
+#: fdisk/cfdisk.c:2279
+msgid "             know what they are doing."
+msgstr "             đã có kinh nghiệm."
+
+#: fdisk/cfdisk.c:2280
+msgid "  h          Print this screen"
+msgstr "  h          Hiển thị trợ giúp này"
+
+#: fdisk/cfdisk.c:2281
+msgid "  m          Maximize disk usage of the current partition"
+msgstr "  m          Giới hạn sử dụng lớn nhất của phân vùng hiện th�i"
+
+#: fdisk/cfdisk.c:2282
+msgid "             Note: This may make the partition incompatible with"
+msgstr "             Chú ý: Có thể làm cho phân vùng không tương thích với"
+
+#: fdisk/cfdisk.c:2283
+msgid "             DOS, OS/2, ..."
+msgstr "             DOS, OS/2, ..."
+
+#: fdisk/cfdisk.c:2284
+msgid "  n          Create new partition from free space"
+msgstr "  n          Tạo một phân vùng mới từ không gian trống"
+
+#: fdisk/cfdisk.c:2285
+msgid "  p          Print partition table to the screen or to a file"
+msgstr "  p          In ra màn hình hay ghi vào tập tin bảng phân vùng"
+
+#: fdisk/cfdisk.c:2286
+msgid "             There are several different formats for the partition"
+msgstr "             Có vài định dạng khác nhau cho phân vùng"
+
+#: fdisk/cfdisk.c:2287
+msgid "             that you can choose from:"
+msgstr "             mà bạn có thể ch�n từ:"
+
+#: fdisk/cfdisk.c:2288
+msgid "                r - Raw data (exactly what would be written to disk)"
+msgstr "                r - Dữ liệu thô (là những gì sẽ được ghi lên đĩa)"
+
+#: fdisk/cfdisk.c:2289
+msgid "                s - Table ordered by sectors"
+msgstr "                s - Bảng theo thứ tự sector"
+
+#: fdisk/cfdisk.c:2290
+msgid "                t - Table in raw format"
+msgstr "                t - Bảng trong định dạng thô"
+
+#: fdisk/cfdisk.c:2291
+msgid "  q          Quit program without writing partition table"
+msgstr "  q          Thoát kh�i chương trình và không ghi lại bảng phân vùng"
+
+#: fdisk/cfdisk.c:2292
+msgid "  t          Change the filesystem type"
+msgstr "  t          Thay đổi loại hệ thống tập tin"
+
+#: fdisk/cfdisk.c:2293
+msgid "  u          Change units of the partition size display"
+msgstr "  u          Thay đổi đơn vị hiển thị kích thước"
+
+#: fdisk/cfdisk.c:2294
+msgid "             Rotates through MB, sectors and cylinders"
+msgstr "             Luân phiên MB, sector và cylinder"
+
+#: fdisk/cfdisk.c:2295
+msgid "  W          Write partition table to disk (must enter upper case W)"
+msgstr "  W          Ghi bảng phân vùng lên đĩa (cần nhập chữa W hoa)"
+
+#: fdisk/cfdisk.c:2296
+msgid "             Since this might destroy data on the disk, you must"
+msgstr "             Vì câu lệnh sẽ hủy dữ liệu trên đĩa, bạn cần"
+
+#: fdisk/cfdisk.c:2297
+msgid "             either confirm or deny the write by entering `yes' or"
+msgstr "             hoặc đồng ý hoặc hủy b� việc ghi bằng các nhập `yes' hoặc"
+
+#: fdisk/cfdisk.c:2298
+msgid "             `no'"
+msgstr "             `no'"
+
+#: fdisk/cfdisk.c:2299
+msgid "Up Arrow     Move cursor to the previous partition"
+msgstr "Mũi tên lên     Di chuyển con tr� tới phân vùng ở trước"
+
+#: fdisk/cfdisk.c:2300
+msgid "Down Arrow   Move cursor to the next partition"
+msgstr "Mũi tên xuống   Di chuyển con tr� tới phân vùng tiếp theo"
+
+#: fdisk/cfdisk.c:2301
+msgid "CTRL-L       Redraws the screen"
+msgstr "CTRL-L       Kéo màn hình lên"
+
+#: fdisk/cfdisk.c:2302
+msgid "  ?          Print this screen"
+msgstr "  ?          Hiển thị trợ giúp này"
+
+#: fdisk/cfdisk.c:2304
+msgid "Note: All of the commands can be entered with either upper or lower"
+msgstr "Chú ý: Có thể nhập tất cả các câu lệnh với chữ thư�ng và chữ hoa"
+
+#: fdisk/cfdisk.c:2305
+msgid "case letters (except for Writes)."
+msgstr "(ngoại trừ Writes - ghi)."
+
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
+msgid "Cylinders"
+msgstr "Cylinder"
+
+#: fdisk/cfdisk.c:2336
+msgid "Change cylinder geometry"
+msgstr "Thay đổi cấu trúc cylinder"
+
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
+msgid "Heads"
+msgstr "�ầu đ�c"
+
+#: fdisk/cfdisk.c:2337
+msgid "Change head geometry"
+msgstr "Thay đổi cấu trúc đầu đ�c"
+
+#: fdisk/cfdisk.c:2338
+msgid "Change sector geometry"
+msgstr "Thay đổi cấu trúc sector"
+
+#: fdisk/cfdisk.c:2339
+msgid "Done"
+msgstr "Hoàn thành"
+
+#: fdisk/cfdisk.c:2339
+msgid "Done with changing geometry"
+msgstr "Hoàn thành việc thay đổi cấu trúc"
+
+#: fdisk/cfdisk.c:2352
+msgid "Enter the number of cylinders: "
+msgstr "Nhập số cylinders: "
+
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
+msgid "Illegal cylinders value"
+msgstr "Giá trị cylinder không thích hợp"
+
+#: fdisk/cfdisk.c:2369
+msgid "Enter the number of heads: "
+msgstr "Nhập số đầu đ�c: "
+
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
+msgid "Illegal heads value"
+msgstr "Giá trị số đầu đ�c không thích hợp"
+
+#: fdisk/cfdisk.c:2382
+msgid "Enter the number of sectors per track: "
+msgstr "Nhập số sector trên mỗi rãnh (track): "
+
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
+msgid "Illegal sectors value"
+msgstr "Giá trị số sector không thích hợp"
+
+#: fdisk/cfdisk.c:2492
+msgid "Enter filesystem type: "
+msgstr "Nhập loại hệ thống tập tin: "
+
+#: fdisk/cfdisk.c:2510
+msgid "Cannot change FS Type to empty"
+msgstr "Không thể thay đổi loại hệ thống tập tin cho rỗng"
+
+#: fdisk/cfdisk.c:2512
+msgid "Cannot change FS Type to extended"
+msgstr "Không thể thay đổi loại hệ thống tập tin cho mở rộng"
+
+#: fdisk/cfdisk.c:2543
+#, c-format
+msgid "Unk(%02X)"
+msgstr "Khôngrõ(%02X)"
+
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
+msgid ", NC"
+msgstr ", NC"
+
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
+msgid "NC"
+msgstr "NC"
+
+#: fdisk/cfdisk.c:2565
+msgid "Pri/Log"
+msgstr "Chính/Lôgíc"
+
+#: fdisk/cfdisk.c:2572
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Không rõ (%02X)"
+
+#: fdisk/cfdisk.c:2641
+#, c-format
+msgid "Disk Drive: %s"
+msgstr "á»” Ä‘Ä©a: %s"
+
+#: fdisk/cfdisk.c:2648
+#, c-format
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Kích thước: %lld byte, %lld MB"
+
+#: fdisk/cfdisk.c:2651
+#, c-format
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Kích thước: %lld byte, %lld.%lld GB"
+
+#: fdisk/cfdisk.c:2655
+#, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "�ầu đ�c: %d Sector mỗi rãnh: %d Cylinder: %lld"
+
+#: fdisk/cfdisk.c:2659
+msgid "Name"
+msgstr "Tên"
+
+#: fdisk/cfdisk.c:2660
+msgid "Flags"
+msgstr "C�"
+
+#: fdisk/cfdisk.c:2661
+msgid "Part Type"
+msgstr "Loại phân vùng"
+
+#: fdisk/cfdisk.c:2662
+msgid "FS Type"
+msgstr "Loại hệ thống tập tin"
+
+#: fdisk/cfdisk.c:2663
+msgid "[Label]"
+msgstr "[Nhãn]"
+
+#: fdisk/cfdisk.c:2665
+msgid "    Sectors"
+msgstr "    Sector"
+
+#: fdisk/cfdisk.c:2667
+msgid "  Cylinders"
+msgstr "  Cylinder"
+
+#: fdisk/cfdisk.c:2669
+msgid "  Size (MB)"
+msgstr "  Kích thước (MB)"
+
+#: fdisk/cfdisk.c:2671
+msgid "  Size (GB)"
+msgstr "  Kích thước (GB)"
+
+#: fdisk/cfdisk.c:2725
+msgid "Bootable"
+msgstr "Có thể khởi động"
+
+#: fdisk/cfdisk.c:2725
+msgid "Toggle bootable flag of the current partition"
+msgstr "Bặt tắt khả năng khởi động của phân vùng"
+
+#: fdisk/cfdisk.c:2726
+msgid "Delete"
+msgstr "Xóa"
+
+#: fdisk/cfdisk.c:2726
+msgid "Delete the current partition"
+msgstr "Xóa phân vùng hiện th�i"
+
+#: fdisk/cfdisk.c:2727
+msgid "Geometry"
+msgstr "Cấu trúc"
+
+#: fdisk/cfdisk.c:2727
+msgid "Change disk geometry (experts only)"
+msgstr "Thay đổi cấu trúc đĩa (chỉ dành cho ngư�i có kinh nghiệm)"
+
+#: fdisk/cfdisk.c:2728
+msgid "Help"
+msgstr "Trợ giúp"
+
+#: fdisk/cfdisk.c:2728
+msgid "Print help screen"
+msgstr "Hiển thị màn hình trợ giúp"
+
+#: fdisk/cfdisk.c:2729
+msgid "Maximize"
+msgstr "Lớn nhất"
+
+#: fdisk/cfdisk.c:2729
+msgid "Maximize disk usage of the current partition (experts only)"
+msgstr "Giới hạn dùng lớn nhất của phân vùng hiện th�i"
+
+#: fdisk/cfdisk.c:2730
+msgid "New"
+msgstr "Má»›i"
+
+#: fdisk/cfdisk.c:2730
+msgid "Create new partition from free space"
+msgstr "Tạo một phân vùng mới từ vùng đĩa trống"
+
+#: fdisk/cfdisk.c:2731
+msgid "Print"
+msgstr "In"
+
+#: fdisk/cfdisk.c:2731
+msgid "Print partition table to the screen or to a file"
+msgstr "In bản phân vùng ra màn hình hay ghi vào tập tin"
+
+#: fdisk/cfdisk.c:2732
+msgid "Quit"
+msgstr "Thoát"
+
+#: fdisk/cfdisk.c:2732
+msgid "Quit program without writing partition table"
+msgstr "Thoát chương trình và không ghi lại bảng phân vùng"
+
+#: fdisk/cfdisk.c:2733
+msgid "Type"
+msgstr "Loại"
+
+#: fdisk/cfdisk.c:2733
+msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
+msgstr "Thay đổi hệ thống tập tin (DOS, Linux, OS/2 và v.v...)"
+
+#: fdisk/cfdisk.c:2734
+msgid "Units"
+msgstr "�ơn vị"
+
+#: fdisk/cfdisk.c:2734
+msgid "Change units of the partition size display (MB, sect, cyl)"
+msgstr "Thay đổi đơn vị hiện thị kích thước phân vùng (MB, sect, cyl)"
+
+#: fdisk/cfdisk.c:2735
+msgid "Write"
+msgstr "Ghi"
+
+#: fdisk/cfdisk.c:2735
+msgid "Write partition table to disk (this might destroy data)"
+msgstr "Ghi bảng phân vùng lên đĩa (có thể hủy dữ liệu)"
+
+#: fdisk/cfdisk.c:2781
+msgid "Cannot make this partition bootable"
+msgstr "Không thể làm cho phân vùng có thể khởi động"
+
+#: fdisk/cfdisk.c:2791
+msgid "Cannot delete an empty partition"
+msgstr "Không thể xóa một phân vùng rỗng"
+
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
+msgid "Cannot maximize this partition"
+msgstr "Không thể tăng kích thước lên lớn nhất phân vùng này"
+
+#: fdisk/cfdisk.c:2821
+msgid "This partition is unusable"
+msgstr "Phân vùng không thể sử dụng"
+
+#: fdisk/cfdisk.c:2823
+msgid "This partition is already in use"
+msgstr "Phân vùng đã được sử dụng"
+
+#: fdisk/cfdisk.c:2840
+msgid "Cannot change the type of an empty partition"
+msgstr "Không thể thay đổi loại của một phân vùng rỗng"
+
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
+msgid "No more partitions"
+msgstr "Không có thêm phân vùng nào nữa"
+
+#: fdisk/cfdisk.c:2880
+msgid "Illegal command"
+msgstr "Lệnh không được chấp nhận"
+
+#: fdisk/cfdisk.c:2890
+#, c-format
+msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
+msgstr "Bản quy�n (C) 1994-2002 Kevin E. Martin & aeb\n"
+
+#: fdisk/cfdisk.c:2897
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+"Print version:\n"
+"        %s -v\n"
+"Print partition table:\n"
+"        %s -P {r|s|t} [options] device\n"
+"Interactive use:\n"
+"        %s [options] device\n"
+"\n"
+"Options:\n"
+"-a: Use arrow instead of highlighting;\n"
+"-z: Start with a zero partition table, instead of reading the pt from disk;\n"
+"-c C -h H -s S: Override the kernel's idea of the number of cylinders,\n"
+"                the number of heads and the number of sectors/track.\n"
+"\n"
+msgstr ""
+"\n"
+"Sử dụng:\n"
+"Hiện số phiên bản:\n"
+"        %s -v\n"
+"Hiện bảng phân vùng:\n"
+"        %s -P {r|s|t} [tùy ch�n] thiết bị\n"
+"Interactive use:\n"
+"        %s [tùy ch�n] thiết bị\n"
+"\n"
+"Tùy ch�n:\n"
+"-a: sử dụng mũi tên thay cho hiện sáng;\n"
+"-z: Khởi động với bảng phân vùng rỗng thay vì đ�c từ ổ đĩa;\n"
+"-c C -h H -s S: Viết chèn lên số cylinder, số đầu đ�c và số,\n"
+"                sectors/track theo quan niệm của nhân Linux.\n"
+"\n"
+
+#: fdisk/fdiskaixlabel.c:27
+msgid ""
+"\n"
+"\tThere is a valid AIX label on this disk.\n"
+"\tUnfortunately Linux cannot handle these\n"
+"\tdisks at the moment.  Nevertheless some\n"
+"\tadvice:\n"
+"\t1. fdisk will destroy its contents on write.\n"
+"\t2. Be sure that this disk is NOT a still vital\n"
+"\t   part of a volume group. (Otherwise you may\n"
+"\t   erase the other disks as well, if unmirrored.)\n"
+"\t3. Before deleting this physical volume be sure\n"
+"\t   to remove the disk logically from your AIX\n"
+"\t   machine.  (Otherwise you become an AIXpert)."
+msgstr ""
+"\n"
+"\tCó một nhãn AIX sai trên đĩa này.\n"
+"\tKhông may là hiện tại Linux không thể đi�u khiển\n"
+"\tnhững đĩa này.  Tuy nhiên một vài\n"
+"\tl�i khuyên:\n"
+"\t1. fdisk sẽ hủy hết nội dung đĩa khi ghi.\n"
+"\t2. Cần đảm bảo là đĩa này KHÔNG phải là phần\n"
+"\t   quan tr�ng của một nhóm đĩa. (Nói cách khác bạn có\n"
+"\t   thể xóa các đĩa khác, nếu không tạo gương.)\n"
+"\t3. Trước khi xóa bộ đĩa vật lý này, cần phải\n"
+"\t   xóa đĩa một cách lôgíc từ máy AIX.\n"
+"\t   (Nói cách khác bạn trở thành AIXpert)."
+
+#: fdisk/fdiskbsdlabel.c:122
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+"\n"
+"Nhãn BSD cho thiết bị: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
+msgid "Command action"
+msgstr "Tác dụng của câu lệnh"
+
+#: fdisk/fdiskbsdlabel.c:130
+msgid "   d   delete a BSD partition"
+msgstr "   d   xóa một phân vùng BSD"
+
+#: fdisk/fdiskbsdlabel.c:131
+msgid "   e   edit drive data"
+msgstr "   e   sửa dữ liệu ổ đĩa"
+
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   i   install bootstrap"
+msgstr "   i   cài đặt trình khởi động tự mồi"
+
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   l   list known filesystem types"
+msgstr "   l   liệt kê loại hệ thống tập tin đã biết"
+
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+msgid "   m   print this menu"
+msgstr "   m   hiển thị trình đơn này"
+
+#: fdisk/fdiskbsdlabel.c:135
+msgid "   n   add a new BSD partition"
+msgstr "   n   thêm một phân vùng BSD mới"
+
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   p   print BSD partition table"
+msgstr "   p   in ra bảng phân vùng BSD"
+
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
+msgid "   q   quit without saving changes"
+msgstr "   q   thoát và không ghi nhớ các thay đổi"
+
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
+msgid "   r   return to main menu"
+msgstr "   r   trở lại trình đơn chính"
+
+#: fdisk/fdiskbsdlabel.c:139
+msgid "   s   show complete disklabel"
+msgstr "   s   hiển thị nhãn đĩa đầy đủ"
+
+#: fdisk/fdiskbsdlabel.c:140
+msgid "   t   change a partition's filesystem id"
+msgstr "   t   thay đổi id hệ thống tập tin của một phân vùng"
+
+#: fdisk/fdiskbsdlabel.c:141
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   thay đổi đơn vị (cylinder/sector)"
+
+#: fdisk/fdiskbsdlabel.c:142
+msgid "   w   write disklabel to disk"
+msgstr "   w   ghi nhớ nhãn đĩa lên ổ đĩa"
+
+#: fdisk/fdiskbsdlabel.c:144
+msgid "   x   link BSD partition to non-BSD partition"
+msgstr "   x   liên kết phân vùng BSD tới phân vùng không phải BSD"
+
+#: fdisk/fdiskbsdlabel.c:176
+#, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "Phân vùng %s có một sector 0 bị lỗi.\n"
+
+#: fdisk/fdiskbsdlabel.c:180
+#, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "��c nhãn đĩa của %s tại sector %d.\n"
+
+#: fdisk/fdiskbsdlabel.c:190
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr "Không có phân vùng *BSD trên %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:204
+msgid "BSD disklabel command (m for help): "
+msgstr "Câu lệnh nhãn đĩa BSD (m để xem trợ giúp): "
+
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
+#, c-format
+msgid "First %s"
+msgstr "%s đầu tiên"
+
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "%s cuối hay +size hay +sizeM hay +sizeK"
+
+#: fdisk/fdiskbsdlabel.c:318
+#, c-format
+msgid "type: %s\n"
+msgstr "loại: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:320
+#, c-format
+msgid "type: %d\n"
+msgstr "loại: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:321
+#, c-format
+msgid "disk: %.*s\n"
+msgstr "Ä‘Ä©a: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:322
+#, c-format
+msgid "label: %.*s\n"
+msgstr "nhãn: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:323
+#, c-format
+msgid "flags:"
+msgstr "c�:"
+
+#: fdisk/fdiskbsdlabel.c:325
+#, c-format
+msgid " removable"
+msgstr " có thể xóa"
+
+#: fdisk/fdiskbsdlabel.c:327
+#, c-format
+msgid " ecc"
+msgstr " ecc"
+
+#: fdisk/fdiskbsdlabel.c:329
+#, c-format
+msgid " badsect"
+msgstr " sector xấu"
+
+#: fdisk/fdiskbsdlabel.c:333
+#, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "byte/sector: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:334
+#, c-format
+msgid "sectors/track: %ld\n"
+msgstr "sector/track: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:335
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr "track/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:336
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr "sector/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:337
+#, c-format
+msgid "cylinders: %ld\n"
+msgstr "cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:338
+#, c-format
+msgid "rpm: %d\n"
+msgstr "vòng mỗi phút: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:339
+#, c-format
+msgid "interleave: %d\n"
+msgstr "xen kẽ: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:340
+#, c-format
+msgid "trackskew: %d\n"
+msgstr "độ nghiêng track: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:341
+#, c-format
+msgid "cylinderskew: %d\n"
+msgstr "�ộ nghiêng trụ (cylinder): %d\n"
+
+#: fdisk/fdiskbsdlabel.c:342
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr "bật đầu đ�c: %ld\t\t# milli giây\n"
+
+#: fdisk/fdiskbsdlabel.c:344
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr "tìm kiếm từ track tới track: %ld\t# milli giây\n"
+
+#: fdisk/fdiskbsdlabel.c:346
+#, c-format
+msgid "drivedata: "
+msgstr "dữ liệu ổ đĩa: "
+
+#: fdisk/fdiskbsdlabel.c:355
+#, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
+msgstr ""
+"\n"
+"%d phân vùng:\n"
+
+#: fdisk/fdiskbsdlabel.c:356
+#, c-format
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr ""
+"#       đầu        cuối     kích thước     hệthống   [fsize bsize   cpg]\n"
+
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
+#, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "Viết nhãn đĩa tới %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr "%s không chứa nhãn đĩa.\n"
+
+#: fdisk/fdiskbsdlabel.c:427
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr "Bạn có muốn tạo một nhãn đĩa? (y/n) "
+
+#: fdisk/fdiskbsdlabel.c:467
+msgid "bytes/sector"
+msgstr "byte/sector"
+
+#: fdisk/fdiskbsdlabel.c:468
+msgid "sectors/track"
+msgstr "sector/track"
+
+#: fdisk/fdiskbsdlabel.c:469
+msgid "tracks/cylinder"
+msgstr "track/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
+msgid "cylinders"
+msgstr "cylinder"
+
+#: fdisk/fdiskbsdlabel.c:477
+msgid "sectors/cylinder"
+msgstr "sector/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:481
+#, c-format
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr "Phải <= số sector/track * số track/cylinder (mặc định).\n"
+
+#: fdisk/fdiskbsdlabel.c:483
+msgid "rpm"
+msgstr "số vòng mỗi phút"
+
+#: fdisk/fdiskbsdlabel.c:484
+msgid "interleave"
+msgstr "xen kẽ"
+
+#: fdisk/fdiskbsdlabel.c:485
+msgid "trackskew"
+msgstr "độ nghiêng track"
+
+#: fdisk/fdiskbsdlabel.c:486
+msgid "cylinderskew"
+msgstr "�ộ nghiêng trụ (cylinder)"
+
+#: fdisk/fdiskbsdlabel.c:487
+msgid "headswitch"
+msgstr "bật đầu đ�c"
+
+#: fdisk/fdiskbsdlabel.c:488
+msgid "track-to-track seek"
+msgstr "tìm kiếm từ track tới track"
+
+#: fdisk/fdiskbsdlabel.c:529
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr "Trình mồi: %sboot -> boot%s (%s): "
+
+#: fdisk/fdiskbsdlabel.c:554
+#, c-format
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Trình mồi đè lên nhau với nhãn đĩa!\n"
+
+#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Trình mồi được cài trên %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:599
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "Phân vùng (a-%c): "
+
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
+#, c-format
+msgid "The maximum number of partitions has been created\n"
+msgstr "�ã tạo ra số phân vùng lớn nhất cho phép\n"
+
+#: fdisk/fdiskbsdlabel.c:630
+#, c-format
+msgid "This partition already exists.\n"
+msgstr "Phân vùng này đã có.\n"
+
+#: fdisk/fdiskbsdlabel.c:756
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr "Cảnh báo: có quá nhi�u phân vùng (%d, max là %d).\n"
+
+#: fdisk/fdiskbsdlabel.c:804
+#, c-format
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+"\n"
+"�ồng bộ các đĩa.\n"
+
+#: fdisk/fdisk.c:190
+msgid ""
+"Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
+"       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
+"       fdisk -s PARTITION           Give partition size(s) in blocks\n"
+"       fdisk -v                     Give fdisk version\n"
+"Here DISK is something like /dev/hdb or /dev/sda\n"
+"and PARTITION is something like /dev/hda7\n"
+"-u: give Start and End in sector (instead of cylinder) units\n"
+"-b 2048: (for certain MO disks) use 2048-byte sectors\n"
+msgstr ""
+"Sử dụng: fdisk [-b SSZ] [-u] �ĨA    Thay đổi bảng phân vùng\n"
+"       fdisk -l [-b SSZ] [-u] �ĨA   Liệt kê bảng phân vùng\n"
+"       fdisk -s PHÂN_VÙNG           Cho biết kích thước phân vùng theo khối\n"
+"       fdisk -v                     Cho biết số phiên bản fdisk\n"
+"Trong đó �ĨA có dạng /dev/hdb hay /dev/sda\n"
+"còn PHÂN_VÙNG có dạng /dev/hda7\n"
+"-u: cho biết �ầu và Cuối theo đơn vị sector (thay vì cylinder)\n"
+"-b 2048: (cho các đĩa MO) sử dụng các sector 2048 byte\n"
+
+#: fdisk/fdisk.c:202
+msgid ""
+"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
+"E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
+"  or: fdisk /dev/sdc  (for the third SCSI disk)\n"
+"  or: fdisk /dev/eda  (for the first PS/2 ESDI drive)\n"
+"  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
+"  ...\n"
+msgstr ""
+"Sử dụng: fdisk [-l] [-b SSZ] [-u] thiết_bị\n"
+"V.d.: fdisk /dev/hda  (cho đĩa IDE đầu tiên)\n"
+"  hay: fdisk /dev/sdc  (cho đĩa SCSI thứ ba)\n"
+"  hay: fdisk /dev/eda  (cho ổ PS/2 ESDI đầu tiên)\n"
+"  hay: fdisk /dev/rd/c0d0  hay: fdisk /dev/ida/c0d0  (cho các thiết bị "
+"RAID)\n"
+"  ...\n"
+
+#: fdisk/fdisk.c:211
+#, c-format
+msgid "Unable to open %s\n"
+msgstr "Không thể mở %s\n"
+
+#: fdisk/fdisk.c:215
+#, c-format
+msgid "Unable to read %s\n"
+msgstr "Không thể đ�c %s\n"
+
+#: fdisk/fdisk.c:219
+#, c-format
+msgid "Unable to seek on %s\n"
+msgstr "Không thể tìm trên %s\n"
+
+#: fdisk/fdisk.c:223
+#, c-format
+msgid "Unable to write %s\n"
+msgstr "Không thể ghi %s\n"
+
+#: fdisk/fdisk.c:227
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr "BLKGETSIZE ioctl không thành công trên %s\n"
+
+#: fdisk/fdisk.c:231
+msgid "Unable to allocate any more memory\n"
+msgstr "Không thể phân phối thêm bộ nhớ\n"
+
+#: fdisk/fdisk.c:234
+msgid "Fatal error\n"
+msgstr "Lỗi nặng\n"
+
+#: fdisk/fdisk.c:333
+msgid "   a   toggle a read only flag"
+msgstr "   a   bật/tắt c� chỉ đ�c"
+
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
+msgid "   b   edit bsd disklabel"
+msgstr "   b   sửa nhãn đĩa bsd"
+
+#: fdisk/fdisk.c:335
+msgid "   c   toggle the mountable flag"
+msgstr "   c   bật c� có thể gắn"
+
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
+msgid "   d   delete a partition"
+msgstr "   d   xóa một phân vùng"
+
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+msgid "   l   list known partition types"
+msgstr "   l   hiển thị loại phân vùng đã biết"
+
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
+msgid "   n   add a new partition"
+msgstr "   n   thêm một phân vùng mới"
+
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
+msgid "   o   create a new empty DOS partition table"
+msgstr "   o   tạo một bảng phân vùng DOS rỗng"
+
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
+msgid "   p   print the partition table"
+msgstr "   p   in ra bảng phân vùng"
+
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
+msgid "   s   create a new empty Sun disklabel"
+msgstr "   s   tạo một nhãn đĩa Sun rỗng"
+
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
+msgid "   t   change a partition's system id"
+msgstr "   t   thay đổi id của phân vùng"
+
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
+msgid "   u   change display/entry units"
+msgstr "   u   thay đổi đơn vị hiển thị"
+
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
+msgid "   v   verify the partition table"
+msgstr "   v   kiểm tra bảng phân vùng"
+
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
+msgid "   w   write table to disk and exit"
+msgstr "   w   ghi bảng phân vùng lên đĩa và thoát"
+
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
+msgid "   x   extra functionality (experts only)"
+msgstr "   x   các chức năng mở rộng (chỉ dành cho ngư�i có kinh nghiệm)"
+
+#: fdisk/fdisk.c:352
+msgid "   a   select bootable partition"
+msgstr "   a   ch�n phân vùng có thể khởi động"
+
+#: fdisk/fdisk.c:353
+msgid "   b   edit bootfile entry"
+msgstr "   b   soạn thảo tập tin khởi động"
+
+#: fdisk/fdisk.c:354
+msgid "   c   select sgi swap partition"
+msgstr "   c   ch�n phân vùng swap sgi"
+
+#: fdisk/fdisk.c:377
+msgid "   a   toggle a bootable flag"
+msgstr "   a   bật/tắt c� có thể khởi động"
+
+#: fdisk/fdisk.c:379
+msgid "   c   toggle the dos compatibility flag"
+msgstr "   c   bật/tắt c� tương thích với dos"
+
+#: fdisk/fdisk.c:400
+msgid "   a   change number of alternate cylinders"
+msgstr "   a   thay đổi số cylinder xen kẽ"
+
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+msgid "   c   change number of cylinders"
+msgstr "   c   thay đổi số cylinder"
+
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
+msgid "   d   print the raw data in the partition table"
+msgstr "   d   in ra dữ liệu thô trong bảng phân vùng"
+
+#: fdisk/fdisk.c:403
+msgid "   e   change number of extra sectors per cylinder"
+msgstr "   e   thay đổi số sector dự phòng trong mỗi cylinder"
+
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+msgid "   h   change number of heads"
+msgstr "   h   thay đổi số đầu đ�c"
+
+#: fdisk/fdisk.c:405
+msgid "   i   change interleave factor"
+msgstr "   i   thay đổi hệ số xen kẽ"
+
+#: fdisk/fdisk.c:406
+msgid "   o   change rotation speed (rpm)"
+msgstr "   o   thay đổi tốc độ quay (rpm)"
+
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+msgid "   s   change number of sectors/track"
+msgstr "   s   thay đổi số sector/track"
+
+#: fdisk/fdisk.c:414
+msgid "   y   change number of physical cylinders"
+msgstr "   y   thay đổi số cylinder vật lý"
+
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+msgid "   b   move beginning of data in a partition"
+msgstr "   b   di chuyển bắt đầu của dữ liệu trong một phân vùng"
+
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
+msgid "   e   list extended partitions"
+msgstr "   e   liệt kê các phân vùng mở rộng"
+
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+msgid "   g   create an IRIX (SGI) partition table"
+msgstr "   g   tạo một bảng phân vùng IRIX (SGI)"
+
+#: fdisk/fdisk.c:454
+msgid "   f   fix partition order"
+msgstr "   f   sửa thứ tự phân vùng"
+
+#: fdisk/fdisk.c:572
+#, c-format
+msgid "You must set"
+msgstr "Bạn phải đặt"
+
+#: fdisk/fdisk.c:589
+msgid "heads"
+msgstr "đầu đ�c"
+
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
+msgid "sectors"
+msgstr "sector"
+
+#: fdisk/fdisk.c:597
+#, c-format
+msgid ""
+"%s%s.\n"
+"You can do this from the extra functions menu.\n"
+msgstr ""
+"%s%s.\n"
+"Bạn có thể làm việc này từ trình đơn chức năng mở rộng.\n"
+
+#: fdisk/fdisk.c:598
+msgid " and "
+msgstr " và "
+
+#: fdisk/fdisk.c:615
+#, c-format
+msgid ""
+"\n"
+"The number of cylinders for this disk is set to %d.\n"
+"There is nothing wrong with that, but this is larger than 1024,\n"
+"and could in certain setups cause problems with:\n"
+"1) software that runs at boot time (e.g., old versions of LILO)\n"
+"2) booting and partitioning software from other OSs\n"
+"   (e.g., DOS FDISK, OS/2 FDISK)\n"
+msgstr ""
+"\n"
+"Số cylinder cho đĩa này được đặt thành %d.\n"
+"Không có gì sai, nhưng số này lớn hơn 1024,\n"
+"và có thể tạo vấn đ� với:\n"
+"1) phần m�m chạy tại th�i điểm khởi động (v.d., phiên bản LILO cũ)\n"
+"2) phần m�m khởi động và phân vùng từ các H�H khác\n"
+"   (v.d., DOS FDISK, OS/2 FDISK)\n"
+
+#: fdisk/fdisk.c:638
+#, c-format
+msgid "Bad offset in primary extended partition\n"
+msgstr "Offset xấu trong phân vùng mở rộng chính\n"
+
+#: fdisk/fdisk.c:652
+#, c-format
+msgid ""
+"Warning: omitting partitions after #%d.\n"
+"They will be deleted if you save this partition table.\n"
+msgstr ""
+"Cảnh báo: B� sót các phân vùng sau #%d.\n"
+"Chúng sẽ bị xóa nếu bạn ghi nhớ bảng phân vùng này.\n"
+
+#: fdisk/fdisk.c:671
+#, c-format
+msgid "Warning: extra link pointer in partition table %d\n"
+msgstr "Cảnh báo: điểm liên kết dự phòng trong bảng phân vùng %d\n"
+
+#: fdisk/fdisk.c:679
+#, c-format
+msgid "Warning: ignoring extra data in partition table %d\n"
+msgstr "Cảnh báo: b� qua dữ liệu dự phòng trong bảng phân vùng %d\n"
+
+#: fdisk/fdisk.c:724
+#, c-format
+msgid ""
+"Building a new DOS disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content won't be recoverable.\n"
+"\n"
+msgstr ""
+"Tạo một nhãn đĩa DOS mới. Thay đỗi chỉ nằm tạm trong bộ nhớ,\n"
+"cho đến khi bạn quyết định ghi chúng. Sau đó, tất nhiên, nội dung\n"
+"trước đó sẽ không thể được phục hồi.\n"
+
+#: fdisk/fdisk.c:768
+#, c-format
+msgid "Note: sector size is %d (not %d)\n"
+msgstr "Chú ý: kích thước sector là %d (không %d)\n"
+
+#: fdisk/fdisk.c:925
+#, c-format
+msgid "You will not be able to write the partition table.\n"
+msgstr "Bạn sẽ không thể ghi nhớ bảng phân vùng.\n"
+
+#: fdisk/fdisk.c:954
+#, c-format
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+"�ĩa này có cả DOS và BSD magic.\n"
+"Nhập lệnh 'b' để vào chế độ BSD.\n"
+
+#: fdisk/fdisk.c:964
+#, c-format
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
+msgstr "Thiết bị chứa một bảng phân vùng DOS, hay Sun, SGI hay OSF bị lỗi\n"
+
+#: fdisk/fdisk.c:981
+#, c-format
+msgid "Internal error\n"
+msgstr "Lá»—i ná»™i bá»™\n"
+
+#: fdisk/fdisk.c:994
+#, c-format
+msgid "Ignoring extra extended partition %d\n"
+msgstr "B� qua các phân vùng mở rộng dự phòng %d\n"
+
+#: fdisk/fdisk.c:1006
+#, c-format
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
+"(rite)\n"
+msgstr ""
+"Cảnh báo: c� 0x%04x của bảng phân vùng %d bị lỗi sẽ được sửa bởi w(rite) "
+"(ghi nhá»›)\n"
+
+#: fdisk/fdisk.c:1028
+#, c-format
+msgid ""
+"\n"
+"got EOF thrice - exiting..\n"
+msgstr ""
+"\n"
+"nhận được EOF ba lần - đang thoát..\n"
+
+#: fdisk/fdisk.c:1067
+msgid "Hex code (type L to list codes): "
+msgstr "Mã Hex (gõ L để liệt kê mã): "
+
+#: fdisk/fdisk.c:1107
+#, c-format
+msgid "%s (%u-%u, default %u): "
+msgstr "%s (%u-%u, mặc định %u): "
+
+#: fdisk/fdisk.c:1174
+#, c-format
+msgid "Using default value %u\n"
+msgstr "Sử dụng giá trị mặc định %u\n"
+
+#: fdisk/fdisk.c:1178
+#, c-format
+msgid "Value out of range.\n"
+msgstr "Giá trị vượt quá giới hạn.\n"
+
+#: fdisk/fdisk.c:1188
+msgid "Partition number"
+msgstr "Số thứ tự phân vùng"
+
+#: fdisk/fdisk.c:1199
+#, c-format
+msgid "Warning: partition %d has empty type\n"
+msgstr "Cảnh báo: phân vùng %d chưa phân loại\n"
+
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
+#, c-format
+msgid "Selected partition %d\n"
+msgstr "Phân vùng được ch�n %d\n"
+
+#: fdisk/fdisk.c:1224
+#, c-format
+msgid "No partition is defined yet!\n"
+msgstr "Không có phân vùng được xác định!\n"
+
+#: fdisk/fdisk.c:1250
+#, c-format
+msgid "All primary partitions have been defined already!\n"
+msgstr "Tất cả các phân vùng chính phải được xác định!\n"
+
+#: fdisk/fdisk.c:1260
+msgid "cylinder"
+msgstr "cylinder"
+
+#: fdisk/fdisk.c:1260
+msgid "sector"
+msgstr "sector"
+
+#: fdisk/fdisk.c:1269
+#, c-format
+msgid "Changing display/entry units to %s\n"
+msgstr "Thay đổi đơn vị hiển thị thành %s\n"
+
+#: fdisk/fdisk.c:1280
+#, c-format
+msgid "WARNING: Partition %d is an extended partition\n"
+msgstr "CẢNH B�O: Phân vùng %d là một phân vùng mở rộng\n"
+
+#: fdisk/fdisk.c:1291
+#, c-format
+msgid "DOS Compatibility flag is set\n"
+msgstr "C� tương thích với DOS được đặt\n"
+
+#: fdisk/fdisk.c:1295
+#, c-format
+msgid "DOS Compatibility flag is not set\n"
+msgstr "C� tương thích DOS không được đặt\n"
+
+#: fdisk/fdisk.c:1395
+#, c-format
+msgid "Partition %d does not exist yet!\n"
+msgstr "Phân vùng %d không tồn tại!\n"
+
+#: fdisk/fdisk.c:1400
+#, c-format
+msgid ""
+"Type 0 means free space to many systems\n"
+"(but not to Linux). Having partitions of\n"
+"type 0 is probably unwise. You can delete\n"
+"a partition using the `d' command.\n"
+msgstr ""
+"Gõ 0 có nghĩa là không gian trống đối với\n"
+"nhi�u hệ thống (nhưng với Linux thì không).\n"
+"Không nên có phân vùng với loại 0. Bạn có\n"
+"thể xóa một phân vùng sử dụng câu lệnh `d'.\n"
+
+#: fdisk/fdisk.c:1409
+#, c-format
+msgid ""
+"You cannot change a partition into an extended one or vice versa\n"
+"Delete it first.\n"
+msgstr ""
+"Bạn không thể thay đổi một phân vùng thành mở rộng hoặc thay thế cho versa\n"
+"Xóa nó trước.\n"
+
+#: fdisk/fdisk.c:1418
+#, c-format
+msgid ""
+"Consider leaving partition 3 as Whole disk (5),\n"
+"as SunOS/Solaris expects it and even Linux likes it.\n"
+"\n"
+msgstr ""
+"Nên để phân vùng 3 như Cả một đĩa (5),\n"
+"vì SunOS/Solaris đòi h�i đi�u này và thậm chí Linux thích.\n"
+"\n"
+
+#: fdisk/fdisk.c:1424
+#, c-format
+msgid ""
+"Consider leaving partition 9 as volume header (0),\n"
+"and partition 11 as entire volume (6)as IRIX expects it.\n"
+"\n"
+msgstr ""
+"Nên để phân vùng 9 như đầu một bộ (0), và phân\n"
+"vùng 11 như cả một bộ (6) vì IRIX đòi h�i đi�u này.\n"
+"\n"
+
+#: fdisk/fdisk.c:1437
+#, c-format
+msgid "Changed system type of partition %d to %x (%s)\n"
+msgstr "�ã thay đổi loại hệ thống của phân vùng %d thành %x (%s)\n"
+
+#: fdisk/fdisk.c:1492
+#, c-format
+msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
+msgstr ""
+"Phân vùng %d có điểm khởi đầu vật lý/lôgíc khác nhay (không phải Linux?):\n"
+
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
+#, c-format
+msgid "     phys=(%d, %d, %d) "
+msgstr "     vật lý=(%d, %d, %d) "
+
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
+#, c-format
+msgid "logical=(%d, %d, %d)\n"
+msgstr "lôgíc=(%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1500
+#, c-format
+msgid "Partition %d has different physical/logical endings:\n"
+msgstr "Phân vùng %d có điểm cuối vật lý/lôgíc khác nhau:\n"
+
+#: fdisk/fdisk.c:1509
+#, c-format
+msgid "Partition %i does not start on cylinder boundary:\n"
+msgstr "Phân vùng %i không bắt đầu trên ranh giới cylinder:\n"
+
+#: fdisk/fdisk.c:1512
+#, c-format
+msgid "should be (%d, %d, 1)\n"
+msgstr "phải là (%d, %d, 1)\n"
+
+#: fdisk/fdisk.c:1518
+#, c-format
+msgid "Partition %i does not end on cylinder boundary.\n"
+msgstr "Phân vùng %i không kết thúc trên ranh giới cylinder:\n"
+
+#: fdisk/fdisk.c:1522
+#, c-format
+msgid "should be (%d, %d, %d)\n"
+msgstr "phải là (%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1534
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %ld MB, %lld bytes\n"
+msgstr ""
+"\n"
+"�ĩa %s: %ld MB, %lld bytes\n"
+
+#: fdisk/fdisk.c:1537
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %ld.%ld GB, %lld bytes\n"
+msgstr ""
+"\n"
+"�ĩa %s: %ld.%ld GB, %lld bytes\n"
+
+#: fdisk/fdisk.c:1539
+#, c-format
+msgid "%d heads, %d sectors/track, %d cylinders"
+msgstr "%d đầu đ�c, %d sectors/track, %d cylinders"
+
+#: fdisk/fdisk.c:1542
+#, c-format
+msgid ", total %llu sectors"
+msgstr ", tổng số %llu sector"
+
+#: fdisk/fdisk.c:1545
+#, c-format
+msgid ""
+"Units = %s of %d * %d = %d bytes\n"
+"\n"
+msgstr ""
+"�ơn vị = %s của %d * %d = %d bytes\n"
+"\n"
+
+#: fdisk/fdisk.c:1653
+#, c-format
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+"Không cần làm gì. Thứ tự đã đúng sẵn.\n"
+"\n"
+
+#: fdisk/fdisk.c:1709
+#, c-format
+msgid ""
+"This doesn't look like a partition table\n"
+"Probably you selected the wrong device.\n"
+"\n"
+msgstr ""
+"Có vẻ như đây không phải là bảng phân vùng\n"
+"Có thể bạn đã ch�n nhầm thiết bị.\n"
+"\n"
+
+#: fdisk/fdisk.c:1723
+#, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s  Khởiđộng    �ầu       Cuối      Khối      Id  Hệ thống tập tin\n"
+
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
+msgid "Device"
+msgstr "Thiết bị"
+
+#: fdisk/fdisk.c:1761
+#, c-format
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr ""
+"\n"
+"Các mục trong bảng phân vùng không theo thứ tự như trên đĩa\n"
+
+#: fdisk/fdisk.c:1771
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %d heads, %d sectors, %d cylinders\n"
+"\n"
+msgstr ""
+"\n"
+"�ĩa %s: %d đầu đ�c, %d sectors, %d cylinders\n"
+"\n"
+
+#: fdisk/fdisk.c:1773
+#, c-format
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     �ầu      Kíchthước ID\n"
+
+#: fdisk/fdisk.c:1818
+#, c-format
+msgid "Warning: partition %d contains sector 0\n"
+msgstr "Cảnh báo: phân vùng %d chứa sector 0\n"
+
+#: fdisk/fdisk.c:1821
+#, c-format
+msgid "Partition %d: head %d greater than maximum %d\n"
+msgstr "Phân vùng %d: đầu %d lớn hơn max %d\n"
+
+#: fdisk/fdisk.c:1824
+#, c-format
+msgid "Partition %d: sector %d greater than maximum %d\n"
+msgstr "Phân vùng %d: sector %d lớn hơn max %d\n"
+
+#: fdisk/fdisk.c:1827
+#, c-format
+msgid "Partitions %d: cylinder %d greater than maximum %d\n"
+msgstr "Phân vùng %d: cylinder %d lớn hơn max %d\n"
+
+#: fdisk/fdisk.c:1831
+#, c-format
+msgid "Partition %d: previous sectors %d disagrees with total %d\n"
+msgstr "Phân vùng %d: các sector phía trước %d không hợp với tổng số %d\n"
+
+#: fdisk/fdisk.c:1863
+#, c-format
+msgid "Warning: bad start-of-data in partition %d\n"
+msgstr "Cảnh báo: khởi-đầu-dữ-liệu xấu trong phân vùng %d\n"
+
+#: fdisk/fdisk.c:1871
+#, c-format
+msgid "Warning: partition %d overlaps partition %d.\n"
+msgstr "Cảnh báo: phân vùng %d đè lên phân vùng %d.\n"
+
+#: fdisk/fdisk.c:1891
+#, c-format
+msgid "Warning: partition %d is empty\n"
+msgstr "Cảnh báo: phân vùng %d rỗng\n"
+
+#: fdisk/fdisk.c:1896
+#, c-format
+msgid "Logical partition %d not entirely in partition %d\n"
+msgstr "Phân vùng lôgíc %d không hoàn toàn trong phân vùng %d\n"
+
+#: fdisk/fdisk.c:1902
+#, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
+msgstr "Tổng số sector phân phối %d lớn hơn max %lld\n"
+
+#: fdisk/fdisk.c:1905
+#, c-format
+msgid "%lld unallocated sectors\n"
+msgstr "%lld sector không được phân phối\n"
+
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
+#, c-format
+msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
+msgstr ""
+"Phân vùng %d đã được xác định.  Hãy xóa nó trước khi thêm lại lần nữa\n"
+
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
+#, c-format
+msgid "Sector %d is already allocated\n"
+msgstr "Sector %d đã được phân phối\n"
+
+#: fdisk/fdisk.c:1998
+#, c-format
+msgid "No free sectors available\n"
+msgstr "Không còn sector nào trống\n"
+
+#: fdisk/fdisk.c:2072
+#, c-format
+msgid ""
+"\tSorry - this fdisk cannot handle AIX disk labels.\n"
+"\tIf you want to add DOS-type partitions, create\n"
+"\ta new empty DOS partition table first. (Use o.)\n"
+"\tWARNING: This will destroy the present disk contents.\n"
+msgstr ""
+"\tXin lỗi - fdisk này không thể quản lý nhãn đĩa AIX.\n"
+"\tNếu bạn muốn thêm các phân vùng dạng DOS, hãy tạo\n"
+"\tmột bảng phân vùng DOS rỗng trước. (Sử dụng o.)\n"
+"\tCẢNH B�O: Nội dung hiện th�i của đĩa sẽ bị hủy.\n"
+
+#: fdisk/fdisk.c:2092
+#, c-format
+msgid "You must delete some partition and add an extended partition first\n"
+msgstr "Bạn phải xóa vài phân vùng và thêm một phân vùng mở rộng trước\n"
+
+#: fdisk/fdisk.c:2095
+#, c-format
+msgid "All logical partitions are in use\n"
+msgstr "Tất cả các phân vùng lôgíc được sử dụng\n"
+
+#: fdisk/fdisk.c:2096
+#, c-format
+msgid "Adding a primary partition\n"
+msgstr "Thêm phân vùng chính\n"
+
+#: fdisk/fdisk.c:2101
+#, c-format
+msgid ""
+"Command action\n"
+"   %s\n"
+"   p   primary partition (1-4)\n"
+msgstr ""
+"Tác dụng của câu lệnh\n"
+"   %s\n"
+"   p   phân vùng chính (1-4)\n"
+
+#: fdisk/fdisk.c:2103
+msgid "l   logical (5 or over)"
+msgstr "l   lôgíc (5 hoặc hơn)"
+
+#: fdisk/fdisk.c:2103
+msgid "e   extended"
+msgstr "e   mở rộng"
+
+#: fdisk/fdisk.c:2122
+#, c-format
+msgid "Invalid partition number for type `%c'\n"
+msgstr "Sai số phân vùng cho loại `%c'\n"
+
+#: fdisk/fdisk.c:2158
+#, c-format
+msgid ""
+"The partition table has been altered!\n"
+"\n"
+msgstr ""
+"Bảng phân vùng đã được ghi!\n"
+"\n"
+
+#: fdisk/fdisk.c:2167
+#, c-format
+msgid "Calling ioctl() to re-read partition table.\n"
+msgstr "G�i ioctl() để đ�c lại bảng phân vùng.\n"
+
+#: fdisk/fdisk.c:2183
+#, c-format
+msgid ""
+"\n"
+"WARNING: Re-reading the partition table failed with error %d: %s.\n"
+"The kernel still uses the old table.\n"
+"The new table will be used at the next reboot.\n"
+msgstr ""
+"\n"
+"CẢNH B�O: Không thể đ�c lại bảng phân vùng với lỗi %d: %s.\n"
+"Nhân vẫn đang dùng bảng cũ.\n"
+"Bảng mới sẽ được sử dụng tại lần khởi động tiếp theo.\n"
+
+#: fdisk/fdisk.c:2193
+#, c-format
+msgid ""
+"\n"
+"WARNING: If you have created or modified any DOS 6.x\n"
+"partitions, please see the fdisk manual page for additional\n"
+"information.\n"
+msgstr ""
+"\n"
+"CẢNH B�O: Nếu bạn đã tạo hoặc sửa đổi bất kỳ phân vùng\n"
+"DOS 6.x nào, xin hãy xem trang hướng dẫn sử dụng man fdisk\n"
+"để biết thêm chi tiết.\n"
+
+#: fdisk/fdisk.c:2199
+#, c-format
+msgid ""
+"\n"
+"Error closing file\n"
+msgstr ""
+"\n"
+"Lỗi đóng tậ p tin\n"
+
+#: fdisk/fdisk.c:2203
+#, c-format
+msgid "Syncing disks.\n"
+msgstr "�ồng bộ đĩa.\n"
+
+#: fdisk/fdisk.c:2250
+#, c-format
+msgid "Partition %d has no data area\n"
+msgstr "Phân vùng %d không có vùng dữ liệu\n"
+
+#: fdisk/fdisk.c:2255
+msgid "New beginning of data"
+msgstr "�iểm bắt đầu dữ liệu mới"
+
+#: fdisk/fdisk.c:2271
+msgid "Expert command (m for help): "
+msgstr "Câu lệnh nâng cao (m để xem trợ giúp): "
+
+#: fdisk/fdisk.c:2284
+msgid "Number of cylinders"
+msgstr "Số cylinder"
+
+#: fdisk/fdisk.c:2311
+msgid "Number of heads"
+msgstr "Số đầu đ�c"
+
+#: fdisk/fdisk.c:2336
+msgid "Number of sectors"
+msgstr "Số sector"
+
+#: fdisk/fdisk.c:2339
+#, c-format
+msgid "Warning: setting sector offset for DOS compatiblity\n"
+msgstr "Cảnh báo: thiết lập sector offset cho tương thích DOS\n"
+
+#: fdisk/fdisk.c:2411
+#, c-format
+msgid "Disk %s doesn't contain a valid partition table\n"
+msgstr "�ĩa %s không chứa một bảng phân vùng hợp lệ\n"
+
+#: fdisk/fdisk.c:2422
+#, c-format
+msgid "Cannot open %s\n"
+msgstr "Không thể mở %s\n"
+
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
+#, c-format
+msgid "cannot open %s\n"
+msgstr "không thể mở %s\n"
+
+#: fdisk/fdisk.c:2460
+#, c-format
+msgid "%c: unknown command\n"
+msgstr "%c: câu lệnh không biết\n"
+
+#: fdisk/fdisk.c:2528
+#, c-format
+msgid "This kernel finds the sector size itself - -b option ignored\n"
+msgstr "Nhân này tự tìm kích thước sector - tùy ch�n -b bị b� qua\n"
+
+#: fdisk/fdisk.c:2532
+#, c-format
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"Cảnh báo: tùy ch�n -b (đặt kích thước sector) cần sử dụng với một thiết bị "
+"xác định\n"
+
+#: fdisk/fdisk.c:2591
+#, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+msgstr "Tìm thấy một nhãn đĩa OSF/1 trên %s, nhập chế độ nhãn đĩa.\n"
+
+#: fdisk/fdisk.c:2601
+msgid "Command (m for help): "
+msgstr "Câu lệnh (m để xem trợ giúp): "
+
+#: fdisk/fdisk.c:2617
+#, c-format
+msgid ""
+"\n"
+"The current boot file is: %s\n"
+msgstr ""
+"\n"
+"Tập tin khởi động hiện th�i là: %s\n"
+
+#: fdisk/fdisk.c:2619
+msgid "Please enter the name of the new boot file: "
+msgstr "Xin hãy nhập tên của tập tin khởi động mới: "
+
+#: fdisk/fdisk.c:2621
+#, c-format
+msgid "Boot file unchanged\n"
+msgstr "Tập tin khởi động không thay đổi\n"
+
+#: fdisk/fdisk.c:2694
+#, c-format
+msgid ""
+"\n"
+"\tSorry, no experts menu for SGI partition tables available.\n"
+"\n"
+msgstr ""
+"\n"
+"\tXin lỗi, không có menu nâng cao cho bảng phân vùng SGI.\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:80
+msgid "SGI volhdr"
+msgstr "SGI volhdr"
+
+#: fdisk/fdisksgilabel.c:81
+msgid "SGI trkrepl"
+msgstr "SGI trkrepl"
+
+#: fdisk/fdisksgilabel.c:82
+msgid "SGI secrepl"
+msgstr "SGI secrepl"
+
+#: fdisk/fdisksgilabel.c:83
+msgid "SGI raw"
+msgstr "SGI thô"
+
+#: fdisk/fdisksgilabel.c:84
+msgid "SGI bsd"
+msgstr "SGI bsd"
+
+#: fdisk/fdisksgilabel.c:85
+msgid "SGI sysv"
+msgstr "SGI sysv"
+
+#: fdisk/fdisksgilabel.c:86
+msgid "SGI volume"
+msgstr "SGI volume"
+
+#: fdisk/fdisksgilabel.c:87
+msgid "SGI efs"
+msgstr "SGI efs"
+
+#: fdisk/fdisksgilabel.c:88
+msgid "SGI lvol"
+msgstr "SGI lvol"
+
+#: fdisk/fdisksgilabel.c:89
+msgid "SGI rlvol"
+msgstr "SGI rlvol"
+
+#: fdisk/fdisksgilabel.c:90
+msgid "SGI xfs"
+msgstr "SGI xfs"
+
+#: fdisk/fdisksgilabel.c:91
+msgid "SGI xfslog"
+msgstr "SGI xfslog"
+
+#: fdisk/fdisksgilabel.c:92
+msgid "SGI xlv"
+msgstr "SGI xlv"
+
+#: fdisk/fdisksgilabel.c:93
+msgid "SGI xvm"
+msgstr "SGI xvm"
+
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
+msgid "Linux swap"
+msgstr "Linux swap"
+
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
+msgid "Linux native"
+msgstr "Linux native"
+
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
+msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:97
+msgid "Linux RAID"
+msgstr "Linux RAID"
+
+#: fdisk/fdisksgilabel.c:163
+#, c-format
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+"The MIPS Computer Systems, Inc thì Nhãn không được chứa nhi�u hơn 512 byte\n"
+
+#: fdisk/fdisksgilabel.c:182
+#, c-format
+msgid "Detected sgi disklabel with wrong checksum.\n"
+msgstr "Tìm thấy nhãn đĩa sgi với tổng kiểm tra (checksum) sai.\n"
+
+#: fdisk/fdisksgilabel.c:200
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors\n"
+"%d cylinders, %d physical cylinders\n"
+"%d extra sects/cyl, interleave %d:1\n"
+"%s\n"
+"Units = %s of %d * %d bytes\n"
+"\n"
+msgstr ""
+"\n"
+"�ĩa %s (nhãn đĩa SGI): %d đầu đ�c, %d sector\n"
+"%d cylinder, %d cylinder vật lý\n"
+"%d sects dự phòng/cyl, xen kẽ %d:1\n"
+"%s\n"
+"�ơn vị = %s của %d * %d byte\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:213
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * %d bytes\n"
+"\n"
+msgstr ""
+"\n"
+"�ĩa %s (nhãn đĩa SGI): %d đầu đ�c, %d sector, %d cylinder\n"
+"�ơn vị = %s của %d * %d byte\n"
+
+#: fdisk/fdisksgilabel.c:220
+#, c-format
+msgid ""
+"----- partitions -----\n"
+"Pt# %*s  Info     Start       End   Sectors  Id  System\n"
+msgstr ""
+"----- các phân vùng -----\n"
+"Pv# %*s  Thôngtin     �ầu       Cuối   Sectors  Id  Hệthống\n"
+
+#: fdisk/fdisksgilabel.c:242
+#, c-format
+msgid ""
+"----- Bootinfo -----\n"
+"Bootfile: %s\n"
+"----- Directory Entries -----\n"
+msgstr ""
+"----- Thông tin khởi động -----\n"
+"Tập tin khởi động: %s\n"
+"----- Thư mục -----\n"
+
+#: fdisk/fdisksgilabel.c:250
+#, c-format
+msgid "%2d: %-10s sector%5u size%8u\n"
+msgstr "%2d: %-10s sector%5u size%8u\n"
+
+#: fdisk/fdisksgilabel.c:304
+#, c-format
+msgid ""
+"\n"
+"Invalid Bootfile!\n"
+"\tThe bootfile must be an absolute non-zero pathname,\n"
+"\te.g. \"/unix\" or \"/unix.save\".\n"
+msgstr ""
+"\n"
+"Tập tin khởi động bị lỗi!\n"
+"\tTập tin khởi động phải là một tên đư�ng dẫn không rỗng,\n"
+"\tv.d. \"/unix\" hay \"/unix.save\".\n"
+
+#: fdisk/fdisksgilabel.c:310
+#, c-format
+msgid ""
+"\n"
+"\tName of Bootfile too long:  16 bytes maximum.\n"
+msgstr ""
+"\n"
+"\tTên của Tập tin khởi động quá dài:  max là 16 byte.\n"
+
+#: fdisk/fdisksgilabel.c:315
+#, c-format
+msgid ""
+"\n"
+"\tBootfile must have a fully qualified pathname.\n"
+msgstr ""
+"\n"
+"\tTập tin khởi động phải có đư�ng dẫn đầy đủ.\n"
+
+#: fdisk/fdisksgilabel.c:322
+#, c-format
+msgid ""
+"\n"
+"\tBe aware, that the bootfile is not checked for existence.\n"
+"\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n"
+msgstr ""
+"\n"
+"\tCần biết rằng tập tin khởi động không được kiểm tra tồn tại.\n"
+"\tMặc định SGI là \"/unix\" và sao lưu là \"/unix.save\".\n"
+
+#: fdisk/fdisksgilabel.c:348
+#, c-format
+msgid ""
+"\n"
+"\tBootfile is changed to \"%s\".\n"
+msgstr ""
+"\n"
+"\tTập tin khởi động được thay đổi thành \"%s\".\n"
+
+#: fdisk/fdisksgilabel.c:438
+#, c-format
+msgid "More than one entire disk entry present.\n"
+msgstr "Có nhi�u hơn một mục đĩa.\n"
+
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
+#, c-format
+msgid "No partitions defined\n"
+msgstr "Không có phân vùng nào được định nghĩa\n"
+
+#: fdisk/fdisksgilabel.c:451
+#, c-format
+msgid "IRIX likes when Partition 11 covers the entire disk.\n"
+msgstr "IRIX \"thích\" Phân vùng 11 bao b�c cả một đĩa.\n"
+
+#: fdisk/fdisksgilabel.c:453
+#, c-format
+msgid ""
+"The entire disk partition should start at block 0,\n"
+"not at diskblock %d.\n"
+msgstr ""
+"Phân vùng chứa cả một đĩa phải bắt đầu tại khối 0,\n"
+"chứ không phải tại khối %d.\n"
+
+#: fdisk/fdisksgilabel.c:459
+#, c-format
+msgid ""
+"The entire disk partition is only %d diskblock large,\n"
+"but the disk is %d diskblocks long.\n"
+msgstr ""
+"Phân vùng chứa cả một đĩa chỉ gồm %d khối,\n"
+"trong khi đĩa chứa %d khối.\n"
+
+#: fdisk/fdisksgilabel.c:465
+#, c-format
+msgid "One Partition (#11) should cover the entire disk.\n"
+msgstr "Một phân vùng (#11) cần chứa cả ổ đĩa.\n"
+
+#: fdisk/fdisksgilabel.c:475
+#, c-format
+msgid "Partition %d does not start on cylinder boundary.\n"
+msgstr "Phân vùng %d không bắt đầu trên ranh giới cylinder.\n"
+
+#: fdisk/fdisksgilabel.c:481
+#, c-format
+msgid "Partition %d does not end on cylinder boundary.\n"
+msgstr "Phân vùng %d không kết thúc trên rang giới cylinder.\n"
+
+#: fdisk/fdisksgilabel.c:488
+#, c-format
+msgid "The Partition %d and %d overlap by %d sectors.\n"
+msgstr "Phân vùng %d và %d chèn lên nhau %d sector.\n"
+
+#: fdisk/fdisksgilabel.c:496 fdisk/fdisksgilabel.c:514
+#, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
+msgstr "Khoảng trống không sử dụng %8u sector - sector %8u-%u\n"
+
+#: fdisk/fdisksgilabel.c:525
+#, c-format
+msgid ""
+"\n"
+"The boot partition does not exist.\n"
+msgstr ""
+"\n"
+"Phân vùng khởi động không tồn tại.\n"
+
+#: fdisk/fdisksgilabel.c:528
+#, c-format
+msgid ""
+"\n"
+"The swap partition does not exist.\n"
+msgstr ""
+"\n"
+"Phân vùng swap không tồn tại.\n"
+
+#: fdisk/fdisksgilabel.c:532
+#, c-format
+msgid ""
+"\n"
+"The swap partition has no swap type.\n"
+msgstr ""
+"\n"
+"Phân vùng swap có hệ thống tập tin không phải swap.\n"
+
+#: fdisk/fdisksgilabel.c:535
+#, c-format
+msgid "\tYou have chosen an unusual boot file name.\n"
+msgstr "\tBạn đã ch�n một tên tập tin khởi động lạ.\n"
+
+#: fdisk/fdisksgilabel.c:544
+#, c-format
+msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgstr "Xin lỗi có thể Bạn thay đổi Tag của phân vùng không rỗng.\n"
+
+#: fdisk/fdisksgilabel.c:550
+msgid ""
+"It is highly recommended that the partition at offset 0\n"
+"is of type \"SGI volhdr\", the IRIX system will rely on it to\n"
+"retrieve from its directory standalone tools like sash and fx.\n"
+"Only the \"SGI volume\" entire disk section may violate this.\n"
+"Type YES if you are sure about tagging this partition differently.\n"
+msgstr ""
+"Rất khuyên dùng là phân vùng tại offset 0 có loại là\n"
+"\"SGI volhdr\", hệ thống IRIX sẽ dựa trên đó để nhận từ đó thư\n"
+"mục các công cụ đơn lẻ như sash và fx. Chỉ có các \"bộ đĩa SGI\"\n"
+"chứa cả một đĩa mới nằm ngoại lệ. Gõ YES (đồng ý) nếu bạn chắc chắn muốn "
+"đặt\n"
+"tag cho phân vùng này khác đi.\n"
+
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
+msgid "YES\n"
+msgstr "YES\n"
+
+#: fdisk/fdisksgilabel.c:579
+#, c-format
+msgid "Do You know, You got a partition overlap on the disk?\n"
+msgstr "Bạn Có biết, rằng bạn có một phân vùng đè lên nhau trên đĩa?\n"
+
+#: fdisk/fdisksgilabel.c:637
+#, c-format
+msgid "Attempting to generate entire disk entry automatically.\n"
+msgstr "Thử tự động phân vùng cả đĩa.\n"
+
+#: fdisk/fdisksgilabel.c:642
+#, c-format
+msgid "The entire disk is already covered with partitions.\n"
+msgstr "Ổ đĩa đã chứa các phân vùng.\n"
+
+#: fdisk/fdisksgilabel.c:646
+#, c-format
+msgid "You got a partition overlap on the disk. Fix it first!\n"
+msgstr "Bạn có một phân vùng đè lên nhau trên ổ đĩa. Hãy sửa trước!\n"
+
+#: fdisk/fdisksgilabel.c:655 fdisk/fdisksgilabel.c:684
+#, c-format
+msgid ""
+"It is highly recommended that eleventh partition\n"
+"covers the entire disk and is of type `SGI volume'\n"
+msgstr ""
+"Rất khuyên dùng khi phân vùng số mư�i một chứa\n"
+"cả ổ đĩa và có loại `SGI volume'\n"
+
+#: fdisk/fdisksgilabel.c:671
+#, c-format
+msgid "You will get a partition overlap on the disk. Fix it first!\n"
+msgstr "Bạn sẽ có một phân vùng đè lên nhau trên ổ đĩa. Hãy sửa trước!\n"
+
+#: fdisk/fdisksgilabel.c:676
+#, c-format
+msgid " Last %s"
+msgstr " %s cuối"
+
+#: fdisk/fdisksgilabel.c:706
+#, c-format
+msgid ""
+"Building a new SGI disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content will be unrecoverably lost.\n"
+"\n"
+msgstr ""
+"Xây dựng một nhãn đĩa SGI mới. Thay đổi sẽ chỉ ghi trong bộ nhớ,\n"
+"cho đến khi bạn quyết định ghi chúng. Sau đó, tất nhiên, nội dung cũ\n"
+"sẽ mất và không thể phục hồi.\n"
+
+#: fdisk/fdisksgilabel.c:728
+#, c-format
+msgid ""
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
+"d.\n"
+"This value may be truncated for devices > 33.8 GB.\n"
+msgstr ""
+"Cảnh báo: BLKGETSIZE ioctl lỗi trên %s. Sử dụng giá trị cấu trúc cylinder của"
+"%d.\n"
+
+#: fdisk/fdisksgilabel.c:741
+#, c-format
+msgid "Trying to keep parameters of partition %d.\n"
+msgstr "�ang cố giữ lại các tham số của phân vùng %d.\n"
+
+#: fdisk/fdisksgilabel.c:743
+#, c-format
+msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
+msgstr "ID=%02x\t�ẦU=%d\t�Ộ DÀI=%d\n"
+
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
+msgid "Empty"
+msgstr "Rá»—ng"
+
+#: fdisk/fdisksunlabel.c:45
+msgid "SunOS root"
+msgstr "Gốc SunOS"
+
+#: fdisk/fdisksunlabel.c:46
+msgid "SunOS swap"
+msgstr "SunOS swap"
+
+#: fdisk/fdisksunlabel.c:47
+msgid "SunOS usr"
+msgstr "SunOS usr"
+
+#: fdisk/fdisksunlabel.c:48
+msgid "Whole disk"
+msgstr "Cả đĩa"
+
+#: fdisk/fdisksunlabel.c:49
+msgid "SunOS stand"
+msgstr "SunOS stand"
+
+#: fdisk/fdisksunlabel.c:50
+msgid "SunOS var"
+msgstr "SunOS var"
+
+#: fdisk/fdisksunlabel.c:51
+msgid "SunOS home"
+msgstr "SunOS home"
+
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
+msgid "Linux raid autodetect"
+msgstr "Tự động nhận ra Linux raid"
+
+#: fdisk/fdisksunlabel.c:132
+#, c-format
+msgid ""
+"Detected sun disklabel with wrong checksum.\n"
+"Probably you'll have to set all the values,\n"
+"e.g. heads, sectors, cylinders and partitions\n"
+"or force a fresh label (s command in main menu)\n"
+msgstr ""
+"�ã nhận ra nhãn đĩa sun với tổng kiểm tra checksum\n"
+"lỗi. Có thể bạn phải đặt lại tất cả các giá trị,\n"
+"v.d. đầu đ�c, sector, cylinder và phân vùng hoặc\n"
+"bắt buộc một nhãn mới (câu lệnh s trong trình đơn chính)\n"
+
+#: fdisk/fdisksunlabel.c:231
+#, c-format
+msgid "Autoconfigure found a %s%s%s\n"
+msgstr "Trình tự động cấu hình tìm thấy một %s%s%s\n"
+
+#: fdisk/fdisksunlabel.c:258
+#, c-format
+msgid ""
+"Building a new sun disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content won't be recoverable.\n"
+"\n"
+msgstr ""
+"Xây dựng một nhãn đĩa sun mới. Thay đổi sẽ chỉ ghi trong bộ nhớ,\n"
+"cho đến khi bạn quyết định ghi chúng. Sau đó, tất nhiên, nội dung cũ\n"
+"sẽ mất và không thể phục hồi.\n"
+
+#: fdisk/fdisksunlabel.c:269
+msgid ""
+"Drive type\n"
+"   ?   auto configure\n"
+"   0   custom (with hardware detected defaults)"
+msgstr ""
+"Loại ổ\n"
+"\t?\ttự động cấu hình\n"
+"\t0\tngư�i dùng ch�n (với các mặc định xác định phần cứng)"
+
+#: fdisk/fdisksunlabel.c:279
+msgid "Select type (? for auto, 0 for custom): "
+msgstr "Ch�n loại (? để tự động, 0 ngư�i dùng ch�n): "
+
+#: fdisk/fdisksunlabel.c:291
+#, c-format
+msgid "Autoconfigure failed.\n"
+msgstr "Tự động cấu hình không thành công.\n"
+
+#: fdisk/fdisksunlabel.c:315
+msgid "Sectors/track"
+msgstr "Sector/track"
+
+#: fdisk/fdisksunlabel.c:322
+msgid "Alternate cylinders"
+msgstr "Cylinder xen kẽ"
+
+#: fdisk/fdisksunlabel.c:325
+msgid "Physical cylinders"
+msgstr "Cylinder vật lý"
+
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
+msgid "Rotation speed (rpm)"
+msgstr "Tốc độ quay (rpm)"
+
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
+msgid "Interleave factor"
+msgstr "Hệ số xen kẽ"
+
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
+msgid "Extra sectors per cylinder"
+msgstr "Số sector dự phòng mỗi cylinder"
+
+#: fdisk/fdisksunlabel.c:347
+msgid "You may change all the disk params from the x menu"
+msgstr "Bạn có thể thay đổi tất cả các tham số đĩa từ trình đơn x"
+
+#: fdisk/fdisksunlabel.c:354
+msgid "3,5\" floppy"
+msgstr "�ĩa m�m 3,5"
+
+#: fdisk/fdisksunlabel.c:354
+msgid "Linux custom"
+msgstr "Linux tùy chỉnh"
+
+#: fdisk/fdisksunlabel.c:441
+#, c-format
+msgid "Partition %d doesn't end on cylinder boundary\n"
+msgstr "Phân vùng %d không kết thúc trên ranh giới cylinder\n"
+
+#: fdisk/fdisksunlabel.c:461
+#, c-format
+msgid "Partition %d overlaps with others in sectors %d-%d\n"
+msgstr "Phân vùng %d đè lên nhau với các phân vùng khác trên sector %d-%d\n"
+
+#: fdisk/fdisksunlabel.c:483
+#, c-format
+msgid "Unused gap - sectors 0-%d\n"
+msgstr "Khoảng trống không sử dụng - sector 0-%d\n"
+
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
+#, c-format
+msgid "Unused gap - sectors %d-%d\n"
+msgstr "Khoảng trống không sử dụng - sector %d-%d\n"
+
+#: fdisk/fdisksunlabel.c:512
+#, c-format
+msgid ""
+"Other partitions already cover the whole disk.\n"
+"Delete some/shrink them before retry.\n"
+msgstr ""
+"Các phân vùng khác đã chứa cả đĩa.\n"
+"Hãy xóa hay thu nh� chúng trước khi thử lại.\n"
+
+#: fdisk/fdisksunlabel.c:593
+#, c-format
+msgid ""
+"You haven't covered the whole disk with the 3rd partition, but your value\n"
+"%d %s covers some other partition. Your entry has been changed\n"
+"to %d %s\n"
+msgstr ""
+"Phân vùng thứ 3 không chứa cả ổ đĩa, nhưng các giá trị %d %s đè lên\n"
+"một số phân vùng khác. Các mục đã thay đổi thành %d %s\n"
+
+#: fdisk/fdisksunlabel.c:615
+#, c-format
+msgid ""
+"If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
+"partition as Whole disk (5), starting at 0, with %u sectors\n"
+msgstr ""
+"Nếu bạn muốn duy trì một đĩa tương thích với SunOS/Solaris, thì cần để phân\n"
+"vùng này là cả đĩa (5), bắt đầu từ 0, và với %u sectors\n"
+
+#: fdisk/fdisksunlabel.c:627
+msgid ""
+"It is highly recommended that the partition at offset 0\n"
+"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
+"there may destroy your partition table and bootblock.\n"
+"Type YES if you're very sure you would like that partition\n"
+"tagged with 82 (Linux swap): "
+msgstr ""
+"Rất khuyên dùng phân vùng tại offset 0 có hệ thống tập tin\n"
+"UFS, EXT2FS hay swap SunOS. Nếu đặt thành swap của Linux thì\n"
+"có thể hủy bảng phân vùng của bạn và khối khởi động.\n"
+"Gõ CO (CÓ) nếu bạn chắc chắn muốn phân vùng được đặt thành\n"
+"82 (swap của Linux): "
+
+#: fdisk/fdisksunlabel.c:658
+#, c-format
+msgid ""
+"\n"
+"Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n"
+"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"%d extra sects/cyl, interleave %d:1\n"
+"%s\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"�ĩa %s (nhãn đĩa Sun): %d đầu đ�c, %d sector, %d rpm\n"
+"%d cylinder, %d cylinder xen kẽ, %d cylinder vật lý\n"
+"%d sector dự phòng/cyl, độ xen kẽ %d:1\n"
+"%s\n"
+"�ơn vị = %s của %d * 512 byte\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:672
+#, c-format
+msgid ""
+"\n"
+"Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"�ĩa %s (nhãn đĩa Sun): %d đầu đ�c, %d sector, %d cylinder\n"
+"�ơn vị = %s của %d * 512 byte\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:677
+#, c-format
+msgid "%*s Flag    Start       End    Blocks   Id  System\n"
+msgstr "%*s C�    �ầu       Cuối    Khối   Id  Hệ thống\n"
+
+#: fdisk/fdisksunlabel.c:702
+msgid "Number of alternate cylinders"
+msgstr "Số cylinder xen kẽ"
+
+#: fdisk/fdisksunlabel.c:735
+msgid "Number of physical cylinders"
+msgstr "Số cylinder vật lý"
+
+#: fdisk/i386_sys_types.c:7
+msgid "FAT12"
+msgstr "FAT12"
+
+#: fdisk/i386_sys_types.c:8
+msgid "XENIX root"
+msgstr "XENIX root"
+
+#: fdisk/i386_sys_types.c:9
+msgid "XENIX usr"
+msgstr "XENIX usr"
+
+#: fdisk/i386_sys_types.c:10
+msgid "FAT16 <32M"
+msgstr "FAT16 <32M"
+
+#: fdisk/i386_sys_types.c:11
+msgid "Extended"
+msgstr "Mở rộng"
+
+#: fdisk/i386_sys_types.c:12
+msgid "FAT16"
+msgstr "FAT16"
+
+#: fdisk/i386_sys_types.c:13
+msgid "HPFS/NTFS"
+msgstr "HPFS/NTFS"
+
+#: fdisk/i386_sys_types.c:14
+msgid "AIX"
+msgstr "AIX"
+
+#: fdisk/i386_sys_types.c:15
+msgid "AIX bootable"
+msgstr "ATX có thể khởi động"
+
+#: fdisk/i386_sys_types.c:16
+msgid "OS/2 Boot Manager"
+msgstr "OS/2 Quản lý khởi động"
+
+#: fdisk/i386_sys_types.c:17
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
+
+#: fdisk/i386_sys_types.c:18
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
+
+#: fdisk/i386_sys_types.c:19
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:20
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Ext'd (LBA)"
+
+#: fdisk/i386_sys_types.c:21
+msgid "OPUS"
+msgstr "OPUS"
+
+#: fdisk/i386_sys_types.c:22
+msgid "Hidden FAT12"
+msgstr "FAT12 ẩn"
+
+#: fdisk/i386_sys_types.c:23
+msgid "Compaq diagnostics"
+msgstr "Chuẩn đoán Compaq"
+
+#: fdisk/i386_sys_types.c:24
+msgid "Hidden FAT16 <32M"
+msgstr "FAT16 ẩn <32M"
+
+#: fdisk/i386_sys_types.c:25
+msgid "Hidden FAT16"
+msgstr "FAT16 ẩn"
+
+#: fdisk/i386_sys_types.c:26
+msgid "Hidden HPFS/NTFS"
+msgstr "HPFS/NTFS ẩn"
+
+#: fdisk/i386_sys_types.c:27
+msgid "AST SmartSleep"
+msgstr "AST SmartSleep"
+
+#: fdisk/i386_sys_types.c:28
+msgid "Hidden W95 FAT32"
+msgstr "W95 FAT32 ẩn"
+
+#: fdisk/i386_sys_types.c:29
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "W95 FAT32 ẩn (LBA)"
+
+#: fdisk/i386_sys_types.c:30
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA) ẩn"
+
+#: fdisk/i386_sys_types.c:31
+msgid "NEC DOS"
+msgstr "NEC DOS"
+
+#: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr "Plan 9"
+
+#: fdisk/i386_sys_types.c:33
+msgid "PartitionMagic recovery"
+msgstr "Khôi phục PartitionMagic"
+
+#: fdisk/i386_sys_types.c:34
+msgid "Venix 80286"
+msgstr "Venix 80286"
+
+#: fdisk/i386_sys_types.c:35
+msgid "PPC PReP Boot"
+msgstr "Khởi động PPC PReP"
+
+#: fdisk/i386_sys_types.c:36
+msgid "SFS"
+msgstr "SFS"
+
+#: fdisk/i386_sys_types.c:37
+msgid "QNX4.x"
+msgstr "QNX4.x"
+
+#: fdisk/i386_sys_types.c:38
+msgid "QNX4.x 2nd part"
+msgstr "QNX4.x phần 2"
+
+#: fdisk/i386_sys_types.c:39
+msgid "QNX4.x 3rd part"
+msgstr "QNX4.x phần 3"
+
+#: fdisk/i386_sys_types.c:40
+msgid "OnTrack DM"
+msgstr "OnTrack DM"
+
+#: fdisk/i386_sys_types.c:41
+msgid "OnTrack DM6 Aux1"
+msgstr "OnTrack DM6 Aux1"
+
+#: fdisk/i386_sys_types.c:42
+msgid "CP/M"
+msgstr "CP/M"
+
+#: fdisk/i386_sys_types.c:43
+msgid "OnTrack DM6 Aux3"
+msgstr "OnTrack DM6 Aux3"
+
+#: fdisk/i386_sys_types.c:44
+msgid "OnTrackDM6"
+msgstr "OnTrackDM6"
+
+#: fdisk/i386_sys_types.c:45
+msgid "EZ-Drive"
+msgstr "EZ-Drive"
+
+#: fdisk/i386_sys_types.c:46
+msgid "Golden Bow"
+msgstr "Golden Bow"
+
+#: fdisk/i386_sys_types.c:47
+msgid "Priam Edisk"
+msgstr "Priam Edisk"
+
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
+#: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
+msgid "SpeedStor"
+msgstr "SpeedStor"
+
+#: fdisk/i386_sys_types.c:49
+msgid "GNU HURD or SysV"
+msgstr "GNU HURD hay SysV"
+
+#: fdisk/i386_sys_types.c:50
+msgid "Novell Netware 286"
+msgstr "Novell Netware 286"
+
+#: fdisk/i386_sys_types.c:51
+msgid "Novell Netware 386"
+msgstr "Novell Netware 386"
+
+#: fdisk/i386_sys_types.c:52
+msgid "DiskSecure Multi-Boot"
+msgstr "Bảomậtđĩa �a-khởi-động"
+
+#: fdisk/i386_sys_types.c:53
+msgid "PC/IX"
+msgstr "PC/IX"
+
+#: fdisk/i386_sys_types.c:54
+msgid "Old Minix"
+msgstr "Minix cũ"
+
+#: fdisk/i386_sys_types.c:55
+msgid "Minix / old Linux"
+msgstr "Minux / Linux cũ"
+
+#: fdisk/i386_sys_types.c:56
+msgid "Linux swap / Solaris"
+msgstr "Linux swap / Solaris"
+
+#: fdisk/i386_sys_types.c:58
+msgid "OS/2 hidden C: drive"
+msgstr "OS/2 ổ đĩa C: ẩn"
+
+#: fdisk/i386_sys_types.c:59
+msgid "Linux extended"
+msgstr "Mở rộng Linux"
+
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
+msgid "NTFS volume set"
+msgstr "Bộ khối (volume) NTFS"
+
+#: fdisk/i386_sys_types.c:62
+msgid "Linux plaintext"
+msgstr "Văn bản đơn giản Linux"
+
+#: fdisk/i386_sys_types.c:64
+msgid "Amoeba"
+msgstr "Amoeba"
+
+#: fdisk/i386_sys_types.c:65
+msgid "Amoeba BBT"
+msgstr "Amoeba BBT"
+
+#: fdisk/i386_sys_types.c:66
+msgid "BSD/OS"
+msgstr "BSD/OS"
+
+#: fdisk/i386_sys_types.c:67
+msgid "IBM Thinkpad hibernation"
+msgstr "Hibernation của IBM Thinkpad"
+
+#: fdisk/i386_sys_types.c:68
+msgid "FreeBSD"
+msgstr "FreeBSD"
+
+#: fdisk/i386_sys_types.c:69
+msgid "OpenBSD"
+msgstr "OpenBSD"
+
+#: fdisk/i386_sys_types.c:70
+msgid "NeXTSTEP"
+msgstr "NeXTSTEP"
+
+#: fdisk/i386_sys_types.c:71
+msgid "Darwin UFS"
+msgstr "Darwin UFS"
+
+#: fdisk/i386_sys_types.c:72
+msgid "NetBSD"
+msgstr "NetBSD"
+
+#: fdisk/i386_sys_types.c:73
+msgid "Darwin boot"
+msgstr "Khởi động Darwin"
+
+#: fdisk/i386_sys_types.c:74
+msgid "BSDI fs"
+msgstr "BSDI fs"
+
+#: fdisk/i386_sys_types.c:75
+msgid "BSDI swap"
+msgstr "BSDI swap"
+
+#: fdisk/i386_sys_types.c:76
+msgid "Boot Wizard hidden"
+msgstr "Thuật sĩ khởi động ẩn"
+
+#: fdisk/i386_sys_types.c:77
+msgid "Solaris boot"
+msgstr "Khởi động Solaris"
+
+#: fdisk/i386_sys_types.c:78
+msgid "Solaris"
+msgstr "Solaris"
+
+#: fdisk/i386_sys_types.c:79
+msgid "DRDOS/sec (FAT-12)"
+msgstr "DRDOS/sec (FAT-12)"
+
+#: fdisk/i386_sys_types.c:80
+msgid "DRDOS/sec (FAT-16 < 32M)"
+msgstr "DRDOS/sec (FAT-16 < 32M)"
+
+#: fdisk/i386_sys_types.c:81
+msgid "DRDOS/sec (FAT-16)"
+msgstr "DRDOS/sec (FAT-16)"
+
+#: fdisk/i386_sys_types.c:82
+msgid "Syrinx"
+msgstr "Syrinx"
+
+#: fdisk/i386_sys_types.c:83
+msgid "Non-FS data"
+msgstr "Dữ liệu không phải FS"
+
+#: fdisk/i386_sys_types.c:84
+msgid "CP/M / CTOS / ..."
+msgstr "CP/M / CTOS / ..."
+
+#: fdisk/i386_sys_types.c:86
+msgid "Dell Utility"
+msgstr "Công cụ Dell"
+
+#: fdisk/i386_sys_types.c:87
+msgid "BootIt"
+msgstr "BootIt (khởi động nó)"
+
+#: fdisk/i386_sys_types.c:88
+msgid "DOS access"
+msgstr "Truy cập DOS"
+
+#: fdisk/i386_sys_types.c:90
+msgid "DOS R/O"
+msgstr "DOS R/O (chỉ đ�c)"
+
+#: fdisk/i386_sys_types.c:93
+msgid "BeOS fs"
+msgstr "Hệ thống tập tin BeOS"
+
+#: fdisk/i386_sys_types.c:94
+msgid "EFI GPT"
+msgstr "EFI GPT"
+
+#: fdisk/i386_sys_types.c:95
+msgid "EFI (FAT-12/16/32)"
+msgstr "EFI (FAT-12/16/32)"
+
+#: fdisk/i386_sys_types.c:96
+msgid "Linux/PA-RISC boot"
+msgstr "Khởi động Linux/PA-RISC"
+
+#: fdisk/i386_sys_types.c:99
+msgid "DOS secondary"
+msgstr "DOS phụ"
+
+#: fdisk/i386_sys_types.c:103
+msgid "LANstep"
+msgstr "LANstep (bÆ°á»›c LAN)"
+
+#: fdisk/i386_sys_types.c:104
+msgid "BBT"
+msgstr "BBT"
+
+#: fdisk/sfdisk.c:195
+#, c-format
+msgid "seek error on %s - cannot seek to %lu\n"
+msgstr "lỗi tìm kiếm trên %s - không thể tìm tới %lu\n"
+
+#: fdisk/sfdisk.c:200
+#, c-format
+msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
+msgstr "lỗi tìm kiếm: cần 0x%08x%08x, nhận được 0x%08x%08x\n"
+
+#: fdisk/sfdisk.c:246
+msgid "out of memory - giving up\n"
+msgstr "tràn bộ nhớ - không thể tiếp tục\n"
+
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
+#, c-format
+msgid "read error on %s - cannot read sector %lu\n"
+msgstr "lỗi đ�c trên %s - không thể đ�c sector %lu\n"
+
+#: fdisk/sfdisk.c:269
+#, c-format
+msgid "ERROR: sector %lu does not have an msdos signature\n"
+msgstr "LỖI: sector %lu không có dấu hiệu của msdos\n"
+
+#: fdisk/sfdisk.c:284
+#, c-format
+msgid "write error on %s - cannot write sector %lu\n"
+msgstr "lỗi ghi trên %s - không thể ghi sector %lu\n"
+
+#: fdisk/sfdisk.c:322
+#, c-format
+msgid "cannot open partition sector save file (%s)\n"
+msgstr "không thể mở phân vùng sector ghi tập tin (%s)\n"
+
+#: fdisk/sfdisk.c:340
+#, c-format
+msgid "write error on %s\n"
+msgstr "lỗi ghi trên %s\n"
+
+#: fdisk/sfdisk.c:358
+#, c-format
+msgid "cannot stat partition restore file (%s)\n"
+msgstr "không thể xác định tập tin phục hồi phân vùng (%s)\n"
+
+#: fdisk/sfdisk.c:363
+msgid "partition restore file has wrong size - not restoring\n"
+msgstr "tập tin phục hồi phân vùng có kích thước sai - không phục hồi\n"
+
+#: fdisk/sfdisk.c:367
+msgid "out of memory?\n"
+msgstr "tràn bộ nhớ?\n"
+
+#: fdisk/sfdisk.c:373
+#, c-format
+msgid "cannot open partition restore file (%s)\n"
+msgstr "không thể mở tập tin phục hồi phân vùng (%s)\n"
+
+#: fdisk/sfdisk.c:379
+#, c-format
+msgid "error reading %s\n"
+msgstr "lỗi đ�c %s\n"
+
+#: fdisk/sfdisk.c:386
+#, c-format
+msgid "cannot open device %s for writing\n"
+msgstr "không thể mở thiết bị %s để ghi\n"
+
+#: fdisk/sfdisk.c:398
+#, c-format
+msgid "error writing sector %lu on %s\n"
+msgstr "lỗi ghi sector %lu trên %s\n"
+
+#: fdisk/sfdisk.c:451
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "�ĩa %s: không thể lấy cấu trúc\n"
+
+#: fdisk/sfdisk.c:468
+#, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "�ĩa %s: không thể lấy kích thước\n"
+
+#: fdisk/sfdisk.c:501
+#, c-format
+msgid ""
+"Warning: start=%lu - this looks like a partition rather than\n"
+"the entire disk. Using fdisk on it is probably meaningless.\n"
+"[Use the --force option if you really want this]\n"
+msgstr ""
+"Cảnh báo: đầu=%lu - giống một phân vùng hơn là cả một đĩa.\n"
+"Sử dụng fdisk có thể không có ý nghĩa gì.\n"
+"[Sử dụng tùy ch�n --force nếu bạn thực sự muốn]\n"
+
+#: fdisk/sfdisk.c:508
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
+msgstr "Cảnh báo: HDIO_GETGEO nói có %lu đầu đ�c\n"
+
+#: fdisk/sfdisk.c:511
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
+msgstr "Cảnh báo: HDIO_GETGEO nói có %lu sector\n"
+
+#: fdisk/sfdisk.c:515
+#, c-format
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
+msgstr "Cảnh báo: BLKGETSIZE/HDIO_GETGEO nói có %lu cylinder\n"
+
+#: fdisk/sfdisk.c:520
+#, c-format
+msgid ""
+"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
+"This will give problems with all software that uses C/H/S addressing.\n"
+msgstr ""
+"Cảnh báo: không giống số sector (%lu) - thư�ng là 63\n"
+"Sẽ nảy sinh vấn đ� với tất cả phần m�m sử dụng việc đánh địa chỉ C/H/S.\n"
+
+#: fdisk/sfdisk.c:524
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
+msgstr ""
+"\n"
+"�ĩa %s: %lu cylinder, %lu đầu đ�c, %lu sector/track\n"
+
+#: fdisk/sfdisk.c:606
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr ""
+"%s của phân vùng %s có số đầu đ�c không thể có: %lu (phải trong khoảng 0-%"
+"lu)\n"
+
+#: fdisk/sfdisk.c:611
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
+"lu)\n"
+msgstr ""
+"%s của phân vùng %s có số sector không thể có: %lu (phải trong khoảng 1-%"
+"lu)\n"
+
+#: fdisk/sfdisk.c:616
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
+"lu)\n"
+msgstr ""
+"%s của phân vùng %s có số cylinder không thể có: %lu (phải trong khoảng 1-%"
+"lu)\n"
+
+#: fdisk/sfdisk.c:656
+#, c-format
+msgid ""
+"Id  Name\n"
+"\n"
+msgstr ""
+"Tên Id\n"
+"\n"
+
+#: fdisk/sfdisk.c:812
+#, c-format
+msgid "Re-reading the partition table ...\n"
+msgstr "�ang đ�c lại bảng phân vùng ...\n"
+
+#: fdisk/sfdisk.c:818
+msgid ""
+"The command to re-read the partition table failed\n"
+"Reboot your system now, before using mkfs\n"
+msgstr ""
+"Lỗi chạy lệnh đ�c lại bảng phân vùng\n"
+"Khởi động lại hệ thống ngay bây gi� trước khi sử dụng mkfs\n"
+
+#: fdisk/sfdisk.c:823
+#, c-format
+msgid "Error closing %s\n"
+msgstr "Lỗi đóng %s\n"
+
+#: fdisk/sfdisk.c:861
+#, c-format
+msgid "%s: no such partition\n"
+msgstr "%s: không có phân vùng như vậy\n"
+
+#: fdisk/sfdisk.c:884
+msgid "unrecognized format - using sectors\n"
+msgstr "định dạng không nhận ra - sử dụng sector\n"
+
+#: fdisk/sfdisk.c:923
+#, c-format
+msgid "# partition table of %s\n"
+msgstr "# bảng phân vùng của %s\n"
+
+#: fdisk/sfdisk.c:934
+#, c-format
+msgid "unimplemented format - using %s\n"
+msgstr "định dạng chưa hỗ trợ - sử dụng %s\n"
+
+#: fdisk/sfdisk.c:938
+#, c-format
+msgid ""
+"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"�ơn vị = cylinder %lu byte, khối 1024 byte, đếm từ %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:941
+#, c-format
+msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
+msgstr "   Thiết bị Khởi động �ầu     Cuối   #cyl    #Khối   Id  Hệ thống\n"
+
+#: fdisk/sfdisk.c:946
+#, c-format
+msgid ""
+"Units = sectors of 512 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"�ơn vị = sector 512 byte, đếm từ %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:948
+#, c-format
+msgid "   Device Boot    Start       End   #sectors  Id  System\n"
+msgstr "   Thiết bị Khởi động �ầu     Cuối   #sector  Id  Hệ thống\n"
+
+#: fdisk/sfdisk.c:951
+#, c-format
+msgid ""
+"Units = blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"�ơn vị = khối 1024 byte, đếm từ %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:953
+#, c-format
+msgid "   Device Boot   Start       End    #blocks   Id  System\n"
+msgstr "   Thiết bị Khởi động �ầu     Cuối    #Khối   Id  Hệ thống\n"
+
+#: fdisk/sfdisk.c:956
+#, c-format
+msgid ""
+"Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"�ơn vị = mebibyte 1048576 byte, khối 1024 byte, đếm từ %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:958
+#, c-format
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
+msgstr "   Thiết bị Khởi động �ầu     MiB    #Khối   Id  Hệ thống\n"
+
+#: fdisk/sfdisk.c:1118
+#, c-format
+msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "\t\tđầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1125
+#, c-format
+msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "\t\tcuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1128
+#, c-format
+msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
+msgstr "phân vùng kết thúc trên cylinder %ld, vượt quá điểm cuối của đĩa\n"
+
+#: fdisk/sfdisk.c:1138
+msgid "No partitions found\n"
+msgstr "Không tìm thấy phân vùng nào\n"
+
+#: fdisk/sfdisk.c:1142
+#, c-format
+msgid ""
+"Warning: The partition table looks like it was made\n"
+"  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
+"For this listing I'll assume that geometry.\n"
+msgstr ""
+"Cảnh báo: Bảng phân vùng có vẻ như được tạo ra\n"
+"với C/H/S=*/%ld/%ld (thay vì %ld/%ld/%ld).\n"
+"Tôi sẽ thừa nhận cấu trúc đó cho danh sách này.\n"
+
+#: fdisk/sfdisk.c:1191
+msgid "no partition table present.\n"
+msgstr "không có bảng phân vùng nào.\n"
+
+#: fdisk/sfdisk.c:1193
+#, c-format
+msgid "strange, only %d partitions defined.\n"
+msgstr "kỳ lạ, chỉ có %d phân vùng xác định.\n"
+
+#: fdisk/sfdisk.c:1202
+#, c-format
+msgid "Warning: partition %s has size 0 but is not marked Empty\n"
+msgstr ""
+"Cảnh báo: phân vùng %s có kích thước 0 nhưng không được đánh dấu rỗng\n"
+
+#: fdisk/sfdisk.c:1205
+#, c-format
+msgid "Warning: partition %s has size 0 and is bootable\n"
+msgstr "Cảnh báo: phân vùng %s có kích thước 0 và có thể khởi động\n"
+
+#: fdisk/sfdisk.c:1208
+#, c-format
+msgid "Warning: partition %s has size 0 and nonzero start\n"
+msgstr "Cảnh báo: phân vùng %s có kích thước 0 và điểm đầu khác 0\n"
+
+#: fdisk/sfdisk.c:1219
+#, c-format
+msgid "Warning: partition %s "
+msgstr "Cảnh báo: phân vùng %s "
+
+#: fdisk/sfdisk.c:1220
+#, c-format
+msgid "is not contained in partition %s\n"
+msgstr "không chứa trong phân vùng %s\n"
+
+#: fdisk/sfdisk.c:1231
+#, c-format
+msgid "Warning: partitions %s "
+msgstr "Cảnh báo: các phân vùng %s "
+
+#: fdisk/sfdisk.c:1232
+#, c-format
+msgid "and %s overlap\n"
+msgstr "và %s đè lên nhau\n"
+
+#: fdisk/sfdisk.c:1243
+#, c-format
+msgid ""
+"Warning: partition %s contains part of the partition table (sector %lu),\n"
+"and will destroy it when filled\n"
+msgstr ""
+"Cảnh báo: phân vùng %s chứa một phần của bảng phân vùng (sector %lu),\n"
+"và sẽ hủy nó khi đầy\n"
+
+#: fdisk/sfdisk.c:1255
+#, c-format
+msgid "Warning: partition %s starts at sector 0\n"
+msgstr "Cảnh báo: phân vùng %s bắt đầu tại sector 0\n"
+
+#: fdisk/sfdisk.c:1259
+#, c-format
+msgid "Warning: partition %s extends past end of disk\n"
+msgstr "Cảnh báo: phân vùng %s kéo dài quá điểm cuối đĩa\n"
+
+#: fdisk/sfdisk.c:1274
+msgid ""
+"Among the primary partitions, at most one can be extended\n"
+" (although this is not a problem under Linux)\n"
+msgstr ""
+"Trong số các phân vùng chính, nhi�u nhất chỉ có một là mở rộng\n"
+" (mặc dù đây không phải là vấn đ� dưới Linux)\n"
+
+#: fdisk/sfdisk.c:1292
+#, c-format
+msgid "Warning: partition %s does not start at a cylinder boundary\n"
+msgstr "Cảnh báo: phân vùng %s không bắt đầu trên ranh giới cylinder\n"
+
+#: fdisk/sfdisk.c:1298
+#, c-format
+msgid "Warning: partition %s does not end at a cylinder boundary\n"
+msgstr "Cảnh báo: phân vùng %s không kết thúc trên ranh giới cylinder\n"
+
+#: fdisk/sfdisk.c:1316
+msgid ""
+"Warning: more than one primary partition is marked bootable (active)\n"
+"This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
+msgstr ""
+"Cảnh báo: có nhi�u hơn một phân vùng chính được đánh dấu có thể khởi\n"
+"động. �ây không phải là vấn đ� đối với LILO, nhưng MBR của DOS sẽ không\n"
+"khởi động đĩa này.\n"
+
+#: fdisk/sfdisk.c:1323
+msgid ""
+"Warning: usually one can boot from primary partitions only\n"
+"LILO disregards the `bootable' flag.\n"
+msgstr ""
+"Cảnh báo: thông thư�ng ngư�i dùng chỉ có thể khởi động từ phân vùng\n"
+"chính. LILO không quan tâm đến c� `có thể khởi động'.\n"
+
+#: fdisk/sfdisk.c:1329
+msgid ""
+"Warning: no primary partition is marked bootable (active)\n"
+"This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
+msgstr ""
+"Cảnh báo: không có phân vùng chính nào được đánh dấu có thể khởi\n"
+"động. �ây không phải là vấn đ� đối với LILO, nhưng MBR của DOS sẽ không\n"
+"khởi động đĩa này.\n"
+
+#: fdisk/sfdisk.c:1343
+msgid "start"
+msgstr "đầu"
+
+#: fdisk/sfdisk.c:1346
+#, c-format
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"phân vùng %s: đầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1352
+msgid "end"
+msgstr "cuối"
+
+#: fdisk/sfdisk.c:1355
+#, c-format
+msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"phân vùng %s: cuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1358
+#, c-format
+msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
+msgstr "phân vùng %s kết thúc trên cylinder %ld, vượt quá điểm cuối của đĩa\n"
+
+#: fdisk/sfdisk.c:1383
+#, c-format
+msgid ""
+"Warning: shifted start of the extd partition from %ld to %ld\n"
+"(For listing purposes only. Do not change its contents.)\n"
+msgstr ""
+"Cảnh báo: dịch chuyển đầu của phân vùng mởi rộng từ %ld tới %ld\n"
+" (Chỉ với mục đích liệt kê. Không thay đổi nội dung.)\n"
+
+#: fdisk/sfdisk.c:1389
+msgid ""
+"Warning: extended partition does not start at a cylinder boundary.\n"
+"DOS and Linux will interpret the contents differently.\n"
+msgstr ""
+"Cảnh báo: phân vùng mở rộng không bắt đầu trên ranh giới cylinder.\n"
+"DOS và Linux sẽ biên dịch nội dung khác nhau.\n"
+
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
+#, c-format
+msgid "too many partitions - ignoring those past nr (%d)\n"
+msgstr "quá nhi�u phân vùng - b� qua những phân vùng sau nr (%d)\n"
+
+#: fdisk/sfdisk.c:1422
+msgid "tree of partitions?\n"
+msgstr "cây phân vùng?\n"
+
+#: fdisk/sfdisk.c:1543
+msgid "detected Disk Manager - unable to handle that\n"
+msgstr "tìm thấy Trình Quản Lý �ĩa - không thể đi�u khiển nó\n"
+
+#: fdisk/sfdisk.c:1550
+msgid "DM6 signature found - giving up\n"
+msgstr "Không tìm thấy dấu hiệu DM6 - dừng lại\n"
+
+#: fdisk/sfdisk.c:1570
+msgid "strange..., an extended partition of size 0?\n"
+msgstr "kỳ lạ..., một phân vùng mở rộng với kích thước 0?\n"
+
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
+msgid "strange..., a BSD partition of size 0?\n"
+msgstr "kỳ lại..., một phân vùng BSD với kích thước 0?\n"
+
+#: fdisk/sfdisk.c:1622
+#, c-format
+msgid " %s: unrecognized partition table type\n"
+msgstr " %s: loại bảng phân vùng không nhận ra\n"
+
+#: fdisk/sfdisk.c:1634
+msgid "-n flag was given: Nothing changed\n"
+msgstr "đã đưa ra c� -n: Không có gì thay đổi\n"
+
+#: fdisk/sfdisk.c:1650
+msgid "Failed saving the old sectors - aborting\n"
+msgstr "Lỗi ghi sector cũ - đang dừng lại\n"
+
+#: fdisk/sfdisk.c:1655
+#, c-format
+msgid "Failed writing the partition on %s\n"
+msgstr "Lỗi ghi phân vùng trên %s\n"
+
+#: fdisk/sfdisk.c:1732
+msgid "long or incomplete input line - quitting\n"
+msgstr "dòng nhập vào dài hay không đầy đủ - đang thoát\n"
+
+#: fdisk/sfdisk.c:1768
+#, c-format
+msgid "input error: `=' expected after %s field\n"
+msgstr "lỗi nhập: mong đợi `=' sau vùng %s\n"
+
+#: fdisk/sfdisk.c:1775
+#, c-format
+msgid "input error: unexpected character %c after %s field\n"
+msgstr "lỗi nhập: mong đợi ký tự %c sau vùng %s\n"
+
+#: fdisk/sfdisk.c:1781
+#, c-format
+msgid "unrecognized input: %s\n"
+msgstr "dữ liệu vào không nhận ra: %s\n"
+
+#: fdisk/sfdisk.c:1823
+msgid "number too big\n"
+msgstr "số quá lớn\n"
+
+#: fdisk/sfdisk.c:1827
+msgid "trailing junk after number\n"
+msgstr "đuôi b� đi sau một số\n"
+
+#: fdisk/sfdisk.c:1950
+msgid "no room for partition descriptor\n"
+msgstr "không có chỗ cho mô tả phân vùng\n"
+
+#: fdisk/sfdisk.c:1983
+msgid "cannot build surrounding extended partition\n"
+msgstr "không thể tạo phân vùng mở rộng bao quanh\n"
+
+#: fdisk/sfdisk.c:2034
+msgid "too many input fields\n"
+msgstr "quá nhi�u vùng nhập vào\n"
+
+#: fdisk/sfdisk.c:2068
+msgid "No room for more\n"
+msgstr "Không còn chỗ trống\n"
+
+#: fdisk/sfdisk.c:2087
+msgid "Illegal type\n"
+msgstr "Loại không cho phép\n"
+
+#: fdisk/sfdisk.c:2119
+#, c-format
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
+msgstr ""
+"Cảnh báo: kích thước đưa ra (%lu) vượt quá kích thước max cho phép (%lu)\n"
+
+#: fdisk/sfdisk.c:2125
+msgid "Warning: empty partition\n"
+msgstr "Cảnh báo: phân vùng rỗng\n"
+
+#: fdisk/sfdisk.c:2139
+#, c-format
+msgid "Warning: bad partition start (earliest %lu)\n"
+msgstr "Cảnh báo: điểm đầu phân vùng xấu (trước %lu)\n"
+
+#: fdisk/sfdisk.c:2152
+msgid "unrecognized bootable flag - choose - or *\n"
+msgstr "c� có thể khởi động không nhận ra - ch�n - hay *\n"
+
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
+msgid "partial c,h,s specification?\n"
+msgstr "�ặc điểm phân vùng c,h,s?\n"
+
+#: fdisk/sfdisk.c:2193
+msgid "Extended partition not where expected\n"
+msgstr "Phân vùng mở rộng không ở chỗ mong đợi\n"
+
+#: fdisk/sfdisk.c:2225
+msgid "bad input\n"
+msgstr "dữ liệu vào xấu\n"
+
+#: fdisk/sfdisk.c:2247
+msgid "too many partitions\n"
+msgstr "quá nhi�u phân vùng\n"
+
+#: fdisk/sfdisk.c:2280
+msgid ""
+"Input in the following format; absent fields get a default value.\n"
+"<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
+"Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
+msgstr ""
+"Dữ liệu vào trong định dạng sau; dùng giá trị mặc định cho chỗ thiếu\n"
+"<đầu> <kíchthước> <loại [E,S,L,X,hex]> <khởiđộng [-,*]> <c,h,s> <c,h,s>\n"
+"Thông thư�ng bạn chỉ cần chỉ rõ <đầu> và <kíchthước> (và có thể <loại>).\n"
+
+#: fdisk/sfdisk.c:2306
+#, c-format
+msgid "Usage: %s [options] device ...\n"
+msgstr "Sử dụng: %s [tùy ch�n] thiết bị...\n"
+
+#: fdisk/sfdisk.c:2307
+msgid "device: something like /dev/hda or /dev/sda"
+msgstr "thiết bị: có dạng /dev/hda hay /dev/sda"
+
+#: fdisk/sfdisk.c:2308
+msgid "useful options:"
+msgstr "tùy ch�n có ích:"
+
+#: fdisk/sfdisk.c:2309
+msgid "    -s [or --show-size]: list size of a partition"
+msgstr "    -s [hay --show-size]: liệt kê kích thước phân vùng"
+
+#: fdisk/sfdisk.c:2310
+msgid "    -c [or --id]:        print or change partition Id"
+msgstr "    -c [hay --id]:        in ra hay thay đổi Id phân vùng"
+
+#: fdisk/sfdisk.c:2311
+msgid "    -l [or --list]:      list partitions of each device"
+msgstr "    -l [hay --list]:      liệt kê phân vùng của mỗi thiết bị"
+
+#: fdisk/sfdisk.c:2312
+msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
+msgstr ""
+"    -d [hay --dump]:      cũng như trên nhưng ở dạng có thể dùng cho nhập vào"
+
+#: fdisk/sfdisk.c:2313
+msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
+msgstr "    -i [hay --increment]: số cylinders v.v... từ 1 thay vì từ 0"
+
+#: fdisk/sfdisk.c:2314
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
+"MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:  chấp nhận/báo cáo với đơn vị sector/khối/cylinder/MB"
+
+#: fdisk/sfdisk.c:2315
+msgid "    -T [or --list-types]:list the known partition types"
+msgstr "    -T [hay --list-types]:liệt kê các loại phân vùng đã biết"
+
+#: fdisk/sfdisk.c:2316
+msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
+msgstr ""
+"    -D [hay --DOS]:       để tương thích với DOS: lãng phí một chút khoảng "
+"trống"
+
+#: fdisk/sfdisk.c:2317
+msgid "    -R [or --re-read]:   make kernel reread partition table"
+msgstr "    -R [hay --re-read]:   khiến nhân đ�c lại bảng phân vùng"
+
+#: fdisk/sfdisk.c:2318
+msgid "    -N# :                change only the partition with number #"
+msgstr "    -N# :                chỉ thay đổi phân vùng với số #"
+
+#: fdisk/sfdisk.c:2319
+msgid "    -n :                 do not actually write to disk"
+msgstr "    -n :                 không thực sự viết lên đĩa"
+
+#: fdisk/sfdisk.c:2320
+msgid ""
+"    -O file :            save the sectors that will be overwritten to file"
+msgstr "    -O tập tin :            ghi các sector sẽ bị ghi chèn vào tập tin"
+
+#: fdisk/sfdisk.c:2321
+msgid "    -I file :            restore these sectors again"
+msgstr "    -I tập tin :            phục hồi lại những sector này"
+
+#: fdisk/sfdisk.c:2322
+msgid "    -v [or --version]:   print version"
+msgstr "    -v [hay --version]:   in ra số phiên bản"
+
+#: fdisk/sfdisk.c:2323
+msgid "    -? [or --help]:      print this message"
+msgstr "    -? [hay --help]:      in trợ giúp này"
+
+#: fdisk/sfdisk.c:2324
+msgid "dangerous options:"
+msgstr "tùy ch�n nguy hiểm:"
+
+#: fdisk/sfdisk.c:2325
+msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
+msgstr ""
+"    -g [hay --show-geometry]: in ra cấu trúc đĩa theo quan niệm của nhân"
+
+#: fdisk/sfdisk.c:2326
+msgid ""
+"    -G [or --show-pt-geometry]: print geometry guessed from the partition "
+"table"
+msgstr ""
+"    -G [hay --show-pt-geometry]: in ra cấu trúc dự đoán từ bảng phân vùng"
+
+#: fdisk/sfdisk.c:2327
+msgid ""
+"    -x [or --show-extended]: also list extended partitions on output\n"
+"                             or expect descriptors for them on input"
+msgstr ""
+"    -x [hay --show-extended]: đồng th�i liệt kê các phân vùng mở rộng\n"
+"                             trong đầu ra hay các mô tả mong đợi cho chúng\n"
+"                             trong đầu vào"
+
+#: fdisk/sfdisk.c:2329
+msgid ""
+"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgstr ""
+"    -L  [hay --Linux]:     không than phi�n v� những gì không thích hợp với "
+"Linux"
+
+#: fdisk/sfdisk.c:2330
+msgid "    -q  [or --quiet]:      suppress warning messages"
+msgstr "    -q  [hay --quiet]:      b� các cảnh báo"
+
+#: fdisk/sfdisk.c:2331
+msgid "    You can override the detected geometry using:"
+msgstr "    Bạn có thể viết đè lên cấu trúc nhận ra sử dụng:"
+
+#: fdisk/sfdisk.c:2332
+msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
+msgstr "    -C# [hay --cylinders #]:đặt số cylinder sử dụng"
+
+#: fdisk/sfdisk.c:2333
+msgid "    -H# [or --heads #]:    set the number of heads to use"
+msgstr "    -H# [or --heads #]:    đặt số đầu đ�c sử dụng"
+
+#: fdisk/sfdisk.c:2334
+msgid "    -S# [or --sectors #]:  set the number of sectors to use"
+msgstr "    -S# [or --sectors #]:  đặt số sector sử dụng"
+
+#: fdisk/sfdisk.c:2335
+msgid "You can disable all consistency checking with:"
+msgstr "Bạn có thể tắt tất cả các kiểm tra cố định với:"
+
+#: fdisk/sfdisk.c:2336
+msgid "    -f  [or --force]:      do what I say, even if it is stupid"
+msgstr "    -f  [hay --force]:      làm bất theo l�i bạn, thậm chí là ngu ngốc"
+
+#: fdisk/sfdisk.c:2342
+msgid "Usage:"
+msgstr "Sử dụng:"
+
+#: fdisk/sfdisk.c:2343
+#, c-format
+msgid "%s device\t\t list active partitions on device\n"
+msgstr "%s thiết bị\t\t liệt kê phân vùng kích hoạt trên thiết bị\n"
+
+#: fdisk/sfdisk.c:2344
+#, c-format
+msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
+msgstr ""
+"%s thiết bị n1 n2 ... kích hoạt phân vùng n1 ..., b� kích hoạt phần còn lại\n"
+
+#: fdisk/sfdisk.c:2345
+#, c-format
+msgid "%s -An device\t activate partition n, inactivate the other ones\n"
+msgstr "%s -An thiết bị\t kích hoạt phân vùng n, b� kích hoạt những cái khác\n"
+
+#: fdisk/sfdisk.c:2512
+msgid "no command?\n"
+msgstr "không lệnh?\n"
+
+#: fdisk/sfdisk.c:2635
+#, c-format
+msgid "total: %llu blocks\n"
+msgstr "tổng sô: %llu khối\n"
+
+#: fdisk/sfdisk.c:2674
+msgid "usage: sfdisk --print-id device partition-number\n"
+msgstr "sử dụng: sfdisk --print-id thiết-bị số-phân-vùng\n"
+
+#: fdisk/sfdisk.c:2676
+msgid "usage: sfdisk --change-id device partition-number Id\n"
+msgstr "sử dụng: sfdisk --change-id thiết-bị số-phân-vùng Id\n"
+
+#: fdisk/sfdisk.c:2678
+msgid "usage: sfdisk --id device partition-number [Id]\n"
+msgstr "sử dụng: sfdisk --id thiết-bị số-phân-vùng [Id]\n"
+
+#: fdisk/sfdisk.c:2685
+msgid "can specify only one device (except with -l or -s)\n"
+msgstr "chỉ có thể chỉ ra một thiết bị (ngoại trừ với -l hay -s)\n"
+
+#: fdisk/sfdisk.c:2711
+#, c-format
+msgid "cannot open %s read-write\n"
+msgstr "không thể mở %s đ�c-viết\n"
+
+#: fdisk/sfdisk.c:2713
+#, c-format
+msgid "cannot open %s for reading\n"
+msgstr "không mở được %s để đ�c\n"
+
+#: fdisk/sfdisk.c:2738
+#, c-format
+msgid "%s: OK\n"
+msgstr "%s: OK\n"
+
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
+#, c-format
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
+msgstr "%s: %ld cylinder, %ld đầu đ�c, %ld sector/trac\n"
+
+#: fdisk/sfdisk.c:2803
+#, c-format
+msgid "Cannot get size of %s\n"
+msgstr "Không thể lấy kích thước của %s\n"
+
+#: fdisk/sfdisk.c:2881
+#, c-format
+msgid "bad active byte: 0x%x instead of 0x80\n"
+msgstr "byte kích hoạt xấu: 0x%x thay vì 0x80\n"
+
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
+msgid ""
+"Done\n"
+"\n"
+msgstr ""
+"Hoàn thành\n"
+"\n"
+
+#: fdisk/sfdisk.c:2908
+#, c-format
+msgid ""
+"You have %d active primary partitions. This does not matter for LILO,\n"
+"but the DOS MBR will only boot a disk with 1 active partition.\n"
+msgstr ""
+"Bạn có %d phân vùng chính kích hoạt. �ây không phải là vấn đ� cho LILO,\n"
+"nhưng MBR của DOS sẽ chỉ khởi động một đĩa với 1 phân vùng kích hoạt.\n"
+
+#: fdisk/sfdisk.c:2922
+#, c-format
+msgid "partition %s has id %x and is not hidden\n"
+msgstr "phân vùng %s có id %x và không phải là ẩn\n"
+
+#: fdisk/sfdisk.c:2979
+#, c-format
+msgid "Bad Id %lx\n"
+msgstr "Id xấu %lx\n"
+
+#: fdisk/sfdisk.c:2994
+msgid "This disk is currently in use.\n"
+msgstr "�ĩa này hiện đang được sử dụng.\n"
+
+#: fdisk/sfdisk.c:3011
+#, c-format
+msgid "Fatal error: cannot find %s\n"
+msgstr "Lỗi nặng: không thể tìm %s\n"
+
+#: fdisk/sfdisk.c:3014
+#, c-format
+msgid "Warning: %s is not a block device\n"
+msgstr "Cảnh báo: %s không phải là thiết bị khối\n"
+
+#: fdisk/sfdisk.c:3020
+msgid "Checking that no-one is using this disk right now ...\n"
+msgstr "�ang kiểm tra xem có ai đó đang sử dụng đĩa này không...\n"
+
+#: fdisk/sfdisk.c:3022
+msgid ""
+"\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
+msgstr ""
+"\n"
+"�ĩa này hiện th�i đang được sử dụng - phân vùng lại không phải là ý muốn\n"
+"tốt. B� gắn tất cả các hệ thống tập tin, và tắt các phân vùng swap trên\n"
+"đĩa này. Sử dụng --no-reread để b� kiểm tra này.\n"
+
+#: fdisk/sfdisk.c:3026
+msgid "Use the --force flag to overrule all checks.\n"
+msgstr "Sử dụng --force để bãi b� m�i kiểm tra.\n"
+
+#: fdisk/sfdisk.c:3030
+msgid "OK\n"
+msgstr "OK\n"
+
+#: fdisk/sfdisk.c:3039
+#, c-format
+msgid "Old situation:\n"
+msgstr "Tình huống cũ:\n"
+
+#: fdisk/sfdisk.c:3043
+#, c-format
+msgid "Partition %d does not exist, cannot change it\n"
+msgstr "Phân vùng %d không tồn tại, không thể thay đổi nó\n"
+
+#: fdisk/sfdisk.c:3051
+#, c-format
+msgid "New situation:\n"
+msgstr "Tình huống mới:\n"
+
+#: fdisk/sfdisk.c:3056
+msgid ""
+"I don't like these partitions - nothing changed.\n"
+"(If you really want this, use the --force option.)\n"
+msgstr ""
+"Tôi không thích những phân vùng này - không có gì thay đổi.\n"
+"(Nếu bạn thực sự muốn đi�u này, sử dụng tùy ch�n --force.)\n"
+
+#: fdisk/sfdisk.c:3059
+msgid "I don't like this - probably you should answer No\n"
+msgstr "Tôi không thích đi�u này - bạn nên trả l�i No\n"
+
+#: fdisk/sfdisk.c:3064
+#, c-format
+msgid "Are you satisfied with this? [ynq] "
+msgstr "Bạn có hài lòng với đi�u này? [ynq] "
+
+#: fdisk/sfdisk.c:3066
+#, c-format
+msgid "Do you want to write this to disk? [ynq] "
+msgstr "Bạn có muốn ghi lên đĩa? [ynq] "
+
+#: fdisk/sfdisk.c:3071
+#, c-format
+msgid ""
+"\n"
+"sfdisk: premature end of input\n"
+msgstr ""
+"\n"
+"sfdisk: dữ liệu vào kết thúc sớm\n"
+
+#: fdisk/sfdisk.c:3073
+msgid "Quitting - nothing changed\n"
+msgstr "�ang thoát - không có gì thay đổi\n"
+
+#: fdisk/sfdisk.c:3079
+#, c-format
+msgid "Please answer one of y,n,q\n"
+msgstr "Xin hãy trả l�i một trng y,n,q\n"
+
+#: fdisk/sfdisk.c:3087
+#, c-format
+msgid ""
+"Successfully wrote the new partition table\n"
+"\n"
+msgstr ""
+"Viết thành công bảng phân vùng mới\n"
+"\n"
+
+#: fdisk/sfdisk.c:3093
+msgid ""
+"If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
+"to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"(See fdisk(8).)\n"
+msgstr ""
+"Nếu bạn tạo hay thay đổi một phân vùng DOS, ví dụ /dev/foo7, thì hãy dùng\n"
+"dd(1) để làm rỗng 512 byte đầu: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"(Xem fdisk(8).)\n"
+
+#: getopt/getopt.c:233
+msgid "Try `getopt --help' for more information.\n"
+msgstr "Hãy thử `getopt --help' để biết thêm thông tin.\n"
+
+#: getopt/getopt.c:299
+msgid "empty long option after -l or --long argument"
+msgstr "tùy ch�n dài rỗng sau -l hay tham số --long"
+
+#: getopt/getopt.c:319
+msgid "unknown shell after -s or --shell argument"
+msgstr "shell không rõ sau -s hay tham số --shell"
+
+#: getopt/getopt.c:324
+msgid "Usage: getopt optstring parameters\n"
+msgstr "Sử dụng: getopt optstring thamsố\n"
+
+#: getopt/getopt.c:325
+msgid "       getopt [options] [--] optstring parameters\n"
+msgstr "       getopt [tùych�n] [--] optstring thamsố\n"
+
+#: getopt/getopt.c:326
+msgid "       getopt [options] -o|--options optstring [options] [--]\n"
+msgstr "       getopt [tùych�n] -o|--options optstring [tùych�n] [--]\n"
+
+#: getopt/getopt.c:327
+msgid "              parameters\n"
+msgstr "              tham số\n"
+
+#: getopt/getopt.c:328
+msgid ""
+"  -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Cho phép tùy ch�n dài bắt đầu với một - đơn\n"
+
+#: getopt/getopt.c:329
+msgid "  -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Hướng dẫn sử dụng nh� này\n"
+
+#: getopt/getopt.c:330
+msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
+msgstr "  -l, --longoptions=tùych�ndài   Tùy ch�n dài cần nhận ra\n"
+
+#: getopt/getopt.c:331
+msgid ""
+"  -n, --name=progname          The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=tênchươngtrình          Báo cáo lỗi dưới tên chương trình\n"
+
+#: getopt/getopt.c:332
+msgid "  -o, --options=optstring      Short options to be recognized\n"
+msgstr "  -o, --options=optstring      Tùy ch�n ngắn cần nhận ra\n"
+
+#: getopt/getopt.c:333
+msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  Tắt b� báo cáo lỗi bằng getopt(3)\n"
+
+#: getopt/getopt.c:334
+msgid "  -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Không có kết quả ra thông thư�ng\n"
+
+#: getopt/getopt.c:335
+msgid "  -s, --shell=shell            Set shell quoting conventions\n"
+msgstr "  -s, --shell=shell            �ặt quy ước trích dẫn shell\n"
+
+#: getopt/getopt.c:336
+msgid "  -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Thử phiên bản getopt(1)\n"
+
+#: getopt/getopt.c:337
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -u, --unqote                 Không trích dẫn kết quả ra\n"
+
+#: getopt/getopt.c:338
+msgid "  -V, --version                Output version information\n"
+msgstr "  -V, --version                In ra thông tin phiên bản\n"
+
+#: getopt/getopt.c:395 getopt/getopt.c:456
+msgid "missing optstring argument"
+msgstr "thiếu tham số optstring"
+
+#: getopt/getopt.c:444
+#, c-format
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (đã nâng cao) 1.1.3\n"
+
+#: getopt/getopt.c:450
+msgid "internal error, contact the author."
+msgstr "lỗi nội bộ, hãy liên hệ với tác giả."
+
+#: hwclock/cmos.c:176
+#, c-format
+msgid "booted from MILO\n"
+msgstr "khởi động từ MILO\n"
+
+#: hwclock/cmos.c:185
+#, c-format
+msgid "Ruffian BCD clock\n"
+msgstr "�ồng hồ Ruffian BCD\n"
+
+#: hwclock/cmos.c:201
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr "clockport (cổng đồng hồ) đi�u chỉnh thành 0x%x\n"
+
+#: hwclock/cmos.c:213
+#, c-format
+msgid "funky TOY!\n"
+msgstr "�Ồ CHƠI nhút nhát!\n"
+
+#: hwclock/cmos.c:267
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr "%s: %s nguyên tử lỗi sau1000 vòng quay!"
+
+#: hwclock/cmos.c:591
+#, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "Không mở được /dev/port: %s"
+
+#: hwclock/cmos.c:598
+#, c-format
+msgid "I failed to get permission because I didn't try.\n"
+msgstr "Tôi lấy thông tin quy�n hạn không thành công vì đã không cố thử.\n"
+
+#: hwclock/cmos.c:601
+#, c-format
+msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
+msgstr ""
+"không thể dùng %s để lấy truy cập cổng I/O:  g�i iopl(3) không thành công.\n"
+
+#: hwclock/cmos.c:604
+#, c-format
+msgid "Probably you need root privileges.\n"
+msgstr "Rất có thể bạn cần quy�n ngư�i dùng root.\n"
+
+#: hwclock/hwclock.c:223
+#, c-format
+msgid "Assuming hardware clock is kept in %s time.\n"
+msgstr "Coi như đồng hồ phần cứng được giữ tại %s.\n"
+
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
+msgid "UTC"
+msgstr "UTC"
+
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
+msgid "local"
+msgstr "ná»™i bá»™"
+
+#: hwclock/hwclock.c:303
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr ""
+"%s: Cảnh báo: không nhận ra dòng thứ ba trong tập tin đi�u chỉnh th�i gian\n"
+
+#: hwclock/hwclock.c:305
+#, c-format
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr "(Mong đợi: `UTC' hay `LOCAL' hay không gì cả.)\n"
+
+#: hwclock/hwclock.c:312
+#, c-format
+msgid "Last drift adjustment done at %ld seconds after 1969\n"
+msgstr "�i�u chỉnh độ lệch lần cuối tại %ld giây sau 1969\n"
+
+#: hwclock/hwclock.c:314
+#, c-format
+msgid "Last calibration done at %ld seconds after 1969\n"
+msgstr "Sự định khuôn cuối cùng thực hiện lần cuối tại %ld giây sau 1969\n"
+
+#: hwclock/hwclock.c:316
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr "�ồng hồ phần cứng là trên %s\n"
+
+#: hwclock/hwclock.c:318
+msgid "unknown"
+msgstr "không rõ"
+
+#: hwclock/hwclock.c:342
+#, c-format
+msgid "Waiting for clock tick...\n"
+msgstr "Ch� tiếng tíc tắc của đồng hồ...\n"
+
+#: hwclock/hwclock.c:346
+#, c-format
+msgid "...got clock tick\n"
+msgstr "...đã nghe thấy tiếng tíc tắc\n"
+
+#: hwclock/hwclock.c:399
+#, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+"Giá trị không đúng trong đồng hồ phần cứng: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+
+#: hwclock/hwclock.c:407
+#, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr ""
+"Th�i gian đồng hồ phần cứng : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld giây kể từ "
+"1969\n"
+
+#: hwclock/hwclock.c:435
+#, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Th�i gian đ�c từ �ồng hồ Phần cứng: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+
+#: hwclock/hwclock.c:462
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr "�ặt �ồng hồ Phần cứng thành %.2d:%.2d:%.2d = %ld giây kể từ 1969\n"
+
+#: hwclock/hwclock.c:468
+#, c-format
+msgid "Clock not changed - testing only.\n"
+msgstr "�ồng hồ không thay đổi - chỉ thử nghiệm mà thôi.\n"
+
+#: hwclock/hwclock.c:516
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+"Th�i gian trôi qua kể từ khi chỉnh th�i gian là %.6f giây.\n"
+"Trì hoãn thêm để đi tới giây đầy đủ tiếp theo.\n"
+
+#: hwclock/hwclock.c:545
+#, c-format
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"�ồng hồ Phần cứng chứa các giá trị hoặc không đúng (v.d. ngày thứ 50 của "
+"tháng) hoặc vượt quá phạm vi chúng ta có thể đi�u khiển (v.d. Năm 2095).\n"
+
+#: hwclock/hwclock.c:555
+#, c-format
+msgid "%s  %.6f seconds\n"
+msgstr "%s  %.6f giây\n"
+
+#: hwclock/hwclock.c:589
+#, c-format
+msgid "No --date option specified.\n"
+msgstr "Không chỉ ra tùy ch�n --date.\n"
+
+#: hwclock/hwclock.c:595
+#, c-format
+msgid "--date argument too long\n"
+msgstr "Tham số --date quá dài\n"
+
+#: hwclock/hwclock.c:602
+#, c-format
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+"Giá trị của tùy ch�n --date không phải là một ngày thích hợp.\n"
+"Trong trư�ng hợp này, nó chứa các dấu trích dẫn.\n"
+
+#: hwclock/hwclock.c:610
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr "�ưa ra câu lệnh date (ngày tháng): %s\n"
+
+#: hwclock/hwclock.c:614
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr "Không chạy được chương trình 'date' trong shell /bin/sh. popen()"
+
+#: hwclock/hwclock.c:622
+#, c-format
+msgid "response from date command = %s\n"
+msgstr "trả l�i không thành công từ câu lệnh date = %s\n"
+
+#: hwclock/hwclock.c:624
+#, c-format
+msgid ""
+"The date command issued by %s returned unexpected results.\n"
+"The command was:\n"
+"  %s\n"
+"The response was:\n"
+"  %s\n"
+msgstr ""
+"Câu lệnh date (ngày tháng) đưa ra bởi %s trả lại kết quả không mong đợi.\n"
+"Câu lệnh là:\n"
+"  %s\n"
+"Kết quả là:\n"
+"  %s\n"
+
+#: hwclock/hwclock.c:636
+#, c-format
+msgid ""
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
+"The command was:\n"
+"  %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
+"Câu lệnh date (ngày tháng) đưa ra bởi %s trả lại kết quả không phải là một "
+"số nguyên, trong khi mong đợi giá trị th�i gian đã chuyển đổi.\n"
+"Câu lệnh là:\n"
+"  %s\n"
+"Kết quả là:\n"
+"  %s\n"
+
+#: hwclock/hwclock.c:647
+#, c-format
+msgid "date string %s equates to %ld seconds since 1969.\n"
+msgstr "chuỗi ngày tháng %s bằng %ld giây kể từ 1969.\n"
+
+#: hwclock/hwclock.c:679
+#, c-format
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"�ồng hồ Phần cứng không chứa th�i gian thích hợp, vì thế chúng ta không thể "
+"đặt Th�i gian của Hệ thống từ đó.\n"
+
+#: hwclock/hwclock.c:701
+#, c-format
+msgid "Calling settimeofday:\n"
+msgstr "�ang g�i settimeofday:\n"
+
+#: hwclock/hwclock.c:702
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+
+#: hwclock/hwclock.c:704
+#, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
+
+#: hwclock/hwclock.c:707
+#, c-format
+msgid "Not setting system clock because running in test mode.\n"
+msgstr ""
+"Không thiết lập đồng hồ hệ thống bở vì đang chạy trong chế độ thử nghiệm.\n"
+
+#: hwclock/hwclock.c:716
+#, c-format
+msgid "Must be superuser to set system clock.\n"
+msgstr "Cần phải là ngư�i dùng root để đặt đồng hồ hệ thống.\n"
+
+#: hwclock/hwclock.c:719
+msgid "settimeofday() failed"
+msgstr "settimeofday() không thành công"
+
+#: hwclock/hwclock.c:749
+#, c-format
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr "Không chỉnh độ lệnh th�i gian vì �ồng hồ phần cứng chứa rác.\n"
+
+#: hwclock/hwclock.c:754
+#, c-format
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Không chỉnh độ lệnh th�i gian vì lần định th�i gian cuối cùng bằng 0,\n"
+"vì thế lịch sử xấu, và cần khởi động lại việc định th�i gian.\n"
+
+#: hwclock/hwclock.c:760
+#, c-format
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"Không chỉnh độ lệnh th�i gian vì nó nh� hơn một ngày kể từ lần định th�i "
+"gian cuối cùng.\n"
+
+#: hwclock/hwclock.c:808
+#, c-format
+msgid ""
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
+"Adjusting drift factor by %f seconds/day\n"
+msgstr ""
+"�ồng hồ chạy sai lệch %.1f giây trong số %d giây đã qua, và đi ngược lạiđộ "
+"sai lệch %f giây/ngày.\n"
+"Chỉnh lại độ sai lệch %f giây/ngày\n"
+
+#: hwclock/hwclock.c:859
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr "Th�i gian kể từ lần chỉnh cuối cùng là %d giây\n"
+
+#: hwclock/hwclock.c:861
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr "Cần thêm %d giây và chuyển th�i gian ngược lại %.6f giây\n"
+
+#: hwclock/hwclock.c:890
+#, c-format
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr "Không cập nhật th�i gian chỉnh vì chế độ thử nghiệm.\n"
+
+#: hwclock/hwclock.c:891
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+"Ghi nhớ cái sau tới %s:\n"
+"%s"
+
+#: hwclock/hwclock.c:915
+#, c-format
+msgid "Drift adjustment parameters not updated.\n"
+msgstr "Không cập nhật các tham số chỉnh sai lệch.\n"
+
+#: hwclock/hwclock.c:956
+#, c-format
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"�ồng hồ Phần cứng không có th�i gian thích hợp, vì thế chúng ta không thể "
+"chỉnh.\n"
+
+#: hwclock/hwclock.c:988
+#, c-format
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr "Cần chỉnh ít hơn một giây, vì thế không đặt đồng hồ.\n"
+
+#: hwclock/hwclock.c:1014
+#, c-format
+msgid "Using %s.\n"
+msgstr "Sử dụng %s.\n"
+
+#: hwclock/hwclock.c:1016
+#, c-format
+msgid "No usable clock interface found.\n"
+msgstr "Không tìm thấy giao diện đồng hồ có thể sử dụng nào.\n"
+
+#: hwclock/hwclock.c:1112
+#, c-format
+msgid "Unable to set system clock.\n"
+msgstr "Không đặt được đồng hồ hệ thống.\n"
+
+#: hwclock/hwclock.c:1142
+#, c-format
+msgid ""
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
+"This copy of hwclock was built for a machine other than Alpha\n"
+"(and thus is presumably not running on an Alpha now).  No action taken.\n"
+msgstr ""
+"Nhân chỉ giữ giá trị khởi đầu cho �ồng hồ Phần cứng trên một máy Alpha.\n"
+"Bản sao này của hwclock được biên dịch cho một máy khác Alpha\n"
+"(và vì thế đoán rằng không chạy trên một máy Alpha).  Không thực hiện gì.\n"
+
+#: hwclock/hwclock.c:1151
+#, c-format
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr "Không lấy được giá trị khởi đầu từ nhân.\n"
+
+#: hwclock/hwclock.c:1153
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr "Nhân đang giữ giá trị khởi đầu là %lu\n"
+
+#: hwclock/hwclock.c:1156
+#, c-format
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"�ể đặt giá trị khởi đầu, bạn cần sử dụng tùy ch�n 'epoch' để thông báo giá "
+"trị muốn đặt.\n"
+
+#: hwclock/hwclock.c:1159
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr "Không đặt khởi đầu thành %d - chỉ thử nghiệm.\n"
+
+#: hwclock/hwclock.c:1162
+#, c-format
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr "Không đặt được giá trị khởi đầu trong nhân.\n"
+
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s từ %s\n"
+
+#: hwclock/hwclock.c:1196
+#, c-format
+msgid ""
+"hwclock - query and set the hardware clock (RTC)\n"
+"\n"
+"Usage: hwclock [function] [options...]\n"
+"\n"
+"Functions:\n"
+"  --help        show this help\n"
+"  --show        read hardware clock and print result\n"
+"  --set         set the rtc to the time given with --date\n"
+"  --hctosys     set the system time from the hardware clock\n"
+"  --systohc     set the hardware clock to the current system time\n"
+"  --adjust      adjust the rtc to account for systematic drift since \n"
+"                the clock was last set or adjusted\n"
+"  --getepoch    print out the kernel's hardware clock epoch value\n"
+"  --setepoch    set the kernel's hardware clock epoch value to the \n"
+"                value given with --epoch\n"
+"  --version     print out the version of hwclock to stdout\n"
+"\n"
+"Options: \n"
+"  --utc         the hardware clock is kept in coordinated universal time\n"
+"  --localtime   the hardware clock is kept in local time\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
+"  --badyear     ignore rtc's year because the bios is broken\n"
+"  --date        specifies the time to which to set the hardware clock\n"
+"  --epoch=year  specifies the year which is the beginning of the \n"
+"                hardware clock's epoch value\n"
+"  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
+"                either --utc or --localtime\n"
+msgstr ""
+"hwclock - h�i gi� và đặt đồng hồ phần cứng (theo RTC)\n"
+"\n"
+"Sử dụng: hwclock [hàm số] [các tùy ch�n...]\n"
+"\n"
+"Hàm số:\n"
+"  --help        hiển thị trợ giúp này\n"
+"  --show        đ�c th�i gian rồi in ra kết quả\n"
+"  --set         đặt rtc tới th�i gian đưa ra với --date\n"
+"  --hctosys     đặt th�i gian hệ thống từ đồng hồ phần cứng\n"
+"  --systohc     đặt th�i gian hệ thống hiện th�i vào cho đồng hồ phần cứng\n"
+"  --adjust      chỉnh rtc để tính độ sai lệch có hệ thống kể từ\n"
+"                lần đặt hay chỉnh đồng hồ cuối cùng\n"
+"  --getepoch    in ra giá trị khởi đầu (trong nhân) của đồng hồ phần cứng\n"
+"  --setepoch    đặt giá trị khởi đầu (trong nhân) của đồng hồ phần cứng\n"
+"                thành giá trị đưa bằng --epoch\n"
+"  --version     in ra phiên bản của hwclock tới stdout (màn hình)\n"
+"\n"
+"Các tùy ch�n: \n"
+"  --utc         đồng hồ phần cứng chỉ th�i gian utc (đối với kinh tuyến 0)\n"
+"  --localtime   đồng hồ phần cứng chỉ th�i gian nội bộ\n"
+"  --directisa   truy cập thằng tới ISA thay vì %s\n"
+"  --badyear     l� đi các năm rtc bởi vì bios bị h�ng\n"
+"  --date        chỉ ra th�i gian để đặt cho đồng hồ phần cứng\n"
+"  --epoch=year  chỉ ra năm đầu tiên của giá trị th�i gian khởi đầu\n"
+"                đồng hồ phần cứng\n"
+"  --noadjfile   không truy cập /etc/adjtime. Cần sử dụng\n"
+"                hoặc --utc hoặc --localtime\n"
+
+#: hwclock/hwclock.c:1223
+#, c-format
+msgid ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                tell hwclock the type of alpha you have (see hwclock(8))\n"
+msgstr ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                thông báo cho hwclock loại alpha bạn có (hãy xem hwclock"
+"(8))\n"
+
+#: hwclock/hwclock.c:1397
+#, c-format
+msgid "%s takes no non-option arguments.  You supplied %d.\n"
+msgstr "%s lấy các tham số không tùy ch�n.  Bạn đã cung cấp %d.\n"
+
+#: hwclock/hwclock.c:1403
+#, c-format
+msgid ""
+"You have specified multiple functions.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+"Bạn phải chỉ ra nhi�u hàm.\n"
+"Bạn chỉ có thể thực hiện một hàm mỗi lần.\n"
+
+#: hwclock/hwclock.c:1410
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+"%s: Các tùy ch�n --utc và --localtime loại trừ lẫn nhau.  Bạn lại đưa ra cả "
+"hai.\n"
+
+#: hwclock/hwclock.c:1417
+#, c-format
+msgid ""
+"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: Các tùy ch�n --adjust và --noadjust loại trừ lẫn nhau.  Bạn lại đưara cả "
+"hai.\n"
+
+#: hwclock/hwclock.c:1424
+#, c-format
+msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
+msgstr "%s: Với --noadjfile, bạn phải chỉ ra --utc hoặc --localtime\n"
+
+#: hwclock/hwclock.c:1438
+#, c-format
+msgid "No usable set-to time.  Cannot set clock.\n"
+msgstr "Không có th�i gian set-to nào có thể sử dụng.  Không thể đặt đồng hồ\n"
+
+#: hwclock/hwclock.c:1454
+#, c-format
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ ngư�i dùng root mới có thể thay đổi �ồng hồ Phần cứng.\n"
+
+#: hwclock/hwclock.c:1459
+#, c-format
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ ngư�i dùng root mới có thể thay đổi �ồng hồ Hệ thống.\n"
+
+#: hwclock/hwclock.c:1464
+#, c-format
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ ngư�i dùng root mới có thể thay đổi khởi đầu của�ồng hồ "
+"Phần cứng trong nhân.\n"
+
+#: hwclock/hwclock.c:1484
+#, c-format
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr ""
+"Không thể truy cập tới �ồng hồ Phần cứng qua một phương pháp không rõ.\n"
+
+#: hwclock/hwclock.c:1488
+#, c-format
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr ""
+"Sử dụng tùy ch�n --debug để xem chi tiết v� quá trình tìm kiếm phương pháp "
+"truy cập của chúng ta.\n"
+
+#: hwclock/kd.c:55
+#, c-format
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr "�ang ch� th�i gian từ KDGHWCLK thay đổi\n"
+
+#: hwclock/kd.c:58
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr "KDGHWCLK ioctl đ�c th�i gian không thành công"
+
+#: hwclock/kd.c:79 hwclock/rtc.c:188
+#, c-format
+msgid "Timed out waiting for time change.\n"
+msgstr "Quá th�i gian ch� thay đổi.\n"
+
+#: hwclock/kd.c:83
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr "KDGHWCLK ioctl đ�c th�i gian không thành công trong vòng tròn (loop)"
+
+#: hwclock/kd.c:105
+#, c-format
+msgid "ioctl() failed to read time from %s"
+msgstr "ioctl() đ�c th�i gian không thàh công từ %s"
+
+#: hwclock/kd.c:141
+msgid "ioctl KDSHWCLK failed"
+msgstr "ioctl KDSHWCLK không thành công"
+
+#: hwclock/kd.c:177
+msgid "Can't open /dev/tty1 or /dev/vc/1"
+msgstr "Không thể mở /dev/tty1 hay /dev/vc/1"
+
+#: hwclock/kd.c:181
+msgid "KDGHWCLK ioctl failed"
+msgstr "KDGHWCLK ioctl không thành công"
+
+#: hwclock/rtc.c:116 hwclock/rtc.c:209
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() cho %s không thành công"
+
+#: hwclock/rtc.c:150
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "ioctl() tới %s để đ�c th�i gian không thành công.\n"
+
+#: hwclock/rtc.c:172
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Ch� cho th�i gian từ %s thay đổi\n"
+
+#: hwclock/rtc.c:227
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s không có hàm gián đoạn (interrupt) nào. "
+
+#: hwclock/rtc.c:238
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "read() tới %s để ch� tiếng tíc tắc không thành công"
+
+#: hwclock/rtc.c:256
+#, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "select() tới %s để ch� tiếng tíc tắc không thành công"
+
+#: hwclock/rtc.c:259
+#, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "select() tới %s để ch� tiếng tíc tắc bị quá th�i gian\n"
+
+#: hwclock/rtc.c:268
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "ioctl() tới %s để tắt việc gián đoạn cập nhật không thành công"
+
+#: hwclock/rtc.c:271
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
+msgstr "ioctl() tới %s để bật việc gián đoạn cập nhật không thành công"
+
+#: hwclock/rtc.c:330
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "ioctl() tới %s để đặt th�i gian không thành công.\n"
+
+#: hwclock/rtc.c:336
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr "ioctl(%s) đã thành công.\n"
+
+#: hwclock/rtc.c:365
+#, c-format
+msgid "Open of %s failed"
+msgstr "Mở %s không thành công"
+
+#: hwclock/rtc.c:383 hwclock/rtc.c:429
+#, c-format
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"�ể đi�u khiển giá trị khởi đầu (epoch) trong nhân, chúng ta cần truy cập tới "
+"driver thiết bị 'rtc' qua tập tin thiết bị đặc biệt %s.  Tập tin này không "
+"tồn tại trên hệ thống.\n"
+
+#: hwclock/rtc.c:388 hwclock/rtc.c:434
+#, c-format
+msgid "Unable to open %s"
+msgstr "Không mở được %s"
+
+#: hwclock/rtc.c:395
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "ioctl(RTC_EPOCH_READ) tới %s không thành công"
+
+#: hwclock/rtc.c:401
+#, c-format
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "chúng ta đ�c khởi đầu (epoch) %ld từ %s bằng RTC_EPOCH_READ ioctl.\n"
+
+#: hwclock/rtc.c:421
+#, c-format
+msgid "The epoch value may not be less than 1900.  You requested %ld\n"
+msgstr ""
+"Giá trị khởi đầu (epoch) không được nh� hơn 1900.  Bạn đã yêu cầu %ld\n"
+
+#: hwclock/rtc.c:439
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr ""
+"thiết lập khởi đầu (epoch) thành %ld bằng RTC_EPOCH_SET ioctl tới %s.\n"
+
+#: hwclock/rtc.c:444
+#, c-format
+msgid ""
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "Driver thiết bị của nhân cho %s không có RTC_EPOCH_SET ioctl.\n"
+
+#: hwclock/rtc.c:447
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "ioctl(RTC_EPOCH_SET) tới %s không thành công"
+
+#: login-utils/agetty.c:312
+msgid "calling open_tty\n"
+msgstr "đang g�i open_tty\n"
+
+#: login-utils/agetty.c:325
+msgid "calling termio_init\n"
+msgstr "đang g�i termio_init\n"
+
+#: login-utils/agetty.c:330
+msgid "writing init string\n"
+msgstr "đang ghi chuỗi khởi đầu (init)\n"
+
+#: login-utils/agetty.c:340
+msgid "before autobaud\n"
+msgstr "trÆ°á»›c autobaud\n"
+
+#: login-utils/agetty.c:352
+msgid "waiting for cr-lf\n"
+msgstr "ch� cr-lf\n"
+
+#: login-utils/agetty.c:356
+#, c-format
+msgid "read %c\n"
+msgstr "đ�c %c\n"
+
+#: login-utils/agetty.c:365
+msgid "reading login name\n"
+msgstr "đ�c tên đăng nhập\n"
+
+#: login-utils/agetty.c:386
+#, c-format
+msgid "%s: can't exec %s: %m"
+msgstr "%s: không exec (thực hiện) được %s: %m"
+
+#: login-utils/agetty.c:406
+msgid "can't malloc initstring"
+msgstr "không mailloc được chuỗi khởi đầu (init)"
+
+#: login-utils/agetty.c:471
+#, c-format
+msgid "bad timeout value: %s"
+msgstr "giá trị th�i gian ch� xấu: %s"
+
+#: login-utils/agetty.c:480
+msgid "after getopt loop\n"
+msgstr "sau khi getopt vòng lặp\n"
+
+#: login-utils/agetty.c:530
+msgid "exiting parseargs\n"
+msgstr "đang thoát parseargs (phân tích tham số)\n"
+
+#: login-utils/agetty.c:542
+msgid "entered parse_speeds\n"
+msgstr "đang nhập parse_speeds (tốc độ phân tích)\n"
+
+#: login-utils/agetty.c:545
+#, c-format
+msgid "bad speed: %s"
+msgstr "tốc độ xấu: %s"
+
+#: login-utils/agetty.c:547
+msgid "too many alternate speeds"
+msgstr "quá nhi�u tốc độ luân phiên"
+
+#: login-utils/agetty.c:549
+msgid "exiting parsespeeds\n"
+msgstr "đang thoát parseargs (phân tích tham số)\n"
+
+#: login-utils/agetty.c:649
+#, c-format
+msgid "/dev: chdir() failed: %m"
+msgstr "/dev: chdir() không thành công: %m"
+
+#: login-utils/agetty.c:653
+#, c-format
+msgid "/dev/%s: not a character device"
+msgstr "/dev/%s: không phải thiết bị ký tự (character)"
+
+#: login-utils/agetty.c:660
+msgid "open(2)\n"
+msgstr "open(2) (mở)\n"
+
+#: login-utils/agetty.c:662
+#, c-format
+msgid "/dev/%s: cannot open as standard input: %m"
+msgstr "không mở được /dev/%s như một đầu vào tiêu chuẩn (stdin): %m"
+
+#: login-utils/agetty.c:672
+#, c-format
+msgid "%s: not open for read/write"
+msgstr "%s: không mở được đ�c/viết"
+
+#: login-utils/agetty.c:676
+msgid "duping\n"
+msgstr "đang dup (nhân đôi)\n"
+
+#: login-utils/agetty.c:678
+#, c-format
+msgid "%s: dup problem: %m"
+msgstr "%s: vấn đ� khi dup: %m"
+
+#: login-utils/agetty.c:752
+msgid "term_io 2\n"
+msgstr "term_io 2\n"
+
+#: login-utils/agetty.c:937
+#, c-format
+msgid "user"
+msgstr "ngư�i dùng"
+
+#: login-utils/agetty.c:937
+#, c-format
+msgid "users"
+msgstr "ngư�i dùng"
+
+#: login-utils/agetty.c:1025
+#, c-format
+msgid "%s: read: %m"
+msgstr "%s: đ�c: %m"
+
+#: login-utils/agetty.c:1071
+#, c-format
+msgid "%s: input overrun"
+msgstr "%s: thừa dữ liệu vào"
+
+#: login-utils/agetty.c:1195
+#, c-format
+msgid ""
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
+msgstr ""
+"Sử dụng: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"hoặc\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] line baud_rate,... [termtype]\n"
+
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
+#, c-format
+msgid "login: memory low, login may fail\n"
+msgstr "login: ít bộ nhớ, có thể không đăng nhập thành công\n"
+
+#: login-utils/checktty.c:85
+msgid "can't malloc for ttyclass"
+msgstr "không malloc được cho ttyclass (lớp tty)"
+
+#: login-utils/checktty.c:106
+msgid "can't malloc for grplist"
+msgstr "không malloc được cho grplist"
+
+#: login-utils/checktty.c:396
+#, c-format
+msgid "Login on %s from %s denied by default.\n"
+msgstr "�ăng nhập trên %s từ %s bị cấm theo mặc định.\n"
+
+#: login-utils/checktty.c:407
+#, c-format
+msgid "Login on %s from %s denied.\n"
+msgstr "�ăng nhập trên %s từ %s bị cấm.\n"
+
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
+#, c-format
+msgid "%s: you (user %d) don't exist.\n"
+msgstr "%s: bạn (ngư�i dùng %d) không tồn tại.\n"
+
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
+#, c-format
+msgid "%s: user \"%s\" does not exist.\n"
+msgstr "%s: ngư�i dùng \"%s\" không tồn tại.\n"
+
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
+#, c-format
+msgid "%s: can only change local entries; use yp%s instead.\n"
+msgstr "%s: chỉ thay đổi được các phần tử nội bộ, hãy dùng yp%s để thay thế.\n"
+
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+msgid "Unknown user context"
+msgstr "Không rõ ngữ cảnh ngư�i dùng"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr "%s: %s chưa được xác thực để thay đổi thông tin finger của %s\n"
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr "%s: Không đặt được văn cảnh cho /etc/passwd"
+
+#: login-utils/chfn.c:173
+#, c-format
+msgid "Changing finger information for %s.\n"
+msgstr "Thay đổi thông tin finger cho %s.\n"
+
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
+msgid "Password error."
+msgstr "Lỗi mật khẩu."
+
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: mount/lomount.c:300
+msgid "Password: "
+msgstr "Mật khẩu: "
+
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
+msgid "Incorrect password."
+msgstr "Mật khẩu không đúng."
+
+#: login-utils/chfn.c:217
+#, c-format
+msgid "Finger information not changed.\n"
+msgstr "Thông tin finger chưa thay đổi.\n"
+
+#: login-utils/chfn.c:319
+#, c-format
+msgid "Usage: %s [ -f full-name ] [ -o office ] "
+msgstr "Sử dụng: %s [ -f tên-đầy-đủ ] [ -o văn-phòng ] "
+
+#: login-utils/chfn.c:320
+#, c-format
+msgid ""
+"[ -p office-phone ]\n"
+"\t[ -h home-phone ] "
+msgstr ""
+"[ -p số-điện-thoại-văn-phòng ]\n"
+"\t[ -h số-điện-thoại-nhà ] "
+
+#: login-utils/chfn.c:321
+#, c-format
+msgid "[ --help ] [ --version ]\n"
+msgstr "[ --help ] [ --version ]\n"
+
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
+#, c-format
+msgid ""
+"\n"
+"Aborted.\n"
+msgstr ""
+"\n"
+"Bị gián đoạn.\n"
+
+#: login-utils/chfn.c:425
+#, c-format
+msgid "field is too long.\n"
+msgstr "vùng quá dài.\n"
+
+#: login-utils/chfn.c:433
+#, c-format
+msgid "'%c' is not allowed.\n"
+msgstr "'%c' không được phép.\n"
+
+#: login-utils/chfn.c:438
+#, c-format
+msgid "Control characters are not allowed.\n"
+msgstr "Các ký tự đi�u khiển không được cho phép.\n"
+
+#: login-utils/chfn.c:503
+#, c-format
+msgid "Finger information *NOT* changed.  Try again later.\n"
+msgstr "Thông tin finger *CHƯA* thay đổi.  Hãy thử lại sau.\n"
+
+#: login-utils/chfn.c:506
+#, c-format
+msgid "Finger information changed.\n"
+msgstr "Thông tin finger đã thay đổi.\n"
+
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:322
+msgid "malloc failed"
+msgstr "malloc không thành công"
+
+#: login-utils/chsh.c:137
+#, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: %s chưa được xác thực để thay đổi shell của %s\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+"%s: UID đang hoạt động không tương ứng với UID của ngư�i dùng chúng ta đang "
+"nhập, không được phép thay đổi shell\n"
+
+#: login-utils/chsh.c:163
+#, c-format
+msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
+msgstr ""
+"%s: Shell của bạn không có strong /etc/shells, không cho phép thay đổi "
+"shell\n"
+
+#: login-utils/chsh.c:170
+#, c-format
+msgid "Changing shell for %s.\n"
+msgstr "�ang thay đổi shell cho %s.\n"
+
+#: login-utils/chsh.c:211
+msgid "New shell"
+msgstr "Shell má»›i"
+
+#: login-utils/chsh.c:218
+#, c-format
+msgid "Shell not changed.\n"
+msgstr "Shell chưa thay đổi.\n"
+
+#: login-utils/chsh.c:225
+#, c-format
+msgid "Shell *NOT* changed.  Try again later.\n"
+msgstr "Shell *CHƯA* thay đổi.  Hãy thử lại sau.\n"
+
+#: login-utils/chsh.c:228
+#, c-format
+msgid "Shell changed.\n"
+msgstr "Shell đã thay đổi.\n"
+
+#: login-utils/chsh.c:293
+#, c-format
+msgid ""
+"Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ username ]\n"
+msgstr ""
+"Sử dụng: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ tên-ngư�i-dùng ]\n"
+
+#: login-utils/chsh.c:336
+#, c-format
+msgid "%s: shell must be a full path name.\n"
+msgstr "%s: shell phải là một tên đư�ng dẫn đầy đủ.\n"
+
+#: login-utils/chsh.c:340
+#, c-format
+msgid "%s: \"%s\" does not exist.\n"
+msgstr "%s: \"%s\" không tồn tại.\n"
+
+#: login-utils/chsh.c:344
+#, c-format
+msgid "%s: \"%s\" is not executable.\n"
+msgstr "%s: \"%s\" là không thể thực hiện.\n"
+
+#: login-utils/chsh.c:351
+#, c-format
+msgid "%s: '%c' is not allowed.\n"
+msgstr "%s: '%c' không cho phép.\n"
+
+#: login-utils/chsh.c:355
+#, c-format
+msgid "%s: Control characters are not allowed.\n"
+msgstr "%s: Các ký tự đi�u khiển không được cho phép.\n"
+
+#: login-utils/chsh.c:362
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells\n"
+msgstr "Cảnh báo: \"%s\" không có trong /etc/shells\n"
+
+#: login-utils/chsh.c:364
+#, c-format
+msgid "%s: \"%s\" is not listed in /etc/shells.\n"
+msgstr "%s: \"%s\" không liệt kê trong /etc/shells.\n"
+
+#: login-utils/chsh.c:366
+#, c-format
+msgid "%s: use -l option to see list\n"
+msgstr "%s: hãy dùng tùy ch�n -l để xem danh sách\n"
+
+#: login-utils/chsh.c:372
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
+msgstr "Cảnh báo: \"%s\" không có trong /etc/shells\n"
+
+#: login-utils/chsh.c:373
+#, c-format
+msgid "Use %s -l to see list.\n"
+msgstr "Hãy dùng %s -l để xem danh sách.\n"
+
+#: login-utils/chsh.c:393
+#, c-format
+msgid "No known shells.\n"
+msgstr "Không có shell biết đến.\n"
+
+#: login-utils/islocal.c:38
+#, c-format
+msgid "Can't read %s, exiting."
+msgstr "Không đ�c được %s, đang thoát."
+
+#: login-utils/last.c:148
+msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
+msgstr ""
+"sử dụng: last [-#] [-f tập-tin] [-t tty] [-h hostname] [ngư�i-dùng ...]\n"
+
+#: login-utils/last.c:284
+msgid "  still logged in"
+msgstr "  vẫn còn đăng nhập"
+
+#: login-utils/last.c:306
+#, c-format
+msgid ""
+"\n"
+"wtmp begins %s"
+msgstr ""
+"\n"
+"wtmp bắt đầu %s"
+
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
+msgid "last: malloc failure.\n"
+msgstr "last: malloc thất bại.\n"
+
+#: login-utils/last.c:407
+msgid "last: gethostname"
+msgstr "last: gethostname (lấy tên máy)"
+
+#: login-utils/last.c:456
+#, c-format
+msgid ""
+"\n"
+"interrupted %10.10s %5.5s \n"
+msgstr ""
+"\n"
+"đã gián đoạn %10.10s %5.5s \n"
+
+#: login-utils/login.c:196
+#, c-format
+msgid "FATAL: can't reopen tty: %s"
+msgstr "LỖI NẶNG: không thể mở lại (reopen) tty: %s"
+
+#: login-utils/login.c:227
+msgid "FATAL: bad tty"
+msgstr "LỖI NẶNG: tty xấu"
+
+#: login-utils/login.c:355
+#, c-format
+msgid "login: -h for super-user only.\n"
+msgstr "login: -h chỉ dành cho super-user (root).\n"
+
+#: login-utils/login.c:382
+#, c-format
+msgid "usage: login [-fp] [username]\n"
+msgstr "sử dụng: login [-fp] [tên-ngư�i-dùng]\n"
+
+#: login-utils/login.c:475
+#, c-format
+msgid "login: PAM Failure, aborting: %s\n"
+msgstr "login: PAM Thất bại, đang thoát: %s\n"
+
+#: login-utils/login.c:477
+#, c-format
+msgid "Couldn't initialize PAM: %s"
+msgstr "Không thể bắt đầu PAM: %s"
+
+#: login-utils/login.c:494
+msgid "login: "
+msgstr "đăng nhập: "
+
+#: login-utils/login.c:534
+#, c-format
+msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
+msgstr "�ĂNG NHẬP KHÔNG THÀNH CÔNG %d TỪ %s CHO %s, %s"
+
+#: login-utils/login.c:538
+#, c-format
+msgid ""
+"Login incorrect\n"
+"\n"
+msgstr ""
+"Sai tên ngư�i dùng hoặc mật khẩu\n"
+"\n"
+
+#: login-utils/login.c:547
+#, c-format
+msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
+msgstr "QU� NHIỀU LẦN THỬ �ĂNG NHẬP (%d) TỪ %s CHO %s, %s"
+
+#: login-utils/login.c:551
+#, c-format
+msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
+msgstr "�ĂNG NHẬP KHÔNG THÀNH CÔNG TỪ %s CHO %s, %s"
+
+#: login-utils/login.c:555
+#, c-format
+msgid ""
+"\n"
+"Login incorrect\n"
+msgstr ""
+"\n"
+"Sai tên ngư�i dùng hoặc mật khẩu\n"
+
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
+#, c-format
+msgid ""
+"\n"
+"Session setup problem, abort.\n"
+msgstr ""
+"\n"
+"Có vấn đ� cấu hình buổi làm việc, thoát.\n"
+
+#: login-utils/login.c:578
+#, c-format
+msgid "NULL user name in %s:%d. Abort."
+msgstr "Tên ngư�i dùng bằng KHÔNG (NULL) trong %s:%d. Thoát."
+
+#: login-utils/login.c:585
+#, c-format
+msgid "Invalid user name \"%s\" in %s:%d. Abort."
+msgstr "Tên ngư�i dùng sai \"%s\" trong %s:%d. Thoát."
+
+#: login-utils/login.c:604
+#, c-format
+msgid "login: Out of memory\n"
+msgstr "login: Không đủ bộ nhớ\n"
+
+#: login-utils/login.c:646
+msgid "Illegal username"
+msgstr "Tên ngư�i dùng không hợp pháp"
+
+#: login-utils/login.c:689
+#, c-format
+msgid "%s login refused on this terminal.\n"
+msgstr "%s đăng nhập từ chối trên terminal này.\n"
+
+#: login-utils/login.c:694
+#, c-format
+msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
+msgstr "�ĂNG NHẬP %s TỪ CH�I TỪ %s TRÊN TTY %s"
+
+#: login-utils/login.c:698
+#, c-format
+msgid "LOGIN %s REFUSED ON TTY %s"
+msgstr "�ĂNG NHẬP %s TỪ CH�I TRÊN TTY %s"
+
+#: login-utils/login.c:751
+#, c-format
+msgid "Login incorrect\n"
+msgstr ""
+"Sai tên ngư�i dùng hoặc mật khẩu\n"
+"\n"
+
+#: login-utils/login.c:972
+#, c-format
+msgid "DIALUP AT %s BY %s"
+msgstr "QUAY S� TẠI %s BỞI %s"
+
+#: login-utils/login.c:979
+#, c-format
+msgid "ROOT LOGIN ON %s FROM %s"
+msgstr "�ĂNG NHẬP CỦA ROOT TRÊN %s TỪ %s"
+
+#: login-utils/login.c:982
+#, c-format
+msgid "ROOT LOGIN ON %s"
+msgstr "�ĂNG NHẬP CỦA ROOT TRÊN %s"
+
+#: login-utils/login.c:985
+#, c-format
+msgid "LOGIN ON %s BY %s FROM %s"
+msgstr "�ĂNG NHẬP TRÊN %s BỞI %s TỪ %s"
+
+#: login-utils/login.c:988
+#, c-format
+msgid "LOGIN ON %s BY %s"
+msgstr "�ĂNG NHẬP TRÊN %s BỞI %s"
+
+#: login-utils/login.c:1009
+#, c-format
+msgid "You have new mail.\n"
+msgstr "Bạn có thư mới.\n"
+
+#: login-utils/login.c:1011
+#, c-format
+msgid "You have mail.\n"
+msgstr "Bạn có thư.\n"
+
+#: login-utils/login.c:1031
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "login: phân nhánh (fork) thất bại: %s"
+
+#: login-utils/login.c:1068
+#, c-format
+msgid "TIOCSCTTY failed: %m"
+msgstr "TIOCSCTTY không thành công: %m"
+
+#: login-utils/login.c:1074
+msgid "setuid() failed"
+msgstr "setuid() thất bại"
+
+#: login-utils/login.c:1080
+#, c-format
+msgid "No directory %s!\n"
+msgstr "Không có thư mục %s!\n"
+
+#: login-utils/login.c:1084
+#, c-format
+msgid "Logging in with home = \"/\".\n"
+msgstr "�ang đăng nhập với thư mục cá nhân = \"/\".\n"
+
+#: login-utils/login.c:1092
+#, c-format
+msgid "login: no memory for shell script.\n"
+msgstr "login: không có bộ nhớ cho script của shell.\n"
+
+#: login-utils/login.c:1119
+#, c-format
+msgid "login: couldn't exec shell script: %s.\n"
+msgstr "login: không thực hiện được shell script: %s.\n"
+
+#: login-utils/login.c:1122
+#, c-format
+msgid "login: no shell: %s.\n"
+msgstr "login: không có shell: %s.\n"
+
+#: login-utils/login.c:1137
+#, c-format
+msgid ""
+"\n"
+"%s login: "
+msgstr ""
+"\n"
+"%s đăng nhập: "
+
+#: login-utils/login.c:1148
+#, c-format
+msgid "login name much too long.\n"
+msgstr "tên đăng nhập quá dài.\n"
+
+#: login-utils/login.c:1149
+msgid "NAME too long"
+msgstr "TÊN quá dài"
+
+#: login-utils/login.c:1156
+#, c-format
+msgid "login names may not start with '-'.\n"
+msgstr "tên đăng nhập không được bắt đầu với '-'.\n"
+
+#: login-utils/login.c:1166
+#, c-format
+msgid "too many bare linefeeds.\n"
+msgstr "quá nhi�u dòng nhập vào trống\n"
+
+#: login-utils/login.c:1167
+msgid "EXCESSIVE linefeeds"
+msgstr "dòng nhập vào THỪA"
+
+#: login-utils/login.c:1199
+#, c-format
+msgid "Login timed out after %d seconds\n"
+msgstr "Hết th�i gian ch� đăng nhập sau %d giây\n"
+
+#: login-utils/login.c:1287
+#, c-format
+msgid "Last login: %.*s "
+msgstr "�ăng nhập lần cuối: %.*s "
+
+#: login-utils/login.c:1291
+#, c-format
+msgid "from %.*s\n"
+msgstr "từ %.*s\n"
+
+#: login-utils/login.c:1294
+#, c-format
+msgid "on %.*s\n"
+msgstr "trên %.*s\n"
+
+#: login-utils/login.c:1314
+#, c-format
+msgid "LOGIN FAILURE FROM %s, %s"
+msgstr "�ĂNG NHẬP THẤT BẠI TỪ %s, %s"
+
+#: login-utils/login.c:1317
+#, c-format
+msgid "LOGIN FAILURE ON %s, %s"
+msgstr "�ĂNG NHẬP THẤT BẠI TRÊN %s, %s"
+
+#: login-utils/login.c:1321
+#, c-format
+msgid "%d LOGIN FAILURES FROM %s, %s"
+msgstr "%d �ĂNG NHẬP THẤT BẠI TỪ %s, %s"
+
+#: login-utils/login.c:1324
+#, c-format
+msgid "%d LOGIN FAILURES ON %s, %s"
+msgstr "%d �ĂNG NHẬP THẤT BẠI TRÊN %s, %s"
+
+#: login-utils/mesg.c:89
+#, c-format
+msgid "is y\n"
+msgstr "là y (có)\n"
+
+#: login-utils/mesg.c:92
+#, c-format
+msgid "is n\n"
+msgstr "là n (không)\n"
+
+#: login-utils/mesg.c:112
+#, c-format
+msgid "usage: mesg [y | n]\n"
+msgstr "sử dụng: mesg [y | n]\n"
+
+#: login-utils/newgrp.c:69
+msgid "newgrp: Who are you?"
+msgstr "newgrp: Bạn là ai?"
+
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
+msgid "newgrp: setgid"
+msgstr "newgrp: setgid"
+
+#: login-utils/newgrp.c:82
+msgid "newgrp: No such group."
+msgstr "newgrp: Không có nhóm như vậy."
+
+#: login-utils/newgrp.c:91
+msgid "newgrp: Permission denied"
+msgstr "newgrp: Không đủ quy�n hạn"
+
+#: login-utils/newgrp.c:98
+msgid "newgrp: setuid"
+msgstr "newgrp: setuid"
+
+#: login-utils/newgrp.c:104
+msgid "No shell"
+msgstr "Không có shell"
+
+#: login-utils/shutdown.c:113
+#, c-format
+msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+msgstr "Sử dụng: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+
+#: login-utils/shutdown.c:131
+msgid "Shutdown process aborted"
+msgstr "Dừng việc tắt máy"
+
+#: login-utils/shutdown.c:162
+#, c-format
+msgid "%s: Only root can shut a system down.\n"
+msgstr "%s: Chỉ root có thể tắt máy.\n"
+
+#: login-utils/shutdown.c:256
+#, c-format
+msgid "That must be tomorrow, can't you wait till then?\n"
+msgstr "Là ngày mai, có thể ch� đến lúc đó?\n"
+
+#: login-utils/shutdown.c:307
+msgid "for maintenance; bounce, bounce"
+msgstr "cho bảo dưỡng;"
+
+#: login-utils/shutdown.c:311
+#, c-format
+msgid "timeout = %d, quiet = %d, reboot = %d\n"
+msgstr "th�i gian ch� = %d, im lặng = %d, khởi động lại = %d\n"
+
+#: login-utils/shutdown.c:336
+msgid "The system is being shut down within 5 minutes"
+msgstr "Sẽ tắt máy sau 5 phút"
+
+#: login-utils/shutdown.c:340
+msgid "Login is therefore prohibited."
+msgstr "Do đó đăng nhập là không thể."
+
+#: login-utils/shutdown.c:362
+#, c-format
+msgid "rebooted by %s: %s"
+msgstr "khởi động lại bởi %s: %s"
+
+#: login-utils/shutdown.c:365
+#, c-format
+msgid "halted by %s: %s"
+msgstr "dừng bởi %s: %s"
+
+#: login-utils/shutdown.c:429
+msgid ""
+"\n"
+"Why am I still alive after reboot?"
+msgstr ""
+"\n"
+"Tại sao tôi vẫn còn sống sau khi khởi động lại?"
+
+#: login-utils/shutdown.c:431
+msgid ""
+"\n"
+"Now you can turn off the power..."
+msgstr ""
+"\n"
+"Bây gi� có thể tắt nguồn điện..."
+
+#: login-utils/shutdown.c:447
+#, c-format
+msgid "Calling kernel power-off facility...\n"
+msgstr "�ang g�i phương tiện tắt máy của nhân...\n"
+
+#: login-utils/shutdown.c:450
+#, c-format
+msgid "Error powering off\t%s\n"
+msgstr "Lỗi tắt máy \t%s\n"
+
+#: login-utils/shutdown.c:458
+#, c-format
+msgid "Executing the program \"%s\" ...\n"
+msgstr "�ang thực hiện chương trình \"%s\"...\n"
+
+#: login-utils/shutdown.c:461
+#, c-format
+msgid "Error executing\t%s\n"
+msgstr "Lỗi thực hiện \t%s\n"
+
+#: login-utils/shutdown.c:488
+#, c-format
+msgid "URGENT: broadcast message from %s:"
+msgstr "URGENT: thông báo toàn thể từ %s:"
+
+#: login-utils/shutdown.c:494
+#, c-format
+msgid "System going down in %d hours %d minutes"
+msgstr "Hệ thống sẽ tắt sau %d gi� %d phút"
+
+#: login-utils/shutdown.c:497
+#, c-format
+msgid "System going down in 1 hour %d minutes"
+msgstr "Hệ thống sẽ tắt sau 1 gi� %d phút"
+
+#: login-utils/shutdown.c:500
+#, c-format
+msgid "System going down in %d minutes\n"
+msgstr "Hệ thống sẽ tắt sau %d phút\n"
+
+#: login-utils/shutdown.c:503
+#, c-format
+msgid "System going down in 1 minute\n"
+msgstr "Hệ thống sẽ tắt sau 1 phút\n"
+
+#: login-utils/shutdown.c:505
+#, c-format
+msgid "System going down IMMEDIATELY!\n"
+msgstr "Hệ thống sẽ tắt sau NGAY LẬP TỨC!\n"
+
+#: login-utils/shutdown.c:510
+#, c-format
+msgid "\t... %s ...\n"
+msgstr "\t... %s ...\n"
+
+#: login-utils/shutdown.c:567
+msgid "Cannot fork for swapoff. Shrug!"
+msgstr "Không thể phân nhánh cho swapoff. B� đi!"
+
+#: login-utils/shutdown.c:575
+msgid "Cannot exec swapoff, hoping umount will do the trick."
+msgstr "Không thực hiện được swapoff, hy v�ng umount sẽ làm thay."
+
+#: login-utils/shutdown.c:594
+msgid "Cannot fork for umount, trying manually."
+msgstr "Không phân nhánh được cho umount, đang thử một cách thủ công."
+
+#: login-utils/shutdown.c:603
+#, c-format
+msgid "Cannot exec %s, trying umount.\n"
+msgstr "Không chạy được %s, đang thử umount.\n"
+
+#: login-utils/shutdown.c:607
+msgid "Cannot exec umount, giving up on umount."
+msgstr "Không chạy được umount, b� trên umount."
+
+#: login-utils/shutdown.c:612
+msgid "Unmounting any remaining filesystems..."
+msgstr "�ang b� gắn m�i hệ thống tập tin nói đến..."
+
+#: login-utils/shutdown.c:659
+#, c-format
+msgid "shutdown: Couldn't umount %s: %s\n"
+msgstr "shutdown: Không umount được %s: %s\n"
+
+#: login-utils/simpleinit.c:132
+msgid "Booting to single user mode.\n"
+msgstr "Khởi động vào chế độ một ngư�i dùng.\n"
+
+#: login-utils/simpleinit.c:136
+msgid "exec of single user shell failed\n"
+msgstr "không chạy thành công shell cho ngư�i dùng đơn\n"
+
+#: login-utils/simpleinit.c:140
+msgid "fork of single user shell failed\n"
+msgstr "không phân nhánh thành công shell cho ngư�i dùng đơn\n"
+
+#: login-utils/simpleinit.c:208
+msgid "error opening fifo\n"
+msgstr "lỗi mở kênh fifo\n"
+
+#: login-utils/simpleinit.c:212
+msgid "error setting close-on-exec on /dev/initctl"
+msgstr "lỗi thiết lập close-on-exec trên /dev/initctl"
+
+#: login-utils/simpleinit.c:259
+msgid "error running finalprog\n"
+msgstr "lỗi chạy finalprog (kết thúc chương trình)\n"
+
+#: login-utils/simpleinit.c:263
+msgid "error forking finalprog\n"
+msgstr "lỗi phân nhánh finalprog (kết thúc chương trình)\n"
+
+#: login-utils/simpleinit.c:345
+msgid ""
+"\n"
+"Wrong password.\n"
+msgstr ""
+"\n"
+"Mật khẩu không đúng.\n"
+
+#: login-utils/simpleinit.c:418
+msgid "lstat of path failed\n"
+msgstr "lstat đư�ng dẫn không thành công\n"
+
+#: login-utils/simpleinit.c:426
+msgid "stat of path failed\n"
+msgstr "stat đư�ng dẫn không thành công\n"
+
+#: login-utils/simpleinit.c:434
+msgid "open of directory failed\n"
+msgstr "mở thư mục không thành công\n"
+
+#: login-utils/simpleinit.c:508
+msgid "fork failed\n"
+msgstr "phân nhánh không thành công\n"
+
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
+msgid "exec failed\n"
+msgstr "thực hiện (exec) không thành công\n"
+
+#: login-utils/simpleinit.c:563
+msgid "cannot open inittab\n"
+msgstr "không mở được inittab\n"
+
+#: login-utils/simpleinit.c:630
+msgid "no TERM or cannot stat tty\n"
+msgstr "không có TERM hoặc không thể stat (lấy trạng thái) tty\n"
+
+#: login-utils/simpleinit.c:936
+#, c-format
+msgid "error stopping service: \"%s\""
+msgstr "lỗi dừng dịch vụ: \"%s\""
+
+#: login-utils/ttymsg.c:75
+msgid "too many iov's (change code in wall/ttymsg.c)"
+msgstr "quá nhi�u iov (thay đổi mã trong wall/ttymsg.c)"
+
+#: login-utils/ttymsg.c:85
+#, c-format
+msgid "excessively long line arg"
+msgstr "arg dài quá mức"
+
+#: login-utils/ttymsg.c:139
+#, c-format
+msgid "cannot fork"
+msgstr "không phân nhánh được"
+
+#: login-utils/ttymsg.c:143
+#, c-format
+msgid "fork: %s"
+msgstr "fork: %s"
+
+#: login-utils/ttymsg.c:171
+#, c-format
+msgid "%s: BAD ERROR"
+msgstr "%s: LỖI XẤU"
+
+#: login-utils/vipw.c:143
+#, c-format
+msgid "%s: the password file is busy.\n"
+msgstr "%s: tập tin mật khẩu đang bận.\n"
+
+#: login-utils/vipw.c:146
+#, c-format
+msgid "%s: the group file is busy.\n"
+msgstr "%s: tập tin nhóm đang bận.\n"
+
+#: login-utils/vipw.c:162
+#, c-format
+msgid "%s: the %s file is busy (%s present)\n"
+msgstr "%s: tập tin %s đang bận (%s hiện th�i)\n"
+
+#: login-utils/vipw.c:168
+#, c-format
+msgid "%s: can't link %s: %s\n"
+msgstr "%s: không liên kết (link) được %s: %s\n"
+
+#: login-utils/vipw.c:202
+#, c-format
+msgid "%s: Can't get context for %s"
+msgstr "%s: Không lấy được văn cảnh cho %s"
+
+#: login-utils/vipw.c:208
+#, c-format
+msgid "%s: Can't set context for %s"
+msgstr "%s: Không đặt được văn cảnh cho %s"
+
+#: login-utils/vipw.c:217
+#, c-format
+msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
+msgstr "%s: không mở khóa được %s: %s (m�i thay đổi vẫn còn trong %s)\n"
+
+#: login-utils/vipw.c:240
+#, c-format
+msgid "%s: Cannot fork\n"
+msgstr "%s: Không thể phân nhánh\n"
+
+#: login-utils/vipw.c:276
+#, c-format
+msgid "%s: %s unchanged\n"
+msgstr "%s: %s không thay đổi\n"
+
+#: login-utils/vipw.c:297
+#, c-format
+msgid "%s: no changes made\n"
+msgstr "%s: không có thay đổi nào\n"
+
+#: login-utils/vipw.c:352
+#, c-format
+msgid "You are using shadow groups on this system.\n"
+msgstr "Bạn đang dùng shadow group (bóng nhóm) trên hệ thống này.\n"
+
+#: login-utils/vipw.c:353
+#, c-format
+msgid "You are using shadow passwords on this system.\n"
+msgstr "Bạn đang dùng shadow (bóng) mật khẩu trên hệ thống này.\n"
+
+#: login-utils/vipw.c:354
+#, c-format
+msgid "Would you like to edit %s now [y/n]? "
+msgstr "Soạn thảo %s bây gi� [y/n]? "
+
+#: login-utils/wall.c:104
+#, c-format
+msgid "usage: %s [file]\n"
+msgstr "sử dụng: %s [ tập tin ]\n"
+
+#: login-utils/wall.c:159
+#, c-format
+msgid "%s: can't open temporary file.\n"
+msgstr "%s: không mở được tập tin tạm th�i.\n"
+
+#: login-utils/wall.c:186
+#, c-format
+msgid "Broadcast Message from %s@%s"
+msgstr "Thông báo Toàn thể từ %s@%s"
+
+#: login-utils/wall.c:204
+#, c-format
+msgid "%s: will not read %s - use stdin.\n"
+msgstr "%s: sẽ không đ�c %s - sử dụng stdin.\n"
+
+#: login-utils/wall.c:209
+#, c-format
+msgid "%s: can't read %s.\n"
+msgstr "%s: không đ�c được %s.\n"
+
+#: login-utils/wall.c:231
+#, c-format
+msgid "%s: can't stat temporary file.\n"
+msgstr "%s: không lấy được trạng thái (stat) tập tin tạm th�i.\n"
+
+#: login-utils/wall.c:241
+#, c-format
+msgid "%s: can't read temporary file.\n"
+msgstr "%s: không đ�c được tập tin tạm th�i.\n"
+
+#: misc-utils/cal.c:327
+msgid "illegal month value: use 1-12"
+msgstr "giá trị tháng bị sai: hãy dùng từ 1 đến 12"
+
+#: misc-utils/cal.c:331
+msgid "illegal year value: use 1-9999"
+msgstr "giá trị năm không thích hợp: hãy dùng 1-9999"
+
+#: misc-utils/cal.c:439
+#, c-format
+msgid "%s %d"
+msgstr "%s %d"
+
+#: misc-utils/cal.c:780
+#, c-format
+msgid "usage: cal [-13smjyV] [[month] year]\n"
+msgstr "sử dụng: cal [-13smjyV] [[tháng] năm]\n"
+
+#: misc-utils/ddate.c:203
+#, c-format
+msgid "usage: %s [+format] [day month year]\n"
+msgstr "sử dụng: %s [+địnhdạng] [ngày tháng năm]\n"
+
+#: misc-utils/ddate.c:250
+msgid "St. Tib's Day"
+msgstr "Ngày thánh Tib"
+
+#: misc-utils/kill.c:207
+#, c-format
+msgid "%s: unknown signal %s\n"
+msgstr "%s: tín hiệu không rõ %s\n"
+
+#: misc-utils/kill.c:270
+#, c-format
+msgid "%s: can't find process \"%s\"\n"
+msgstr "%s: không thể tìm thấy tiến trình \"%s\"\n"
+
+#: misc-utils/kill.c:314
+#, c-format
+msgid "%s: unknown signal %s; valid signals:\n"
+msgstr "%s: tín hiệu không rõ %s; tín hiệu có thể dùng:\n"
+
+#: misc-utils/kill.c:354
+#, c-format
+msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
+msgstr "sử dụng: %s [ -s tín hiệu | -p ] [ -a ] pid ...\n"
+
+#: misc-utils/kill.c:355
+#, c-format
+msgid "       %s -l [ signal ]\n"
+msgstr "       %s -l [ tínhiệu ]\n"
+
+#: misc-utils/logger.c:141
+#, c-format
+msgid "logger: %s: %s.\n"
+msgstr "logger: %s: %s.\n"
+
+#: misc-utils/logger.c:248
+#, c-format
+msgid "logger: unknown facility name: %s.\n"
+msgstr "logger: không rõ tên phương tiện: %s.\n"
+
+#: misc-utils/logger.c:260
+#, c-format
+msgid "logger: unknown priority name: %s.\n"
+msgstr "logger: không rõ tên quy�n ưu tiên: %s.\n"
+
+#: misc-utils/logger.c:287
+#, c-format
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+"Sử dụng: logger [-is] [-f tậptin] [-p pri] [-t tag] [-u socket] "
+"[ thôngbáo ... ]\n"
+
+#: misc-utils/look.c:349
+#, c-format
+msgid "usage: look [-dfa] [-t char] string [file]\n"
+msgstr "sử dụng: look [-dfa] [-t char] string [file]\n"
+
+#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
+#, c-format
+msgid "Could not open %s\n"
+msgstr "Không mở được %s\n"
+
+#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
+#, c-format
+msgid "Got %d bytes from %s\n"
+msgstr "Nhận %d byte từ %s\n"
+
+#: misc-utils/namei.c:103
+#, c-format
+msgid "namei: unable to get current directory - %s\n"
+msgstr "namei: không lấy được thư mục hiện th�i - %s\n"
+
+#: misc-utils/namei.c:116
+#, c-format
+msgid "namei: unable to chdir to %s - %s (%d)\n"
+msgstr "namei: không chdir (thay đổi thư mục) được tới %s - %s (%d)\n"
+
+#: misc-utils/namei.c:126
+#, c-format
+msgid "usage: namei [-mx] pathname [pathname ...]\n"
+msgstr "sử dụng: namei [-mx] tênđư�ngdẫn [tênđư�ngdẫn ...]\n"
+
+#: misc-utils/namei.c:151
+#, c-format
+msgid "namei: could not chdir to root!\n"
+msgstr "namei: không thể chdir (thay đổi thư mục) tới root (gốc)!\n"
+
+#: misc-utils/namei.c:158
+#, c-format
+msgid "namei: could not stat root!\n"
+msgstr "namei: không thể lấy được trạng thái (stat) root!\n"
+
+#: misc-utils/namei.c:172
+#, c-format
+msgid "namei: buf overflow\n"
+msgstr "namei: tràn bộ đệm\n"
+
+#: misc-utils/namei.c:218
+#, c-format
+msgid " ? could not chdir into %s - %s (%d)\n"
+msgstr " ? không thể chdir (thay đổi thư mục) và %s - %s (%d)\n"
+
+#: misc-utils/namei.c:247
+#, c-format
+msgid " ? problems reading symlink %s - %s (%d)\n"
+msgstr " ? vấn đ� đ�c liên kết m�m %s - %s (%d)\n"
+
+#: misc-utils/namei.c:257
+#, c-format
+msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
+msgstr "  *** VƯỢT QU� GIỚI HẠN LIÊN KẾT MỀM CỦA UNIX ***\n"
+
+#: misc-utils/namei.c:294
+#, c-format
+msgid "namei: unknown file type 0%06o on file %s\n"
+msgstr "namei: không rõ loại tập tin 0%06o tên tập tin %s\n"
+
+#: misc-utils/rename.c:38
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: không đủ bộ nhớ\n"
+
+#: misc-utils/rename.c:56
+#, c-format
+msgid "%s: renaming %s to %s failed: %s\n"
+msgstr "%s: thay đổi tên %s thành %s không thành công: %s\n"
+
+#: misc-utils/rename.c:86
+#, c-format
+msgid "call: %s from to files...\n"
+msgstr "call: %s sang các tập tin...\n"
+
+#: misc-utils/script.c:106
+#, c-format
+msgid ""
+"Warning: `%s' is a link.\n"
+"Use `%s [options] %s' if you really want to use it.\n"
+"Script not started.\n"
+msgstr ""
+"Cảnh báo: `%s' là một liên kết.\n"
+"Hãy dùng `%s [tùy ch�n] %s' nếu thực sự muốn sử dụng nó.\n"
+"Script chưa chạy.\n"
+
+#: misc-utils/script.c:168
+#, c-format
+msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+msgstr "sử dụng: script [-a] [-f] [-q] [-t] [tập tin]\n"
+
+#: misc-utils/script.c:191
+#, c-format
+msgid "Script started, file is %s\n"
+msgstr "Script đã chạy, tập tin là %s\n"
+
+#: misc-utils/script.c:277
+#, c-format
+msgid "Script started on %s"
+msgstr "Script đã chạy trên %s"
+
+#: misc-utils/script.c:361
+#, c-format
+msgid ""
+"\n"
+"Script done on %s"
+msgstr ""
+"\n"
+"Script hoàn thành trên %s"
+
+#: misc-utils/script.c:368
+#, c-format
+msgid "Script done, file is %s\n"
+msgstr "Script hoàn thành, tập tin là %s\n"
+
+#: misc-utils/script.c:379
+#, c-format
+msgid "openpty failed\n"
+msgstr "openpty không thành công\n"
+
+#: misc-utils/script.c:413
+#, c-format
+msgid "Out of pty's\n"
+msgstr "Ngoài pty\n"
+
+#: misc-utils/setterm.c:746
+#, c-format
+msgid "%s: Argument error, usage\n"
+msgstr "%s: Lỗi tham số, sử dụng\n"
+
+#: misc-utils/setterm.c:749
+#, c-format
+msgid "  [ -term terminal_name ]\n"
+msgstr "  [ -term tên_terminal ]\n"
+
+#: misc-utils/setterm.c:750
+#, c-format
+msgid "  [ -reset ]\n"
+msgstr "  [ -reset ]\n"
+
+#: misc-utils/setterm.c:751
+#, c-format
+msgid "  [ -initialize ]\n"
+msgstr "  [ -initialize ]\n"
+
+#: misc-utils/setterm.c:752
+#, c-format
+msgid "  [ -cursor [on|off] ]\n"
+msgstr "  [ -cursor [on|off] ]\n"
+
+#: misc-utils/setterm.c:754
+#, c-format
+msgid "  [ -snow [on|off] ]\n"
+msgstr "  [ -snow [on|off] ]\n"
+
+#: misc-utils/setterm.c:755
+#, c-format
+msgid "  [ -softscroll [on|off] ]\n"
+msgstr "  [ -softscroll [on|off] ]\n"
+
+#: misc-utils/setterm.c:757
+#, c-format
+msgid "  [ -repeat [on|off] ]\n"
+msgstr "  [ -repeat [on|off] ]\n"
+
+#: misc-utils/setterm.c:758
+#, c-format
+msgid "  [ -appcursorkeys [on|off] ]\n"
+msgstr "  [ -appcursorkeys [on|off] ]\n"
+
+#: misc-utils/setterm.c:759
+#, c-format
+msgid "  [ -linewrap [on|off] ]\n"
+msgstr "  [ -linewrap [on|off] ]\n"
+
+#: misc-utils/setterm.c:760
+#, c-format
+msgid "  [ -default ]\n"
+msgstr "  [ -default ]\n"
+
+#: misc-utils/setterm.c:761
+#, c-format
+msgid "  [ -foreground black|blue|green|cyan"
+msgstr "  [ -foreground black|blue|green|cyan"
+
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
+#, c-format
+msgid "|red|magenta|yellow|white|default ]\n"
+msgstr "|red|magenta|yellow|white|default ]\n"
+
+#: misc-utils/setterm.c:763
+#, c-format
+msgid "  [ -background black|blue|green|cyan"
+msgstr "  [ -background black|blue|green|cyan"
+
+#: misc-utils/setterm.c:765
+#, c-format
+msgid "  [ -ulcolor black|grey|blue|green|cyan"
+msgstr "  [ -ulcolor black|grey|blue|green|cyan"
+
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
+#, c-format
+msgid "|red|magenta|yellow|white ]\n"
+msgstr "|red|magenta|yellow|white ]\n"
+
+#: misc-utils/setterm.c:767
+#, c-format
+msgid "  [ -ulcolor bright blue|green|cyan"
+msgstr "  [ -ulcolor bright blue|green|cyan"
+
+#: misc-utils/setterm.c:769
+#, c-format
+msgid "  [ -hbcolor black|grey|blue|green|cyan"
+msgstr "  [ -hbcolor black|grey|blue|green|cyan"
+
+#: misc-utils/setterm.c:771
+#, c-format
+msgid "  [ -hbcolor bright blue|green|cyan"
+msgstr "  [ -hbcolor bright blue|green|cyan"
+
+#: misc-utils/setterm.c:774
+#, c-format
+msgid "  [ -standout [ attr ] ]\n"
+msgstr "  [ -standout [ thuộc tính ] ]\n"
+
+#: misc-utils/setterm.c:776
+#, c-format
+msgid "  [ -inversescreen [on|off] ]\n"
+msgstr "  [ -inversescreen [on|off] ]\n"
+
+#: misc-utils/setterm.c:777
+#, c-format
+msgid "  [ -bold [on|off] ]\n"
+msgstr "  [ -bold [on|off] ]\n"
+
+#: misc-utils/setterm.c:778
+#, c-format
+msgid "  [ -half-bright [on|off] ]\n"
+msgstr "  [ -half-bright [on|off] ]\n"
+
+#: misc-utils/setterm.c:779
+#, c-format
+msgid "  [ -blink [on|off] ]\n"
+msgstr "  [ -blink [on|off] ]\n"
+
+#: misc-utils/setterm.c:780
+#, c-format
+msgid "  [ -reverse [on|off] ]\n"
+msgstr "  [ -reverse [on|off] ]\n"
+
+#: misc-utils/setterm.c:781
+#, c-format
+msgid "  [ -underline [on|off] ]\n"
+msgstr "  [ -underline [on|off] ]\n"
+
+#: misc-utils/setterm.c:782
+#, c-format
+msgid "  [ -store ]\n"
+msgstr "  [ -store ]\n"
+
+#: misc-utils/setterm.c:783
+#, c-format
+msgid "  [ -clear [all|rest] ]\n"
+msgstr "  [ -clear [all|rest] ]\n"
+
+#: misc-utils/setterm.c:784
+#, c-format
+msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
+msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
+
+#: misc-utils/setterm.c:785
+#, c-format
+msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
+msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
+
+#: misc-utils/setterm.c:786
+#, c-format
+msgid "  [ -regtabs [1-160] ]\n"
+msgstr "  [ -regtabs [1-160] ]\n"
+
+#: misc-utils/setterm.c:787
+#, c-format
+msgid "  [ -blank [0-60] ]\n"
+msgstr "  [ -blank [0-60] ]\n"
+
+#: misc-utils/setterm.c:788
+#, c-format
+msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
+msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
+
+#: misc-utils/setterm.c:789
+#, c-format
+msgid "  [ -append [1-NR_CONSOLES] ]\n"
+msgstr "  [ -append [1-NR_CONSOLES] ]\n"
+
+#: misc-utils/setterm.c:790
+#, c-format
+msgid "  [ -file dumpfilename ]\n"
+msgstr "  [ -file têntậptindump ]\n"
+
+#: misc-utils/setterm.c:791
+#, c-format
+msgid "  [ -msg [on|off] ]\n"
+msgstr "  [ -msg [on|off] ]\n"
+
+#: misc-utils/setterm.c:792
+#, c-format
+msgid "  [ -msglevel [0-8] ]\n"
+msgstr "  [ -msglevel [0-8] ]\n"
+
+#: misc-utils/setterm.c:793
+#, c-format
+msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+
+#: misc-utils/setterm.c:794
+#, c-format
+msgid "  [ -powerdown [0-60] ]\n"
+msgstr "  [ -powerdown [0-60] ]\n"
+
+#: misc-utils/setterm.c:795
+#, c-format
+msgid "  [ -blength [0-2000] ]\n"
+msgstr "  [ -blength [0-2000] ]\n"
+
+#: misc-utils/setterm.c:796
+#, c-format
+msgid "  [ -bfreq freqnumber ]\n"
+msgstr "  [ -bfreq tầnsố ]\n"
+
+#: misc-utils/setterm.c:1051
+#, c-format
+msgid "cannot (un)set powersave mode\n"
+msgstr "không (b�) đặt được chế độ tiết kiệm nguồn điện\n"
+
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
+#, c-format
+msgid "klogctl error: %s\n"
+msgstr "lá»—i klogctl: %s\n"
+
+#: misc-utils/setterm.c:1151
+#, c-format
+msgid "Error reading %s\n"
+msgstr "Lỗi đ�c %s\n"
+
+#: misc-utils/setterm.c:1166
+#, c-format
+msgid "Error writing screendump\n"
+msgstr "Lỗi ghi screendump (dump màn hình)\n"
+
+#: misc-utils/setterm.c:1180
+#, c-format
+msgid "couldn't read %s, and cannot ioctl dump\n"
+msgstr "không đ�c được %s, và không thể ioctl dump\n"
+
+#: misc-utils/setterm.c:1246
+#, c-format
+msgid "%s: $TERM is not defined.\n"
+msgstr "%s: $TERM chưa định nghĩa.\n"
+
+#: misc-utils/whereis.c:157
+#, c-format
+msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
+msgstr "whereis [ -sbmu ] [ -SBM thưmục ... -f ] tên...\n"
+
+#: misc-utils/write.c:99
+#, c-format
+msgid "write: can't find your tty's name\n"
+msgstr "write: không tìm thấy tên tty của bạn\n"
+
+#: misc-utils/write.c:110
+#, c-format
+msgid "write: you have write permission turned off.\n"
+msgstr "write: quy�n ghi nhớ của bạn đã tắt.\n"
+
+#: misc-utils/write.c:131
+#, c-format
+msgid "write: %s is not logged in on %s.\n"
+msgstr "write: %s chưa đăng nhập vào trên %s.\n"
+
+#: misc-utils/write.c:139
+#, c-format
+msgid "write: %s has messages disabled on %s\n"
+msgstr "write: %s tắt thông báo trên %s\n"
+
+#: misc-utils/write.c:146
+#, c-format
+msgid "usage: write user [tty]\n"
+msgstr "sử dụng: write ngư�i-dùng [tty]\n"
+
+#: misc-utils/write.c:234
+#, c-format
+msgid "write: %s is not logged in\n"
+msgstr "write: %s chưa đăng nhập vào\n"
+
+#: misc-utils/write.c:243
+#, c-format
+msgid "write: %s has messages disabled\n"
+msgstr "write: %s tắt không dùng thông báo\n"
+
+#: misc-utils/write.c:247
+#, c-format
+msgid "write: %s is logged in more than once; writing to %s\n"
+msgstr "write: %s đăng nhập nhi�u hơn một lần, đang ghi nhớ vào %s\n"
+
+#: misc-utils/write.c:313
+#, c-format
+msgid "Message from %s@%s (as %s) on %s at %s ..."
+msgstr "Tin nhắn từ %s@%s (như %s) trên %s lúc %s ..."
+
+#: misc-utils/write.c:316
+#, c-format
+msgid "Message from %s@%s on %s at %s ..."
+msgstr "Tin nhắn %s@%s tên %s lúc %s ..."
+
+#: mount/fstab.c:136
+#, c-format
+msgid "warning: error reading %s: %s"
+msgstr "cảnh báo: lỗi đ�c %s: %s"
+
+#: mount/fstab.c:164 mount/fstab.c:189
+#, c-format
+msgid "warning: can't open %s: %s"
+msgstr "cảnh báo: không mở được %s: %s"
+
+#: mount/fstab.c:169
+#, c-format
+msgid "mount: could not open %s - using %s instead\n"
+msgstr "mount: không mở được %s - sử dụng %s để thay thế\n"
+
+#: mount/fstab.c:484
+#, c-format
+msgid "can't create lock file %s: %s (use -n flag to override)"
+msgstr "không tạo được tập tin khóa %s: %s (hãy dùng c� -n để ghi đè lên)"
+
+#: mount/fstab.c:499
+#, c-format
+msgid "can't link lock file %s: %s (use -n flag to override)"
+msgstr "không liên kết được tập tin khóa %s: %s (hãy dùng c� -n để ghi đè lên)"
+
+#: mount/fstab.c:511
+#, c-format
+msgid "can't open lock file %s: %s (use -n flag to override)"
+msgstr "không mở được tập tin khóa %s: %s (hãy dùng c� -n để ghi đè lên)"
+
+#: mount/fstab.c:526
+#, c-format
+msgid "Can't lock lock file %s: %s\n"
+msgstr "Không khóa được tập tin khóa (lock file) %s: %s\n"
+
+#: mount/fstab.c:538
+#, c-format
+msgid "can't lock lock file %s: %s"
+msgstr "không khóa được tập tin khóa (lock file) %s: %s"
+
+#: mount/fstab.c:540
+msgid "timed out"
+msgstr "hết th�i gian"
+
+#: mount/fstab.c:547
+#, c-format
+msgid ""
+"Cannot create link %s\n"
+"Perhaps there is a stale lock file?\n"
+msgstr ""
+"Không tạo được liên kết %s\n"
+"Có thể đây là tập tin khóa b�n vững?\n"
+
+#: mount/fstab.c:587 mount/fstab.c:625
+#, c-format
+msgid "cannot open %s (%s) - mtab not updated"
+msgstr "không mở được %s (%s) - mtab chưa cập nhật"
+
+#: mount/fstab.c:633
+#, c-format
+msgid "error writing %s: %s"
+msgstr "lá»—i ghi nhá»› %s: %s"
+
+#: mount/fstab.c:643
+#, c-format
+msgid "error changing mode of %s: %s\n"
+msgstr "lỗi thay đổi chế độ (mode) của %s: %s\n"
+
+#: mount/fstab.c:661
+#, c-format
+msgid "can't rename %s to %s: %s\n"
+msgstr "không đổi tên được %s thành %s: %s\n"
+
+#: mount/lomount.c:73
+#, c-format
+msgid "loop: can't open device %s: %s\n"
+msgstr "loop: không mở được thiết bị %s: %s\n"
+
+#: mount/lomount.c:89
+#, c-format
+msgid ", offset %lld"
+msgstr ", bá»™ %lld"
+
+#: mount/lomount.c:92
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", giớihạnkíchthước %lld"
+
+#: mount/lomount.c:100
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", mã hóa %s (dạng %d)"
+
+#: mount/lomount.c:114
+#, c-format
+msgid ", offset %d"
+msgstr ", bá»™ %d"
+
+#: mount/lomount.c:117
+#, c-format
+msgid ", encryption type %d\n"
+msgstr ", dạng mã hóa %d\n"
+
+#: mount/lomount.c:126
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
+
+#: mount/lomount.c:179
+#, c-format
+msgid "%s: could not find any device /dev/loop#"
+msgstr "%s: không tìm thấy bất kỳ thiết bị /dev/loop# nào"
+
+#: mount/lomount.c:181
+#, c-format
+msgid "%s: no permission to look at /dev/loop#"
+msgstr "%s: không có quy�n xem /dev/loop#"
+
+#: mount/lomount.c:184
+#, c-format
+msgid ""
+"%s: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
+msgstr ""
+"%s: Không tìm thấy bất kỳ thiết bị loop nào. Có thể nhân này không biết\n"
+"       v� thiết bị loop? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe "
+"loop'.)"
+
+#: mount/lomount.c:189
+#, c-format
+msgid "%s: could not find any free loop device"
+msgstr "%s: không tìm thấy thiết bị loop nào còn trống"
+
+#: mount/lomount.c:287
+#, c-format
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr "Không khóa được vào bộ nhớ, đang thoát.\n"
+
+#: mount/lomount.c:340
+#, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%llu): thành công\n"
+
+#: mount/lomount.c:351
+#, c-format
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: không xóa được thiết bị %s: %s\n"
+
+#: mount/lomount.c:361
+#, c-format
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): thành công\n"
+
+#: mount/lomount.c:369
+#, c-format
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr "Phiên bản mout biên dịch không hỗ trợ loop. Xin hãy biên dịch lại.\n"
+
+#: mount/lomount.c:406
+#, c-format
+msgid ""
+"usage:\n"
+"  %s loop_device                                       # give info\n"
+"  %s -d loop_device                                    # delete\n"
+"  %s -f                                                # find unused\n"
+"  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
+msgstr ""
+"sử dụng:\n"
+"  %s thiết_bị_loop                                       # đưa thông tin\n"
+"  %s -d thiết_bị_loop                                    # xóa\n"
+"  %s -f                                                # tìm chưa sử dụng\n"
+"  %s [-e mã_hóa] [-o offset] {-f|thiết_bị_loop} tập-tin # cấu hình\n"
+
+#: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
+#, c-format
+msgid "not enough memory"
+msgstr "không đủ bộ nhớ"
+
+#: mount/lomount.c:540
+#, c-format
+msgid "No loop support was available at compile time. Please recompile.\n"
+msgstr "Biên dịch không hỗ trợ loop. Xin hãy biên dịch lại.\n"
+
+#: mount/mntent.c:166
+#, c-format
+msgid "[mntent]: warning: no final newline at the end of %s\n"
+msgstr "[mntent]: cảnh báo: không có dòng mới đặt ở cuối %s\n"
+
+#: mount/mntent.c:217
+#, c-format
+msgid "[mntent]: line %d in %s is bad%s\n"
+msgstr "[mntent]: dòng %d trong %s xấu%s\n"
+
+#: mount/mntent.c:220
+msgid "; rest of file ignored"
+msgstr "; b� qua phần còn lại của tập tin"
+
+#: mount/mount_blkid.c:87
+#, c-format
+msgid "%s: error: the label %s occurs on both %s and %s\n"
+msgstr "%s: lỗi: ghi nhãn %s xuất hiện trên cả %s và %s\n"
+
+#: mount/mount_blkid.c:99
+#, c-format
+msgid "mount: going to mount %s by UUID\n"
+msgstr "mount: chuẩn bị gắn %s theo UUID\n"
+
+#: mount/mount_blkid.c:103
+#, c-format
+msgid "mount: going to mount %s by label\n"
+msgstr "mount: chuẩn bị gắn %s theo nhãn\n"
+
+#: mount/mount_by_label.c:192
+#, c-format
+msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"%s: không mở được %s, vì thế không thực hiện được phép chuyển UUID và NHÃN.\n"
+
+#: mount/mount_by_label.c:315
+#, c-format
+msgid "%s: bad UUID"
+msgstr "%s: UUID xấu"
+
+#: mount/mount.c:382
+#, c-format
+msgid "mount: according to mtab, %s is already mounted on %s"
+msgstr "mount: theo như mtab thì %s đã gắn vào %s"
+
+#: mount/mount.c:387
+#, c-format
+msgid "mount: according to mtab, %s is mounted on %s"
+msgstr "mount: theo như mtab thì %s đã gắn vào %s"
+
+#: mount/mount.c:407
+#, c-format
+msgid "mount: can't open %s for writing: %s"
+msgstr "mount: không mở được %s để ghi nhớ: %s"
+
+#: mount/mount.c:424 mount/mount.c:677
+#, c-format
+msgid "mount: error writing %s: %s"
+msgstr "mount: lá»—i ghi nhá»› %s: %s"
+
+#: mount/mount.c:432
+#, c-format
+msgid "mount: error changing mode of %s: %s"
+msgstr "mount: lỗi thay đổi chế độ của %s: %s"
+
+#: mount/mount.c:483
+#, c-format
+msgid "%s looks like swapspace - not mounted"
+msgstr "%s có vẻ là không gian swap - không gắn"
+
+#: mount/mount.c:570
+msgid "mount failed"
+msgstr "mount (gắn) không thành công"
+
+#: mount/mount.c:572
+#, c-format
+msgid "mount: only root can mount %s on %s"
+msgstr "mount: chỉ ngư�i dùng root có quy�n gắn %s vào %s"
+
+#: mount/mount.c:600
+msgid "mount: loop device specified twice"
+msgstr "mount: chỉ ra thiết bị loop hai lần"
+
+#: mount/mount.c:605
+msgid "mount: type specified twice"
+msgstr "mount: chỉ ra loại hệ thống tập tin hai lần"
+
+#: mount/mount.c:617
+#, c-format
+msgid "mount: skipping the setup of a loop device\n"
+msgstr "mount: b� qua việc cấu hình thiết bị loop\n"
+
+#: mount/mount.c:626
+#, c-format
+msgid "mount: going to use the loop device %s\n"
+msgstr "mount: sẽ sử dụng thiết bị loop %s\n"
+
+#: mount/mount.c:631
+#, c-format
+msgid "mount: failed setting up loop device\n"
+msgstr "mount: thiết lập thiết bị loop không thành công\n"
+
+#: mount/mount.c:635
+#, c-format
+msgid "mount: setup loop device successfully\n"
+msgstr "mount: thiết lập thiết bị loop thành công\n"
+
+#: mount/mount.c:672
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: không mở được %s: %s"
+
+#: mount/mount.c:693
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: tham số cho -p hoặc --pass-fd phải là một số"
+
+#: mount/mount.c:706
+#, c-format
+msgid "mount: cannot open %s for setting speed"
+msgstr "mount: không mở được %s để đặt tốc độ"
+
+#: mount/mount.c:709
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: không đặt được tốc độ: %s"
+
+#: mount/mount.c:763 mount/mount.c:1339
+#, c-format
+msgid "mount: cannot fork: %s"
+msgstr "mount: không thể phân nhánh %s"
+
+#: mount/mount.c:885
+#, c-format
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr "mount: gắn nfs phiên bản 4 không thành công, đang thử 3..\n"
+
+#: mount/mount.c:895
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+"mount: không thể nhận ra loại hệ thống tập tin, và ngư�i dùng không chỉ ra "
+"loại nào"
+
+#: mount/mount.c:898
+msgid "mount: you must specify the filesystem type"
+msgstr "mount: cần chỉ rõ loại hệ thống tập tin"
+
+#: mount/mount.c:901
+msgid "mount: mount failed"
+msgstr "mount: gắn không thành công"
+
+#: mount/mount.c:907 mount/mount.c:942
+#, c-format
+msgid "mount: mount point %s is not a directory"
+msgstr "mount: điểm gắn %s không phải là một thư mục"
+
+#: mount/mount.c:909
+msgid "mount: permission denied"
+msgstr "mount: không đủ quy�n hạn"
+
+#: mount/mount.c:911
+msgid "mount: must be superuser to use mount"
+msgstr "mount: cần phải là ngư�i dùng root để sử dụng mount"
+
+#: mount/mount.c:915 mount/mount.c:919
+#, c-format
+msgid "mount: %s is busy"
+msgstr "mount: %s đang bận"
+
+#: mount/mount.c:921
+msgid "mount: proc already mounted"
+msgstr "mount: đã gắn proc"
+
+#: mount/mount.c:923
+#, c-format
+msgid "mount: %s already mounted or %s busy"
+msgstr "mount: đã gắn %s hoặc %s đang bận"
+
+#: mount/mount.c:929
+#, c-format
+msgid "mount: mount point %s does not exist"
+msgstr "mount: điểm gắn %s không tồn tại"
+
+#: mount/mount.c:931
+#, c-format
+msgid "mount: mount point %s is a symbolic link to nowhere"
+msgstr "mount: điểm gắn %s là một liên kết m�m không chỉ tới đâu"
+
+#: mount/mount.c:934
+#, c-format
+msgid "mount: special device %s does not exist"
+msgstr "mount: thiết bị %s không tồn tại"
+
+#: mount/mount.c:944
+#, c-format
+msgid ""
+"mount: special device %s does not exist\n"
+"       (a path prefix is not a directory)\n"
+msgstr ""
+"mount: thiết bị %s không tồn tại\n"
+"       (ti�n tố của đư�ng dẫn không phải là một thư mục)\n"
+
+#: mount/mount.c:957
+#, c-format
+msgid "mount: %s not mounted already, or bad option"
+msgstr "mount: %s chưa gắn, hoặc tùy ch�n xấu"
+
+#: mount/mount.c:959
+#, c-format
+msgid ""
+"mount: wrong fs type, bad option, bad superblock on %s,\n"
+"       missing codepage or other error"
+msgstr ""
+"mount: sai dạng hệ thống tập tin, tùy ch�n xấu, siêu khối (superblock) xấu "
+"trên %s,\n"
+"       thiếu bảng mã hoặc lỗi khác"
+
+#: mount/mount.c:969
+msgid ""
+"       (could this be the IDE device where you in fact use\n"
+"       ide-scsi so that sr0 or sda or so is needed?)"
+msgstr ""
+"      (có thể đây là thiết bị IDE mà trên thực tế sử dụng\n"
+"      ide-scsi vì thế cần sr0 hoặc sda hoặc tương tự?)"
+
+#: mount/mount.c:975
+msgid ""
+"       (aren't you trying to mount an extended partition,\n"
+"       instead of some logical partition inside?)"
+msgstr ""
+"       (có phải bạn đang cố gắn một phân vùng mở rộng,\n"
+"       chứ không phải một phân vùng lôgíc bên trong nó?)"
+
+#: mount/mount.c:992
+msgid ""
+"       In some cases useful info is found in syslog - try\n"
+"       dmesg | tail  or so\n"
+msgstr ""
+"      Trong một số trư�ng hợp có thể tìm thấy thông tin có\n"
+"      ích trong syslog - hãy thử dmesg | tail hoặc tương tự\n"
+
+#: mount/mount.c:998
+msgid "mount table full"
+msgstr "đầy bảng gắn"
+
+#: mount/mount.c:1000
+#, c-format
+msgid "mount: %s: can't read superblock"
+msgstr "mount: %s không đ�c được siêu khối superblock"
+
+#: mount/mount.c:1004
+#, c-format
+msgid "mount: %s: unknown device"
+msgstr "mount: %s: không rõ thiết bị này"
+
+#: mount/mount.c:1009
+#, c-format
+msgid "mount: unknown filesystem type '%s'"
+msgstr "mount: không rõ loại hệ thống tập tin '%s'"
+
+#: mount/mount.c:1021
+#, c-format
+msgid "mount: probably you meant %s"
+msgstr "mount: có thể muốn đặt %s"
+
+#: mount/mount.c:1023
+msgid "mount: maybe you meant 'iso9660'?"
+msgstr "mount: có thể muốn đặt 'iso9660'?"
+
+#: mount/mount.c:1025
+msgid "mount: maybe you meant 'vfat'?"
+msgstr "mount: có thể muốn đặt 'vfat'?"
+
+#: mount/mount.c:1028
+#, c-format
+msgid "mount: %s has wrong device number or fs type %s not supported"
+msgstr "mount: %s có số thiết bị sai hoặc chưa hỗ trợ loại fs %s"
+
+#: mount/mount.c:1034
+#, c-format
+msgid "mount: %s is not a block device, and stat fails?"
+msgstr "mount: %s không phải là một thiết bị khối, và stat không thành công?"
+
+#: mount/mount.c:1036
+#, c-format
+msgid ""
+"mount: the kernel does not recognize %s as a block device\n"
+"       (maybe `insmod driver'?)"
+msgstr ""
+"mount: nhân không nhận ra thiết bị khối %s\n"
+"       (có thể thử `insmod driver'?)"
+
+#: mount/mount.c:1039
+#, c-format
+msgid "mount: %s is not a block device (maybe try `-o loop'?)"
+msgstr "mount: %s không phải là thiết bị khối (có thể hãy thử `-o loop'?)"
+
+#: mount/mount.c:1042
+#, c-format
+msgid "mount: %s is not a block device"
+msgstr "mount: %s không phải là thiết bị khối"
+
+#: mount/mount.c:1045
+#, c-format
+msgid "mount: %s is not a valid block device"
+msgstr "mount: %s không phải là thiết bị khối thích hợp"
+
+#: mount/mount.c:1048
+msgid "block device "
+msgstr "thiết bị khối"
+
+#: mount/mount.c:1050
+#, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount: không gắn được %s%s với chế độ chỉ đ�c"
+
+#: mount/mount.c:1054
+#, c-format
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
+msgstr "mount: %s%s được bảo vệ kh�i ghi nhưng đưa ra c� `-w' (write, ghi)"
+
+#: mount/mount.c:1071
+#, c-format
+msgid "mount: %s%s is write-protected, mounting read-only"
+msgstr "mount: %s%s được bảo vệ kh�i ghi, đang gắn chỉ đ�c"
+
+#: mount/mount.c:1170
+#, c-format
+msgid "mount: no type was given - I'll assume nfs because of the colon\n"
+msgstr "mount: không đưa ra loại fs - Coi như nfs vì có dấu hai chấm\n"
+
+#: mount/mount.c:1176
+#, c-format
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
+msgstr "mount: không đưa ra loại fs - Coi như smbfs vì có // đằng trước\n"
+
+#: mount/mount.c:1193
+#, c-format
+msgid "mount: backgrounding \"%s\"\n"
+msgstr "mount: đưa ra n�n sau \"%s\"\n"
+
+#: mount/mount.c:1204
+#, c-format
+msgid "mount: giving up \"%s\"\n"
+msgstr "mount: đang b� \"%s\"\n"
+
+#: mount/mount.c:1286
+#, c-format
+msgid "mount: %s already mounted on %s\n"
+msgstr "mount: đã gắn %s trên %s\n"
+
+#: mount/mount.c:1416
+#, c-format
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a [-t|-O] ...     : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"or move a subtree:\n"
+"       mount --move olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+"Sử dụng: mount -V                 : in ra phiên bản\n"
+"       mount -h                 : in ra trợ giúp này\n"
+"       mount                    : liệt kê hệ thống tập tin đã gắn\n"
+"       mount -l                 : như trên, bao gồm cả nhãn khối (volume)\n"
+"Tiếp theo là phần thông tin. Lần gắn ngay sau.\n"
+"Câu lệnh là `mount [-t fstype] thứ-gì-đó nơi-nào-đó'.\n"
+"Chi tiết tìm thấy trong /etc/fstab có thể bị b� đi.\n"
+"       mount -a [-t|-O] ...     : gắn m�i thứ từ /etc/fstab\n"
+"       mount thiết-bị             : gắn thiết-bị vào nơi đã biết\n"
+"       mount thư-mục          : gắn thiết bị đã biết vào thư-mục\n"
+"       mount -t loại thiết-bị thư-mục    : câu lệnh gắn một lần\n"
+"Chú ý rằng ngư�i dùng không thực sự gắn một thiết bị, mà gắn hệ thống\n"
+"tập tin (với loại chỉ ra) tìm thấy trên thiết bị.\n"
+"Ngư�i dùng còn có thể gắn cây thư mục đã gắn vào nơi khác:\n"
+"       mount --bind thưmục-cũ thưmục-mới\n"
+"hoặc di chuyển một cây thư mục con:\n"
+"       mount --move thưmục-cũ thưmục-mới\n"
+"Có thể chỉ ra thiết bị theo tên, ví dụ /dev/hda1 hoặc /dev/cdrom,\n"
+"hoặc theo nhãn bằng  -L tên-nhãn, hoặc theo uuid bằng  -U uuid .\n"
+"Những tùy ch�n khácO: [-nfFrsvw] [-o tùy-ch�n] [-p passwdfd].\n"
+"�ể biết thêm thông tin hãy gõ lệnh man 8 mount .\n"
+
+#: mount/mount.c:1605
+msgid "mount: only root can do that"
+msgstr "mount: chỉ có root có quy�n thực hiện"
+
+#: mount/mount.c:1610
+#, c-format
+msgid "mount: no %s found - creating it..\n"
+msgstr "mount: không tìm thấy %s - đang tạo..\n"
+
+#: mount/mount.c:1622
+msgid "mount: no such partition found"
+msgstr "mount: không tìm thấy phân vùng như vậy"
+
+#: mount/mount.c:1624
+#, c-format
+msgid "mount: mounting %s\n"
+msgstr "mount: đang gắn %s\n"
+
+#: mount/mount.c:1633
+msgid "nothing was mounted"
+msgstr "không gắn gì cả"
+
+#: mount/mount.c:1648
+#, c-format
+msgid "mount: cannot find %s in %s"
+msgstr "mount: không tìm thấy %s trong %s"
+
+#: mount/mount.c:1663
+#, c-format
+msgid "mount: can't find %s in %s or %s"
+msgstr "mount: không tìm thấy %s trong %s hoặc %s"
+
+#: mount/mount_guess_fstype.c:489
+#, c-format
+msgid "mount: error while guessing filesystem type\n"
+msgstr "mount: lỗi khi đoán loại hệ thống tập tin\n"
+
+#: mount/mount_guess_fstype.c:541
+#, c-format
+msgid "mount: you didn't specify a filesystem type for %s\n"
+msgstr "mount: ngư�i dùng chưa chỉ ra loại thiết bị tập tin cho %s\n"
+
+#: mount/mount_guess_fstype.c:544
+#, c-format
+msgid "       I will try all types mentioned in %s or %s\n"
+msgstr "      Sẽ thử tất cả m�i loại đ� cập đến trong %s hay %s\n"
+
+#: mount/mount_guess_fstype.c:547
+#, c-format
+msgid "       and it looks like this is swapspace\n"
+msgstr "       và đây có vẻ là không gian swap\n"
+
+#: mount/mount_guess_fstype.c:549
+#, c-format
+msgid "       I will try type %s\n"
+msgstr "       Sẽ thử loại %s\n"
+
+#: mount/mount_guess_fstype.c:637
+#, c-format
+msgid "Trying %s\n"
+msgstr "�ang thử %s.\n"
+
+#: mount/nfsmount.c:235
+#, c-format
+msgid "mount: excessively long host:dir argument\n"
+msgstr "mount: tham số tênmáy:thưmục dài quá mức\n"
+
+#: mount/nfsmount.c:249
+#, c-format
+msgid "mount: warning: multiple hostnames not supported\n"
+msgstr "mount: cảnh báo: không hỗ trợ việc đưa ra nhi�u tên máy\n"
+
+#: mount/nfsmount.c:254
+#, c-format
+msgid "mount: directory to mount not in host:dir format\n"
+msgstr "mount: thư mục để gắn tới không phải ở dạng tênmáy:thưmục\n"
+
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
+#, c-format
+msgid "mount: can't get address for %s\n"
+msgstr "mount: không lấy được địa chỉ cho %s\n"
+
+#: mount/nfsmount.c:271
+#, c-format
+msgid "mount: got bad hp->h_length\n"
+msgstr "mount: nhận được hp->h_length xấu\n"
+
+#: mount/nfsmount.c:288
+#, c-format
+msgid "mount: excessively long option argument\n"
+msgstr "mount: tham số của tùy ch�n quá dài\n"
+
+#: mount/nfsmount.c:380
+#, c-format
+msgid "Warning: Unrecognized proto= option.\n"
+msgstr "Cảnh báo: Không biết đến tùy ch�n proto=.\n"
+
+#: mount/nfsmount.c:387
+#, c-format
+msgid "Warning: Option namlen is not supported.\n"
+msgstr "Cảnh báo: Không hỗ trợ tùy ch�n namlen\n"
+
+#: mount/nfsmount.c:391
+#, c-format
+msgid "unknown nfs mount parameter: %s=%d\n"
+msgstr "tham số gắn nfs không biết đến: %s=%d\n"
+
+#: mount/nfsmount.c:425
+#, c-format
+msgid "Warning: option nolock is not supported.\n"
+msgstr "Cảnh báo: không hỗ trợ tùy ch�n nolock\n"
+
+#: mount/nfsmount.c:430
+#, c-format
+msgid "unknown nfs mount option: %s%s\n"
+msgstr "không rõ tùy ch�n gắn nfs: %s%s\n"
+
+#: mount/nfsmount.c:526
+#, c-format
+msgid "mount: got bad hp->h_length?\n"
+msgstr "mount: nhận được hp->h_length xấu?\n"
+
+#: mount/nfsmount.c:714
+#, c-format
+msgid "NFS over TCP is not supported.\n"
+msgstr "Không hỗ trợ NFS qua TCP.\n"
+
+#: mount/nfsmount.c:721
+msgid "nfs socket"
+msgstr "nfs socket"
+
+#: mount/nfsmount.c:725
+msgid "nfs bindresvport"
+msgstr "nfs bindresvport"
+
+#: mount/nfsmount.c:739
+msgid "nfs server reported service unavailable"
+msgstr "máy chủ nfs thông báo dịch vụ chưa sẵng sàng"
+
+#: mount/nfsmount.c:748
+#, c-format
+msgid "used portmapper to find NFS port\n"
+msgstr "sử dụng portmapper (sơ đồ cổng) để tìm cổng NFS\n"
+
+#: mount/nfsmount.c:752
+#, c-format
+msgid "using port %d for nfs deamon\n"
+msgstr "sử dụng cổng %d cho deamon nfs\n"
+
+#: mount/nfsmount.c:763
+msgid "nfs connect"
+msgstr "kết nối nfs"
+
+#: mount/nfsmount.c:850
+#, c-format
+msgid "unknown nfs status return value: %d"
+msgstr "không rõ giá trị trạng thái nfs: %d"
+
+#: mount/sundries.c:26
+msgid "bug in xstrndup call"
+msgstr "lỗi (bug) trong l�i g�i xstrndup"
+
+#: mount/swapon.c:56
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+"       %s -a [-e] [-v]\n"
+"       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
+"       %s [-s]\n"
+msgstr ""
+"sử dụng: %s [-hV]\n"
+"       %s -a [-e] [-v]\n"
+"       %s [-v] [-p ưu-tiên] special|LABEL=tên_volume ...\n"
+"       %s [-s]\n"
+
+#: mount/swapon.c:66
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] special ...\n"
+msgstr ""
+"sử dụng: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] special ...\n"
+
+#: mount/swapon.c:173 mount/swapon.c:265
+#, c-format
+msgid "%s on %s\n"
+msgstr "%s trên %s\n"
+
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
+msgid "%s: cannot find the device for %s\n"
+msgstr "%s: không tìm thấy thiết bị cho %s\n"
+
+#: mount/swapon.c:184
+#, c-format
+msgid "%s: cannot stat %s: %s\n"
+msgstr "%s: không thể stat %s: %s\n"
+
+#: mount/swapon.c:195
+#, c-format
+msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
+msgstr "%s: cảnh báo: %s có quy�n không bảo mật %04o, đ� nghị dùng %04o\n"
+
+#: mount/swapon.c:207
+#, c-format
+msgid "%s: Skipping file %s - it appears to have holes.\n"
+msgstr "%s: B� qua tập tin %s - nó có vẻ có lỗ hổng.\n"
+
+#: mount/swapon.c:275
+#, c-format
+msgid "Not superuser.\n"
+msgstr "Không phải ngư�i dùng root.\n"
+
+#: mount/swapon.c:309 mount/swapon.c:501
+#, c-format
+msgid "%s: cannot open %s: %s\n"
+msgstr "%s: không mở được %s: %s\n"
+
+#: mount/umount.c:49
+#, c-format
+msgid "umount: compiled without support for -f\n"
+msgstr "umount: không biên dịch hỗ trợ -f\n"
+
+#: mount/umount.c:139
+#, c-format
+msgid "umount: cannot fork: %s"
+msgstr "umount: không thể phân nhánh %s"
+
+#: mount/umount.c:171
+#, c-format
+msgid "host: %s, directory: %s\n"
+msgstr "host: %s, thư mục %s\n"
+
+#: mount/umount.c:191
+#, c-format
+msgid "umount: can't get address for %s\n"
+msgstr "umount: không lấy được địa chỉ cho %s\n"
+
+#: mount/umount.c:196
+#, c-format
+msgid "umount: got bad hostp->h_length\n"
+msgstr "umount: nhận hostp->h_length xấu\n"
+
+#: mount/umount.c:243
+#, c-format
+msgid "umount: %s: invalid block device"
+msgstr "umount: %s: thiết bị khối không đúng"
+
+#: mount/umount.c:245
+#, c-format
+msgid "umount: %s: not mounted"
+msgstr "umount: %s: chưa gắn"
+
+#: mount/umount.c:247
+#, c-format
+msgid "umount: %s: can't write superblock"
+msgstr "umount: %s: không thể ghi khối super"
+
+#: mount/umount.c:251
+#, c-format
+msgid "umount: %s: device is busy"
+msgstr "umount: %s: thiết bị đang bận"
+
+#: mount/umount.c:253
+#, c-format
+msgid "umount: %s: not found"
+msgstr "umount: %s: không tìm thấy"
+
+#: mount/umount.c:255
+#, c-format
+msgid "umount: %s: must be superuser to umount"
+msgstr "umount: %s: phải là ngư�i dùng root để b� gắn"
+
+#: mount/umount.c:257
+#, c-format
+msgid "umount: %s: block devices not permitted on fs"
+msgstr "umount: %s: thiết bị khối không cho phép trên fs"
+
+#: mount/umount.c:259
+#, c-format
+msgid "umount: %s: %s"
+msgstr "umount: %s: %s"
+
+#: mount/umount.c:313
+#, c-format
+msgid "no umount2, trying umount...\n"
+msgstr "không có umount2, đang thử umount..\n"
+
+#: mount/umount.c:329
+#, c-format
+msgid "could not umount %s - trying %s instead\n"
+msgstr "không b� gắn được %s - đang thử %s để thay thế\n"
+
+#: mount/umount.c:347
+#, c-format
+msgid "umount: %s busy - remounted read-only\n"
+msgstr "umount: %s bận - gắn lại chỉ đ�c\n"
+
+#: mount/umount.c:357
+#, c-format
+msgid "umount: could not remount %s read-only\n"
+msgstr "umount: không thể gắn lại %s chỉ đ�c\n"
+
+#: mount/umount.c:366
+#, c-format
+msgid "%s umounted\n"
+msgstr "%s đã b� gắn\n"
+
+#: mount/umount.c:464
+msgid "umount: cannot find list of filesystems to unmount"
+msgstr "umount: không tìm thấy danh sách hệ thống tập tin để b� gắn"
+
+#: mount/umount.c:494
+#, c-format
+msgid ""
+"Usage: umount [-hV]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-f] [-r] [-n] [-v] special | node...\n"
+msgstr ""
+"Sử dụng: umount [-hV]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O tùych�n]\n"
+"       umount [-f] [-r] [-n] [-v] special | node...\n"
+
+#: mount/umount.c:546
+msgid "Cannot umount \"\"\n"
+msgstr "Không b� gắn được \"\"\n"
+
+#: mount/umount.c:552
+#, c-format
+msgid "Trying to umount %s\n"
+msgstr "�ang thử b� gắn %s\n"
+
+#: mount/umount.c:558
+#, c-format
+msgid "Could not find %s in mtab\n"
+msgstr "Không tìm thấy %s trong mtab\n"
+
+#: mount/umount.c:565
+#, c-format
+msgid "umount: %s is not mounted (according to mtab)"
+msgstr "umount: %s chưa gắn (theo mtab)"
+
+#: mount/umount.c:572
+#, c-format
+msgid "umount: it seems %s is mounted multiple times"
+msgstr "umount: có vẻ %s được gắn nhi�u lần"
+
+#: mount/umount.c:585
+#, c-format
+msgid "umount: %s is not in the fstab (and you are not root)"
+msgstr "umount: %s không có trong fstab (và ngư�i dùng không phải là root)"
+
+#: mount/umount.c:589
+#, c-format
+msgid "umount: %s mount disagrees with the fstab"
+msgstr "umount: gắn %s không tương ứng fstab"
+
+#: mount/umount.c:630
+#, c-format
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: chỉ có %s có thể b� gắn %s từ %s"
+
+#: mount/umount.c:711
+msgid "umount: only root can do that"
+msgstr "umount: chỉ có root có quy�n thực hiện"
+
+#: sys-utils/ctrlaltdel.c:27
+#, c-format
+msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
+msgstr "Phải là root để đặt tính năng của Ctrl-Alt-Del.\n"
+
+#: sys-utils/ctrlaltdel.c:42
+#, c-format
+msgid "Usage: ctrlaltdel hard|soft\n"
+msgstr "Sử dụng: ctrlaltdel hard|soft\n"
+
+#: sys-utils/cytune.c:115
+#, c-format
+msgid ""
+"File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
+"and the maximum transfer rate in characters/second was %f\n"
+msgstr ""
+"Tập tin %s, Giá trị ngưỡng %lu, Số ký tự lớn nhất trong fifo là %d,\n"
+"và tốc độ truy�n tải lớn nhất tính theo ký tự/giây là %f\n"
+
+#: sys-utils/cytune.c:126
+#, c-format
+msgid ""
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
+"and the maximum transfer rate in characters/second was %f\n"
+msgstr ""
+"Tập tin %s, Giá trị ngưỡng %lu, và giá trị th�i gian ch� %lu, Số ký tự lớn "
+"nhất trong fifo là %d,\n"
+"và tốc độ truy�n tải lớn nhất tính theo ký tự/giây là %f\n"
+
+#: sys-utils/cytune.c:190
+#, c-format
+msgid "Invalid interval value: %s\n"
+msgstr "Giá trị khoảng th�i gian không đúng: %s\n"
+
+#: sys-utils/cytune.c:198
+#, c-format
+msgid "Invalid set value: %s\n"
+msgstr "Giá trị đặt không đúng: %s\n"
+
+#: sys-utils/cytune.c:206
+#, c-format
+msgid "Invalid default value: %s\n"
+msgstr "Giá trị mặc định không đúng: %s\n"
+
+#: sys-utils/cytune.c:214
+#, c-format
+msgid "Invalid set time value: %s\n"
+msgstr "Giá trị đặt th�i gian không đúng: %s\n"
+
+#: sys-utils/cytune.c:222
+#, c-format
+msgid "Invalid default time value: %s\n"
+msgstr "Giá trị th�i gian mặc định không đúng: %s\n"
+
+#: sys-utils/cytune.c:239
+#, c-format
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"Sử dụng: %s [-q [-i khoảngth�igian]] ([-s giátrị]|[-S giátrị]) ([-t giátrị]|"
+"[-T giátrị]) [-g|-G] tậptin [tậptin...]\n"
+
+#: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
+#: sys-utils/cytune.c:340
+#, c-format
+msgid "Can't open %s: %s\n"
+msgstr "Không mở được %s: %s\n"
+
+#: sys-utils/cytune.c:258
+#, c-format
+msgid "Can't set %s to threshold %d: %s\n"
+msgstr "Không đặt được %s cho ngưỡng %d: %s\n"
+
+#: sys-utils/cytune.c:277
+#, c-format
+msgid "Can't set %s to time threshold %d: %s\n"
+msgstr "Không đặt được %s cho ngưỡng th�i gian %d: %s\n"
+
+#: sys-utils/cytune.c:295 sys-utils/cytune.c:352 sys-utils/cytune.c:383
+#, c-format
+msgid "Can't get threshold for %s: %s\n"
+msgstr "Không lấy được ngưỡng cho %s: %s\n"
+
+#: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
+#, c-format
+msgid "Can't get timeout for %s: %s\n"
+msgstr "Không lấy được th�i gian ch� cho %s: %s\n"
+
+#: sys-utils/cytune.c:307
+#, c-format
+msgid "%s: %ld current threshold and %ld current timeout\n"
+msgstr "%s: %ld ngưỡng hiện th�i và %ld th�i gian ch� hiện th�i\n"
+
+#: sys-utils/cytune.c:310
+#, c-format
+msgid "%s: %ld default threshold and %ld default timeout\n"
+msgstr "%s: %ld ngưỡng mặc định và %ld th�i gian ch� mặc định\n"
+
+#: sys-utils/cytune.c:328
+msgid "Can't set signal handler"
+msgstr "Không lấy được trình đi�u khiển tín hiệu"
+
+#: sys-utils/cytune.c:332 sys-utils/cytune.c:367
+msgid "gettimeofday failed"
+msgstr "gettimeofday không thành công"
+
+#: sys-utils/cytune.c:345 sys-utils/cytune.c:377
+#, c-format
+msgid "Can't issue CYGETMON on %s: %s\n"
+msgstr "Không CYGETMON được trên %s: %s\n"
+
+#: sys-utils/cytune.c:419
+#, c-format
+msgid ""
+"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ints, %lu/%lu kýtự; fifo: %lu thresh, %lu tmout, %lu max, %lu "
+"bâygi�\n"
+
+#: sys-utils/cytune.c:425
+#, c-format
+msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
+msgstr "   %f int/giây; %f rec, %f gửi (kýtự/giây)\n"
+
+#: sys-utils/cytune.c:430
+#, c-format
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ints, %lu kýtự; fifo: %lu thresh, %lu tmout, %lu max, %lu bâygi�\n"
+
+#: sys-utils/cytune.c:436
+#, c-format
+msgid "   %f int/sec; %f rec (char/sec)\n"
+msgstr "   %f int/giây; %f rec (kýtự/giây)\n"
+
+#: sys-utils/dmesg.c:56
+#, c-format
+msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
+msgstr "Sử dụng: %s [-c] [-n bậc] [ -s kíchthước_bộđệm]\n"
+
+#: sys-utils/flock.c:59
+#, c-format
+msgid "flock: unknown option, aborting.\n"
+msgstr "flock: tùy ch�n không rõ, đang thoát.\n"
+
+#: sys-utils/flock.c:77
+#, fuzzy, c-format
+msgid ""
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
+msgstr ""
+"Sử dụng câu lệnh flock [--shared | --timeout=?giây] têntậptin {arg arg...}\n"
+
+#: sys-utils/ipcrm.c:66
+#, c-format
+msgid "invalid id: %s\n"
+msgstr "id sai: %s\n"
+
+#: sys-utils/ipcrm.c:84
+#, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "không xóa b� được id %s (%s)\n"
+
+#: sys-utils/ipcrm.c:99
+#, c-format
+msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
+msgstr "không nên sử dụng: %s {shm | msg | sem} id ...\n"
+
+#: sys-utils/ipcrm.c:126
+#, c-format
+msgid "unknown resource type: %s\n"
+msgstr "dạng nguồn không rõ: %s\n"
+
+#: sys-utils/ipcrm.c:130
+#, c-format
+msgid "resource(s) deleted\n"
+msgstr "đã xóa (các) nguồn\n"
+
+#: sys-utils/ipcrm.c:140
+#, c-format
+msgid ""
+"usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+msgstr ""
+"sử dụng: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+
+#: sys-utils/ipcrm.c:181
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: tùy ch�n không cho phép -- %c\n"
+
+#: sys-utils/ipcrm.c:193
+#, c-format
+msgid "%s: illegal key (%s)\n"
+msgstr "%s: phím không cho phép (%s)\n"
+
+#: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
+msgid "permission denied for key"
+msgstr "không đủ quy�n hạn cho chìa khóa"
+
+#: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
+msgid "already removed key"
+msgstr "đã xóa chìa khoá"
+
+#: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
+msgid "invalid key"
+msgstr "chìa khóa không đúng"
+
+#: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
+msgid "unknown error in key"
+msgstr "lỗi không rõ trong chìa khóa"
+
+#: sys-utils/ipcrm.c:241
+msgid "permission denied for id"
+msgstr "không đủ quy�n hạn cho id"
+
+#: sys-utils/ipcrm.c:246
+msgid "invalid id"
+msgstr "id sai"
+
+#: sys-utils/ipcrm.c:251
+msgid "already removed id"
+msgstr "đã xóa id"
+
+#: sys-utils/ipcrm.c:256
+msgid "unknown error in id"
+msgstr "lỗi không rõ trong id"
+
+#: sys-utils/ipcrm.c:259
+#, c-format
+msgid "%s: %s (%s)\n"
+msgstr "%s: %s (%s)\n"
+
+#: sys-utils/ipcrm.c:267
+#, c-format
+msgid "%s: unknown argument: %s\n"
+msgstr "%s: tham số không rõ: %s\n"
+
+#: sys-utils/ipcs.c:121
+#, c-format
+msgid "usage : %s -asmq -tclup \n"
+msgstr "sử dụng : %s -asmq -tclup \n"
+
+#: sys-utils/ipcs.c:122
+#, c-format
+msgid "\t%s [-s -m -q] -i id\n"
+msgstr "\t%s [-s -m -q] -i id\n"
+
+#: sys-utils/ipcs.c:123
+#, c-format
+msgid "\t%s -h for help.\n"
+msgstr "\t%s -h để xem trợ giúp.\n"
+
+#: sys-utils/ipcs.c:129
+#, c-format
+msgid ""
+"%s provides information on ipc facilities for which you have read access.\n"
+msgstr ""
+"%s cung cấp thông tin v� phương tiện ipc cho những gì ngư�i dùng có truy cập "
+"đ�c.\n"
+
+#: sys-utils/ipcs.c:131
+#, c-format
+msgid ""
+"Resource Specification:\n"
+"\t-m : shared_mem\n"
+"\t-q : messages\n"
+msgstr ""
+"�ặc điểm nguồn:\n"
+"\t-m : nguồn_chiasẻ\n"
+"\t-q : tinnhắn\n"
+
+#: sys-utils/ipcs.c:132
+#, c-format
+msgid ""
+"\t-s : semaphores\n"
+"\t-a : all (default)\n"
+msgstr ""
+"\t-s : cột đèn hiệu\n"
+"\t-a : tất cả (mặc định)\n"
+
+#: sys-utils/ipcs.c:133
+#, c-format
+msgid ""
+"Output Format:\n"
+"\t-t : time\n"
+"\t-p : pid\n"
+"\t-c : creator\n"
+msgstr ""
+"�ịnh dạng kết quả đưa ra:\n"
+"\t-t : th�i gian\n"
+"\t-p : pid\n"
+"\t-c : creator\n"
+
+#: sys-utils/ipcs.c:134
+#, c-format
+msgid ""
+"\t-l : limits\n"
+"\t-u : summary\n"
+msgstr ""
+"\t-l : giới hạn\n"
+"\t-u : tổng kết\n"
+
+#: sys-utils/ipcs.c:135
+#, c-format
+msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgstr "-i id [-s -q -m] : chi tiết v� nguồn có tên id\n"
+
+#: sys-utils/ipcs.c:267
+#, c-format
+msgid "kernel not configured for shared memory\n"
+msgstr "nhân không cấu hình cho bộ nhớ chia sẻ\n"
+
+#: sys-utils/ipcs.c:273
+#, c-format
+msgid "------ Shared Memory Limits --------\n"
+msgstr "------ Giới hạn bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:278
+#, c-format
+msgid "max number of segments = %lu\n"
+msgstr "số đoạn lớn nhất = %lu\n"
+
+#: sys-utils/ipcs.c:280
+#, c-format
+msgid "max seg size (kbytes) = %lu\n"
+msgstr "kích thước đoạn lớn nhất (kbyte) = %lu\n"
+
+#: sys-utils/ipcs.c:282
+#, c-format
+msgid "max total shared memory (pages) = %lu\n"
+msgstr "tổng số bộ nhớ chia sẻ lớn nhất (tính theo trang) = %lu\n"
+
+#: sys-utils/ipcs.c:284
+#, c-format
+msgid "min seg size (bytes) = %lu\n"
+msgstr "kích thước đoạn nh� nhất (byte) = %lu\n"
+
+#: sys-utils/ipcs.c:289
+#, c-format
+msgid "------ Shared Memory Status --------\n"
+msgstr "------ Trạng thái bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:290
+#, c-format
+msgid "segments allocated %d\n"
+msgstr "%d đoạn đã phân phối\n"
+
+#: sys-utils/ipcs.c:291
+#, c-format
+msgid "pages allocated %ld\n"
+msgstr "%ld trang đã phân phối\n"
+
+#: sys-utils/ipcs.c:292
+#, c-format
+msgid "pages resident  %ld\n"
+msgstr "%ld trang nội trú\n"
+
+#: sys-utils/ipcs.c:293
+#, c-format
+msgid "pages swapped   %ld\n"
+msgstr "%ld trang đã đưa vào swap\n"
+
+#: sys-utils/ipcs.c:294
+#, c-format
+msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgstr "Hiệu suất swap: %ld lần thử\t %ld lần thành công\n"
+
+#: sys-utils/ipcs.c:299
+#, c-format
+msgid "------ Shared Memory Segment Creators/Owners --------\n"
+msgstr "------ Ngư�i tạo/Chủ sở hữu các đoạn của bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:420 sys-utils/ipcs.c:519
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427
+msgid "shmid"
+msgstr "shmid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:520 sys-utils/ipcs.c:538
+msgid "perms"
+msgstr "quy�n hạn"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "cuid"
+msgstr "cuid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "cgid"
+msgstr "cgid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "uid"
+msgstr "uid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:520
+msgid "gid"
+msgstr "gid"
+
+#: sys-utils/ipcs.c:305
+#, c-format
+msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
+msgstr "------ Gắn/B� gắn/Th�i gian thay đổi bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:306
+#, c-format
+msgid "%-10s %-10s %-20s %-20s %-20s\n"
+msgstr "%-10s %-10s %-20s %-20s %-20s\n"
+
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:427 sys-utils/ipcs.c:436 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:538
+msgid "owner"
+msgstr "chủ sở hữu"
+
+#: sys-utils/ipcs.c:307
+msgid "attached"
+msgstr "đã gắn"
+
+#: sys-utils/ipcs.c:307
+msgid "detached"
+msgstr "đã b� gắn"
+
+#: sys-utils/ipcs.c:308
+msgid "changed"
+msgstr "đã thay đổi"
+
+#: sys-utils/ipcs.c:312
+#, c-format
+msgid "------ Shared Memory Creator/Last-op --------\n"
+msgstr "------ Bộ nhớ chia sẻ Ngư�i tạo/Thao tác cuối --------\n"
+
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:531
+#, c-format
+msgid "%-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s\n"
+
+#: sys-utils/ipcs.c:314
+msgid "cpid"
+msgstr "cpid"
+
+#: sys-utils/ipcs.c:314
+msgid "lpid"
+msgstr "lpid"
+
+#: sys-utils/ipcs.c:318
+#, c-format
+msgid "------ Shared Memory Segments --------\n"
+msgstr "------ Các đoạn bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:319
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538
+msgid "key"
+msgstr "chìa khóa"
+
+#: sys-utils/ipcs.c:320
+msgid "bytes"
+msgstr "byte"
+
+#: sys-utils/ipcs.c:321
+msgid "nattch"
+msgstr "nattch"
+
+#: sys-utils/ipcs.c:321
+msgid "status"
+msgstr "trạng thái"
+
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:458 sys-utils/ipcs.c:460 sys-utils/ipcs.c:559
+#: sys-utils/ipcs.c:561 sys-utils/ipcs.c:563 sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:647 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:651 sys-utils/ipcs.c:675
+msgid "Not set"
+msgstr "Chưa đặt"
+
+#: sys-utils/ipcs.c:374
+msgid "dest"
+msgstr "đích"
+
+#: sys-utils/ipcs.c:375
+msgid "locked"
+msgstr "đã khóa"
+
+#: sys-utils/ipcs.c:395
+#, c-format
+msgid "kernel not configured for semaphores\n"
+msgstr "nhân không cấu hình cho đèn tín hiệu\n"
+
+#: sys-utils/ipcs.c:401
+#, c-format
+msgid "------ Semaphore Limits --------\n"
+msgstr "------ Giới hạn đèn tín hiệu --------\n"
+
+#: sys-utils/ipcs.c:405
+#, c-format
+msgid "max number of arrays = %d\n"
+msgstr "số dãy lớn nhất = %d\n"
+
+#: sys-utils/ipcs.c:406
+#, c-format
+msgid "max semaphores per array = %d\n"
+msgstr "số đèn hiện lớn nhất trên mỗi dãy = %d\n"
+
+#: sys-utils/ipcs.c:407
+#, c-format
+msgid "max semaphores system wide = %d\n"
+msgstr "số đèn hiện lớn nhất của cả hệ thống = %d\n"
+
+#: sys-utils/ipcs.c:408
+#, c-format
+msgid "max ops per semop call = %d\n"
+msgstr "số thao tác lớn nhất của mỗi l�i g�i đèn hiệu = %d\n"
+
+#: sys-utils/ipcs.c:409
+#, c-format
+msgid "semaphore max value = %d\n"
+msgstr "giá trị đèn hiệu lớn nhất = %d\n"
+
+#: sys-utils/ipcs.c:413
+#, c-format
+msgid "------ Semaphore Status --------\n"
+msgstr "------ Trạng thái đèn tín hiệu --------\n"
+
+#: sys-utils/ipcs.c:414
+#, c-format
+msgid "used arrays = %d\n"
+msgstr "dãy đã sử dụng = %d\n"
+
+#: sys-utils/ipcs.c:415
+#, c-format
+msgid "allocated semaphores = %d\n"
+msgstr "đèn tín hiệu đã phân phối = %d\n"
+
+#: sys-utils/ipcs.c:419
+#, c-format
+msgid "------ Semaphore Arrays Creators/Owners --------\n"
+msgstr "------ Ngư�i tạo/Chủ sở hữu dãy đèn hiệu --------\n"
+
+#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:436
+msgid "semid"
+msgstr "semid"
+
+#: sys-utils/ipcs.c:425
+#, c-format
+msgid "------ Shared Memory Operation/Change Times --------\n"
+msgstr "------ Thao tác/Th�i gian thay đổi bộ nhớ chia sẻ--------\n"
+
+#: sys-utils/ipcs.c:426
+#, c-format
+msgid "%-8s %-10s %-26.24s %-26.24s\n"
+msgstr "%-8s %-10s %-26.24s %-26.24s\n"
+
+#: sys-utils/ipcs.c:427
+msgid "last-op"
+msgstr "thao tác cuối cùng"
+
+#: sys-utils/ipcs.c:427
+msgid "last-changed"
+msgstr "thay đổi cuối cùng"
+
+#: sys-utils/ipcs.c:434
+#, c-format
+msgid "------ Semaphore Arrays --------\n"
+msgstr "------ Dãy đèn tín hiệu --------\n"
+
+#: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
+
+#: sys-utils/ipcs.c:437
+msgid "nsems"
+msgstr "nsems"
+
+#: sys-utils/ipcs.c:496
+#, c-format
+msgid "kernel not configured for message queues\n"
+msgstr "nhân không cấu hình cho hàng đợi tin nhắn\n"
+
+#: sys-utils/ipcs.c:504
+#, c-format
+msgid "------ Messages: Limits --------\n"
+msgstr "------ Tin nhắn: Giới hạn --------\n"
+
+#: sys-utils/ipcs.c:505
+#, c-format
+msgid "max queues system wide = %d\n"
+msgstr "số hàng đợi lớn nhất của hệ thống = %d\n"
+
+#: sys-utils/ipcs.c:506
+#, c-format
+msgid "max size of message (bytes) = %d\n"
+msgstr "kích thước lớn nhất của tin nhắn (theo byte) = %d\n"
+
+#: sys-utils/ipcs.c:507
+#, c-format
+msgid "default max size of queue (bytes) = %d\n"
+msgstr "kích thước mặc định lớn nhất của hàng đợi (byte) = %d\n"
+
+#: sys-utils/ipcs.c:511
+#, c-format
+msgid "------ Messages: Status --------\n"
+msgstr "------ Tin nhắn: Trạng thái --------\n"
+
+#: sys-utils/ipcs.c:512
+#, c-format
+msgid "allocated queues = %d\n"
+msgstr "hàng đợi đã phân phối = %d\n"
+
+#: sys-utils/ipcs.c:513
+#, c-format
+msgid "used headers = %d\n"
+msgstr "phần đầu đã sử dụng = %d\n"
+
+#: sys-utils/ipcs.c:514
+#, c-format
+msgid "used space = %d bytes\n"
+msgstr "không gian đã sử dụng = %d byte\n"
+
+#: sys-utils/ipcs.c:518
+#, c-format
+msgid "------ Message Queues: Creators/Owners --------\n"
+msgstr "------ Hàng đợi: Ngư�i tạo/Chủ sở hữu --------\n"
+
+#: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
+#: sys-utils/ipcs.c:538
+msgid "msqid"
+msgstr "msqid"
+
+#: sys-utils/ipcs.c:524
+#, c-format
+msgid "------ Message Queues Send/Recv/Change Times --------\n"
+msgstr "------ Hàng đợi tin nhắn Gửi/Nhận/Th�i gian thay đổi --------\n"
+
+#: sys-utils/ipcs.c:525
+#, c-format
+msgid "%-8s %-10s %-20s %-20s %-20s\n"
+msgstr "%-8s %-10s %-20s %-20s %-20s\n"
+
+#: sys-utils/ipcs.c:526
+msgid "send"
+msgstr "gá»­i"
+
+#: sys-utils/ipcs.c:526
+msgid "recv"
+msgstr "nhận"
+
+#: sys-utils/ipcs.c:526
+msgid "change"
+msgstr "thay đổi"
+
+#: sys-utils/ipcs.c:530
+#, c-format
+msgid "------ Message Queues PIDs --------\n"
+msgstr "------ PID của hàng đợi tin nhắn --------\n"
+
+#: sys-utils/ipcs.c:532
+msgid "lspid"
+msgstr "lspid"
+
+#: sys-utils/ipcs.c:532
+msgid "lrpid"
+msgstr "lrpid"
+
+#: sys-utils/ipcs.c:536
+#, c-format
+msgid "------ Message Queues --------\n"
+msgstr "------ Hàng đợi tin nhắn --------\n"
+
+#: sys-utils/ipcs.c:537
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+
+#: sys-utils/ipcs.c:539
+msgid "used-bytes"
+msgstr "byte đã dùng"
+
+#: sys-utils/ipcs.c:539
+msgid "messages"
+msgstr "tin nhắn"
+
+#: sys-utils/ipcs.c:607
+#, c-format
+msgid ""
+"\n"
+"Shared memory Segment shmid=%d\n"
+msgstr ""
+"\n"
+"shmid của một đoạn bộ nhớ chia sẻ =%d\n"
+
+#: sys-utils/ipcs.c:608
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+
+#: sys-utils/ipcs.c:610
+#, c-format
+msgid "mode=%#o\taccess_perms=%#o\n"
+msgstr "chế_độ=%#o\tquy�n_truy_cập=%#o\n"
+
+#: sys-utils/ipcs.c:612
+#, c-format
+msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+
+#: sys-utils/ipcs.c:615
+#, c-format
+msgid "att_time=%-26.24s\n"
+msgstr "att_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:617
+#, c-format
+msgid "det_time=%-26.24s\n"
+msgstr "det_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650
+#, c-format
+msgid "change_time=%-26.24s\n"
+msgstr "change_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:634
+#, c-format
+msgid ""
+"\n"
+"Message Queue msqid=%d\n"
+msgstr ""
+"\n"
+"msqid của hàng đợi tin nhắn=%d\n"
+
+#: sys-utils/ipcs.c:635
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tchế_độ=%#o\n"
+
+#: sys-utils/ipcs.c:637
+#, c-format
+msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+
+#: sys-utils/ipcs.c:646
+#, c-format
+msgid "send_time=%-26.24s\n"
+msgstr "send_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:648
+#, c-format
+msgid "rcv_time=%-26.24s\n"
+msgstr "rcv_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:668
+#, c-format
+msgid ""
+"\n"
+"Semaphore Array semid=%d\n"
+msgstr ""
+"\n"
+"semid của dãy đèn tín hiệu=%d\n"
+
+#: sys-utils/ipcs.c:669
+#, c-format
+msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+
+#: sys-utils/ipcs.c:671
+#, c-format
+msgid "mode=%#o, access_perms=%#o\n"
+msgstr "chế_độ=%#o, quy�n_truy_cập=%#o\n"
+
+#: sys-utils/ipcs.c:673
+#, c-format
+msgid "nsems = %ld\n"
+msgstr "nsems = %ld\n"
+
+#: sys-utils/ipcs.c:674
+#, c-format
+msgid "otime = %-26.24s\n"
+msgstr "otime = %-26.24s\n"
+
+#: sys-utils/ipcs.c:676
+#, c-format
+msgid "ctime = %-26.24s\n"
+msgstr "ctime = %-26.24s\n"
+
+#: sys-utils/ipcs.c:679
+msgid "semnum"
+msgstr "sốđèn"
+
+#: sys-utils/ipcs.c:679
+msgid "value"
+msgstr "giátrị"
+
+#: sys-utils/ipcs.c:679
+msgid "ncount"
+msgstr "ncount"
+
+#: sys-utils/ipcs.c:679
+msgid "zcount"
+msgstr "zcount"
+
+#: sys-utils/ipcs.c:679
+msgid "pid"
+msgstr "pid"
+
+#: sys-utils/rdev.c:69
+msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+msgstr "sử dụng: rdev [ -rv ] [ -o OFFSET ] [ HÌNHẢNH [ GI�TRỊ [ OFFSET ] ] ]"
+
+#: sys-utils/rdev.c:70
+msgid ""
+"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+"  rdev /dev/fd0  (hoặc rdev /linux, v.v...) hiển thị thiết bị ROOT hiện th�i"
+
+#: sys-utils/rdev.c:71
+msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+msgstr "  rdev /dev/fd0 /dev/hda2         đặt ROOT thành /dev/hda2"
+
+#: sys-utils/rdev.c:72
+msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+msgstr "  rdev -R /dev/fd0 1              đặt ROOTFLAGS (trạng thái chỉ đ�c)"
+
+#: sys-utils/rdev.c:73
+msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+msgstr "  rdev -r /dev/fd0 627            đặt kích thước RAMDISK"
+
+#: sys-utils/rdev.c:74
+msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+msgstr "  rdev -v /dev/fd0 1              đặt chế độ VIDEOMODE khởi động"
+
+#: sys-utils/rdev.c:75
+msgid "  rdev -o N ...                   use the byte offset N"
+msgstr "  -u, --unqote                  sử dụng bộ byte N"
+
+#: sys-utils/rdev.c:76
+msgid "  rootflags ...                   same as rdev -R"
+msgstr "  rootflags ...                   giống như rdev -R"
+
+#: sys-utils/rdev.c:77
+msgid "  ramsize ...                     same as rdev -r"
+msgstr "  ramsize ...                     giống như rdev -r"
+
+#: sys-utils/rdev.c:78
+msgid "  vidmode ...                     same as rdev -v"
+msgstr "  vidmode ...                     giống như rdev -v"
+
+#: sys-utils/rdev.c:79
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+"Chú ý: chế độ video là: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+
+#: sys-utils/rdev.c:80
+msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+msgstr "      hãy dùng -R 1 để gắn root chỉ đ�c, -R 0 để đ�c/ghi."
+
+#: sys-utils/rdev.c:247
+msgid "missing comma"
+msgstr "thiếu dấu phẩy"
+
+#: sys-utils/readprofile.c:72
+#, c-format
+msgid "out of memory"
+msgstr "không đủ bộ nhớ"
+
+#: sys-utils/readprofile.c:118
+#, c-format
+msgid ""
+"%s: Usage: \"%s [options]\n"
+"\t -m <mapfile>  (defaults: \"%s\" and\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-file> (default: \"%s\")\n"
+"\t -M <mult>     set the profiling multiplier to <mult>\n"
+"\t -i            print only info about the sampling step\n"
+"\t -v            print verbose data\n"
+"\t -a            print all symbols, even if count is 0\n"
+"\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
+"\t -r            reset all the counters (root only)\n"
+"\t -n            disable byte order auto-detection\n"
+"\t -V            print version and exit\n"
+msgstr ""
+"%s: Sử dụng: \"%s [tùy ch�n]\n"
+"\t -m <mapfile>  (mặc định: \"%s\" và\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-file> (mặc định: \"%s\")\n"
+"\t -M <mult>     đặt trình số nhân của xác lập thành <mult>\n"
+"\t -i            chỉ in ra thông tin v� bước thử\n"
+"\t -v            in dữ liệu chi tiết\n"
+"\t -a            in m�i ký tự, kể cả nếu số đếm là 0\n"
+"\t -b            in ra số đếm histogram-bin riêng\n"
+"\t -s            in ra số đếm riêng trong hàm\n"
+"\t -r            đặt lại tất cả số đếm (chỉ root)\n"
+"\t -n            tắt b� việc tự động tìm ra thứ tự byte\n"
+"\t -V            in ra phiên bản và thoát\n"
+
+#: sys-utils/readprofile.c:197
+#, c-format
+msgid "%s version %s\n"
+msgstr "%s phiên bản %s\n"
+
+#: sys-utils/readprofile.c:284
+#, c-format
+msgid "Sampling_step: %i\n"
+msgstr "Sampling_step: %i\n"
+
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
+#, c-format
+msgid "%s: %s(%i): wrong map line\n"
+msgstr "%s: %s(%i): sai dòng ánh xạ\n"
+
+#: sys-utils/readprofile.c:317
+#, c-format
+msgid "%s: can't find \"_stext\" in %s\n"
+msgstr "%s: không tìm thấy \"_stext\" trong %s\n"
+
+#: sys-utils/readprofile.c:343
+#, c-format
+msgid "%s: profile address out of range. Wrong map file?\n"
+msgstr "%s: địa chỉ của xác lập nằm ngoài phạm vi. Tập tin ánh xạ sai?\n"
+
+#: sys-utils/readprofile.c:401
+msgid "total"
+msgstr "tổng số"
+
+#: sys-utils/renice.c:68
+#, c-format
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr ""
+"sử dụng: renice mứcđộ_ưutiên [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] ngư�i "
+"dùng ]\n"
+
+#: sys-utils/renice.c:97
+#, c-format
+msgid "renice: %s: unknown user\n"
+msgstr "renice: %s: ngư�i dùng không biết\n"
+
+#: sys-utils/renice.c:105
+#, c-format
+msgid "renice: %s: bad value\n"
+msgstr "renice: %s: giá trị xấu\n"
+
+#: sys-utils/renice.c:123 sys-utils/renice.c:135
+msgid "getpriority"
+msgstr "getpriority"
+
+#: sys-utils/renice.c:128
+msgid "setpriority"
+msgstr "setpriority"
+
+#: sys-utils/renice.c:139
+#, c-format
+msgid "%d: old priority %d, new priority %d\n"
+msgstr "%d: mức độ ưu tiên cũ %d, mới %d\n"
+
+#: sys-utils/setsid.c:26
+#, c-format
+msgid "usage: %s program [arg ...]\n"
+msgstr "sử dụng: %s chương trình [arg ...]\n"
+
+#: sys-utils/tunelp.c:75
+#, c-format
+msgid ""
+"Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
+msgstr ""
+"Sử dụng: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
+
+#: sys-utils/tunelp.c:91
+msgid "malloc error"
+msgstr "lá»—i malloc"
+
+#: sys-utils/tunelp.c:103
+#, c-format
+msgid "%s: bad value\n"
+msgstr "%s: giá trị xấu\n"
+
+#: sys-utils/tunelp.c:242
+#, c-format
+msgid "%s: %s not an lp device.\n"
+msgstr "%s: %s không phải là thiết bị lp.\n"
+
+#: sys-utils/tunelp.c:263
+#, c-format
+msgid "%s status is %d"
+msgstr "trạng thái %s là %d"
+
+#: sys-utils/tunelp.c:264
+#, c-format
+msgid ", busy"
+msgstr ", bận"
+
+#: sys-utils/tunelp.c:265
+#, c-format
+msgid ", ready"
+msgstr ", sẵn sàng"
+
+#: sys-utils/tunelp.c:266
+#, c-format
+msgid ", out of paper"
+msgstr ", không đủ trang"
+
+#: sys-utils/tunelp.c:267
+#, c-format
+msgid ", on-line"
+msgstr ", trực tuyến"
+
+#: sys-utils/tunelp.c:268
+#, c-format
+msgid ", error"
+msgstr ", lá»—i"
+
+#: sys-utils/tunelp.c:285
+msgid "LPGETIRQ error"
+msgstr "lá»—i LPGETIRQ"
+
+#: sys-utils/tunelp.c:291
+#, c-format
+msgid "%s using IRQ %d\n"
+msgstr "%s đang dùng IRQ %d\n"
+
+#: sys-utils/tunelp.c:293
+#, c-format
+msgid "%s using polling\n"
+msgstr "%s đang dùng polling\n"
+
+#: text-utils/col.c:153
+#, c-format
+msgid "col: bad -l argument %s.\n"
+msgstr "col: tham số -l xấu %s.\n"
+
+#: text-utils/col.c:535
+#, c-format
+msgid "usage: col [-bfpx] [-l nline]\n"
+msgstr "sử dụng: col [-bfpx] [-l nline]\n"
+
+#: text-utils/col.c:541
+#, c-format
+msgid "col: write error.\n"
+msgstr "col: lá»—i ghi\n"
+
+#: text-utils/col.c:548
+#, c-format
+msgid "col: warning: can't back up %s.\n"
+msgstr "col: cảnh báo: không sao lưu được %s.\n"
+
+#: text-utils/col.c:549
+msgid "past first line"
+msgstr "đi qua dòng cuối cùng"
+
+#: text-utils/col.c:549
+msgid "-- line already flushed"
+msgstr "-- dòng đã san phẳng"
+
+#: text-utils/colcrt.c:97
+#, c-format
+msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
+msgstr "sử dụng: %s [ - ] [ -2 ] [ tập tin ... ]\n"
+
+#: text-utils/column.c:297
+msgid "line too long"
+msgstr "dòng quá dài"
+
+#: text-utils/column.c:374
+#, c-format
+msgid "usage: column [-tx] [-c columns] [file ...]\n"
+msgstr "sử dụng: column [-tx] [-c các-cột] [tập-tin ...]\n"
+
+#: text-utils/hexsyntax.c:82
+#, c-format
+msgid "hexdump: bad length value.\n"
+msgstr "hexdump: giá trị chi�u dài xấu.\n"
+
+#: text-utils/hexsyntax.c:93
+#, c-format
+msgid "hexdump: bad skip value.\n"
+msgstr "hexdump: giá trị nhảy qua (skip) xấu.\n"
+
+#: text-utils/hexsyntax.c:131
+#, c-format
+msgid ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcCdovx] [-e fmt] [-f tậptin_fmt] [-n chi�udài] [-s nhảyqua] "
+"[tậptin ...]\n"
+
+#: text-utils/more.c:216
+#, c-format
+msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "sử dụng: %s [-dflpcsu] [+sốdòng | +/pattern] tên1 tên2 ...\n"
+
+#: text-utils/more.c:439
+#, c-format
+msgid "%s: unknown option \"-%c\"\n"
+msgstr "%s: không rõ tùy ch�n \"-%c\"\n"
+
+#: text-utils/more.c:471
+#, c-format
+msgid ""
+"\n"
+"*** %s: directory ***\n"
+"\n"
+msgstr ""
+"\n"
+"*** %s: thư mục ***\n"
+"\n"
+
+#: text-utils/more.c:514
+#, c-format
+msgid ""
+"\n"
+"******** %s: Not a text file ********\n"
+"\n"
+msgstr ""
+"\n"
+"******** %s: Không phải tập tin văn bản ********\n"
+"\n"
+
+#: text-utils/more.c:617
+#, c-format
+msgid "[Use q or Q to quit]"
+msgstr "[Sử dụng q hoặc Q để thoát]"
+
+#: text-utils/more.c:709
+#, c-format
+msgid "--More--"
+msgstr "--Còn nữa--"
+
+#: text-utils/more.c:711
+#, c-format
+msgid "(Next file: %s)"
+msgstr "(Tập tin tiếp theo: %s)"
+
+#: text-utils/more.c:716
+#, c-format
+msgid "[Press space to continue, 'q' to quit.]"
+msgstr "[Nhấn phím trắng để tiếp tục, 'q' để thoát]"
+
+#: text-utils/more.c:1115
+#, c-format
+msgid "...back %d pages"
+msgstr "...quay lại %d trang"
+
+#: text-utils/more.c:1117
+msgid "...back 1 page"
+msgstr "...quay lại 1 trang"
+
+#: text-utils/more.c:1160
+msgid "...skipping one line"
+msgstr "...b� qua một dòng"
+
+#: text-utils/more.c:1162
+#, c-format
+msgid "...skipping %d lines"
+msgstr "...b� qua %d dòng"
+
+#: text-utils/more.c:1199
+msgid ""
+"\n"
+"***Back***\n"
+"\n"
+msgstr ""
+"\n"
+"***Quay lại***\n"
+"\n"
+
+#: text-utils/more.c:1237
+msgid ""
+"\n"
+"Most commands optionally preceded by integer argument k.  Defaults in "
+"brackets.\n"
+"Star (*) indicates argument becomes new default.\n"
+msgstr ""
+"\n"
+"Có thể thêm một tham số số nguyên vào trước hầu hết các câu lệnh.  Mặc định "
+"đặttrong dấu ngoặc đơn.\n"
+"Dấu sao (*) cho biết tham số sẽ thành mặc định mới.\n"
+
+#: text-utils/more.c:1244
+msgid ""
+"<space>                 Display next k lines of text [current screen size]\n"
+"z                       Display next k lines of text [current screen size]*\n"
+"<return>                Display next k lines of text [1]*\n"
+"d or ctrl-D             Scroll k lines [current scroll size, initially 11]*\n"
+"q or Q or <interrupt>   Exit from more\n"
+"s                       Skip forward k lines of text [1]\n"
+"f                       Skip forward k screenfuls of text [1]\n"
+"b or ctrl-B             Skip backwards k screenfuls of text [1]\n"
+"'                       Go to place where previous search started\n"
+"=                       Display current line number\n"
+"/<regular expression>   Search for kth occurrence of regular expression [1]\n"
+"n                       Search for kth occurrence of last r.e [1]\n"
+"!<cmd> or :!<cmd>       Execute <cmd> in a subshell\n"
+"v                       Start up /usr/bin/vi at current line\n"
+"ctrl-L                  Redraw screen\n"
+":n                      Go to kth next file [1]\n"
+":p                      Go to kth previous file [1]\n"
+":f                      Display current file name and line number\n"
+".                       Repeat previous command\n"
+msgstr ""
+"<space>                 Hiện k dòng văn bản tiếp theo [kích thước màn hình "
+"hiện th�i]\n"
+"z                       Hiển thị k dòng văn bản tiếp theo [kích thước màn "
+"hình hiện th�i]*\n"
+"<return>                Hiển thị k dòng văn bản tiếp theo [1]*\n"
+"d hoặc ctrl-D             Cuộn k dòng [kích thước cuộn hiện th�i, ban đầu là "
+"11]*\n"
+"q hoặc Q hoặc <interrupt>   Thoát kh�i more\n"
+"s                       B� qua k dòng văn bản [1]\n"
+"f                       B� qua k màn hình văn bản [1]\n"
+"b hoặc ctrl-B             Nhảy ngược lại k màn hình văn bản [1]\n"
+"'                       �i tới nơi trước khi bắt đầu tìm kiếm\n"
+"=                       Hiển thị số thứ tự dòng hiện th�i\n"
+"/<biểu thức chính quy>   Tìm kiếm lần xuất hiện thứ k của biểu thức [1]\n"
+"n                       Tìm kiếm lần xuất hiện thứ k của biểu thức cuối cùng "
+"[1]\n"
+"!<cmd> hoặc :!<cmd>       Thực hiện <cmd> trong một shell con\n"
+"v                       Chạy /usr/bin/vi tại dòng hiện th�i\n"
+"ctrl-L                  Vẽ lại màn hình\n"
+":n                      �i tới tập tin thứ k tiếp theo [1]\n"
+":p                      �i tới tập tin thứ k phía trước [1]\n"
+":f                      Hiển thị tên tập tin hiện th�i và số thứ tự dòng\n"
+".                       Lặp lại câu lệnh vừa thực hiện\n"
+
+#: text-utils/more.c:1313 text-utils/more.c:1318
+#, c-format
+msgid "[Press 'h' for instructions.]"
+msgstr "[Hãy nhấn 'h' để xem chỉ dẫn.]"
+
+#: text-utils/more.c:1352
+#, c-format
+msgid "\"%s\" line %d"
+msgstr "\"%s\" dòng %d"
+
+#: text-utils/more.c:1354
+#, c-format
+msgid "[Not a file] line %d"
+msgstr "[Không phải tập tin] dòng %d"
+
+#: text-utils/more.c:1438
+msgid "  Overflow\n"
+msgstr "  Bị tràn\n"
+
+#: text-utils/more.c:1485
+msgid "...skipping\n"
+msgstr "...b� qua\n"
+
+#: text-utils/more.c:1514
+msgid "Regular expression botch"
+msgstr "Biểu thức chính quy không đẹp"
+
+#: text-utils/more.c:1526
+msgid ""
+"\n"
+"Pattern not found\n"
+msgstr ""
+"\n"
+"Không tìm thấy mẫu tìm kiếm\n"
+
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
+msgid "Pattern not found"
+msgstr "Không tìm thấy mẫu tìm kiếm"
+
+#: text-utils/more.c:1590
+msgid "can't fork\n"
+msgstr "không phân nhánh được\n"
+
+#: text-utils/more.c:1629
+msgid ""
+"\n"
+"...Skipping "
+msgstr ""
+"\n"
+"...B� qua "
+
+#: text-utils/more.c:1633
+msgid "...Skipping to file "
+msgstr "...Nhảy tới tập tin "
+
+#: text-utils/more.c:1635
+msgid "...Skipping back to file "
+msgstr "...Nhảy quay lại tập tin "
+
+#: text-utils/more.c:1913
+msgid "Line too long"
+msgstr "Dòng quá dài"
+
+#: text-utils/more.c:1956
+msgid "No previous command to substitute for"
+msgstr "Không có câu lệnh ngay trước để thay thế cho"
+
+#: text-utils/odsyntax.c:130
+#, c-format
+msgid "od: od(1) has been deprecated for hexdump(1).\n"
+msgstr "od: od(1) không tương thích cho hexdump(1).\n"
+
+#: text-utils/odsyntax.c:133
+#, c-format
+msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
+msgstr "od: tính tương thích với hexdump(1) không hỗ trợ tùy ch�n -%c %s\n"
+
+#: text-utils/odsyntax.c:134
+msgid "; see strings(1)."
+msgstr "; hãy xem strings(1)."
+
+#: text-utils/parse.c:63
+#, c-format
+msgid "hexdump: can't read %s.\n"
+msgstr "hexdump: không đ�c được %s.\n"
+
+#: text-utils/parse.c:68
+#, c-format
+msgid "hexdump: line too long.\n"
+msgstr "hexdump: dòng quá dài.\n"
+
+#: text-utils/parse.c:401
+#, c-format
+msgid "hexdump: byte count with multiple conversion characters.\n"
+msgstr "hexdump: số đếm byte với các ký tự đa chuyển đổi.\n"
+
+#: text-utils/parse.c:483
+#, c-format
+msgid "hexdump: bad byte count for conversion character %s.\n"
+msgstr "hexdump: số đếm byte xấu cho ký tự chuyển đổi %s.\n"
+
+#: text-utils/parse.c:490
+#, c-format
+msgid "hexdump: %%s requires a precision or a byte count.\n"
+msgstr "hexdump: %%s yêu cầu sự chính xác hoặc một số đếm byte.\n"
+
+#: text-utils/parse.c:496
+#, c-format
+msgid "hexdump: bad format {%s}\n"
+msgstr "hexdump: định dạng xấu {%s}\n"
+
+#: text-utils/parse.c:502
+#, c-format
+msgid "hexdump: bad conversion character %%%s.\n"
+msgstr "hexdump: ký tự chuyển đổi xấu %%%s.\n"
+
+#: text-utils/pg.c:237
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+"%s: Sử dụng: %s [-số] [-p chuỗi] [-cefnrs] [+dòng] [+/pattern/] "
+"[các_tậptin]\n"
+
+#: text-utils/pg.c:246
+#, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "%s: tùy ch�n yêu cầu một tham số -- %s\n"
+
+#: text-utils/pg.c:254
+#, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: tùy ch�n không cho phép -- %s\n"
+
+#: text-utils/pg.c:371
+msgid "...skipping forward\n"
+msgstr "...nhảy v� trước\n"
+
+#: text-utils/pg.c:373
+msgid "...skipping backward\n"
+msgstr "...nhảy quay lại\n"
+
+#: text-utils/pg.c:395
+msgid "No next file"
+msgstr "Không có tập tin tiếp theo"
+
+#: text-utils/pg.c:399
+msgid "No previous file"
+msgstr "Không có tập tin trước"
+
+#: text-utils/pg.c:929
+#, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: Lỗi đ�c từ tập tin %s\n"
+
+#: text-utils/pg.c:935
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr "%s: EOF (Kết thúc) không mong đợi trong tập tin %s\n"
+
+#: text-utils/pg.c:938
+#, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: Lỗi không rõ trong tập tin %s\n"
+
+#: text-utils/pg.c:1033
+#, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: Không tạo được tập tin tạm th�i tempfile\n"
+
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
+msgid "RE error: "
+msgstr "Lá»—i RE: "
+
+#: text-utils/pg.c:1199
+msgid "(EOF)"
+msgstr "(Kết thúc tập tin)"
+
+#: text-utils/pg.c:1225
+msgid "No remembered search string"
+msgstr "Không có chuỗi tìm kiếm ghi nhớ nào"
+
+#: text-utils/pg.c:1308
+msgid "Cannot open "
+msgstr "Không mở được"
+
+#: text-utils/pg.c:1356
+msgid "saved"
+msgstr "đã ghi"
+
+#: text-utils/pg.c:1463
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ": !câulệnh không cho phép trong chế độ rflag.\n"
+
+#: text-utils/pg.c:1495
+msgid "fork() failed, try again later\n"
+msgstr "fork() không thành công, hãy thử lại sau\n"
+
+#: text-utils/pg.c:1700
+msgid "(Next file: "
+msgstr "(Tập tin tiếp theo: "
+
+#: text-utils/rev.c:113
+#, c-format
+msgid "Unable to allocate bufferspace\n"
+msgstr "Không thể phân phối không gian bộ đệm\n"
+
+#: text-utils/rev.c:156
+#, c-format
+msgid "usage: rev [file ...]\n"
+msgstr "sử dụng: rev [tậptin ...]\n"
+
+#: text-utils/tailf.c:53 text-utils/tailf.c:105
+#, c-format
+msgid "Cannot open \"%s\" for read\n"
+msgstr "Không mở được \"%s\" để đ�c\n"
+
+#: text-utils/tailf.c:93
+#, c-format
+msgid "Usage: tailf logfile\n"
+msgstr "Sử dụng: tailf tậptin_sựkiện\n"
+
+#: text-utils/ul.c:141
+#, c-format
+msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
+msgstr "sử dụng: %s [ -i ] [ -tTerm ] tậptin...\n"
+
+#: text-utils/ul.c:152
+#, c-format
+msgid "trouble reading terminfo"
+msgstr "có vấn đ� khi đ�c terminfo"
+
+#: text-utils/ul.c:242
+#, c-format
+msgid "Unknown escape sequence in input: %o, %o\n"
+msgstr "Chuỗi thoát không rõ trong dữ liệu vào: %o, %o\n"
+
+#: text-utils/ul.c:425
+#, c-format
+msgid "Unable to allocate buffer.\n"
+msgstr "Không phân phối được bộ đệm.\n"
+
+#: text-utils/ul.c:586
+#, c-format
+msgid "Input line too long.\n"
+msgstr "Dòng nhập vào quá dài.\n"
+
+#: text-utils/ul.c:599
+#, c-format
+msgid "Out of memory when growing buffer.\n"
+msgstr "Tràn bộ nhớ khi tăng buffer.\n"
+
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Số sai: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Lỗi cú pháp: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Không có bộ tham số như vậy: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] dev name\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] dev\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] dev\n"
+
+#~ msgid "version"
+#~ msgstr "phiên bản"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "không mở được /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "không đ�c được dữ liệu xác suất từ /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "không mở được %s để đ�c"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "không stat(%s) được"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s không có chế độ tập tin đúng"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "không đ�c được dữ liệu từ %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "�ã óc quá nhi�u ngư�i dùng đăng nhập.\n"
+#~ "Hãy thử lại sau.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Bạn đang chạy quá nhi�u tiến trình.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Mật khẩu phải có gồm nhất 6 ký tự, hãy thử lại.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Mật khẩu phải gồm những ký tự của hai nhóm sau:  các chữ cái\n"
+#~ "thư�ng và hoa; các chữ số và các ký tự không phải chữ cái và số.\n"
+#~ "Hãy xem passwd(1) để biết thêm thông tin.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Không thể dùng lại mật khẩu cũ.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "�ừng sử dụng những thứ như tên ngư�i dùng làm mật khẩu!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "�ừng sử dụng những thứ như tên thật làm mật khẩu!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Sử dụng: passwd [tên-ngư�i-dùng [mật-khẩu]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Chỉ có root mới có thể sử dụng các dạng một và hai tham số.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Sử dụng: passwd [-foqsvV] [ngư�i-dùng [mật-khẩu]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Không thực hiện (exec) được %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Không tìm thấy tên đăng nhập"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Chỉ có root mới thay đổi được mật khẩu cho ngư�i dùng khác.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Quá nhi�u tham số.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Không tìm thấy tên ngư�i dùng. `%s' là một ngư�i dùng thật sự?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Rất tiếc, chương trình chỉ có thể thay đổi mật khẩu nội bộ. Hãy dùng "
+#~ "yppasswd để thay thế."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID và tên ngư�i dùng không tương ứng, mạo danh!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "�ang thay đổi mật khẩu cho %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Hãy nhập mật khẩu cũ: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Mật khẩu không đúng, mạo danh."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Hãy nhập mật khẩu mới: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Mật khẩu chưa thay đổi."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Hãy nhập lại mật khẩu mới: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Hai lần nhập mật khẩu không trùng nhau. Mật khẩu chưa thay đổi."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "Mật khẩu chưa thay đổi, ngư�i dùng %s."
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "MẬT KHẨU ROOT �à THAY �ỔI"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "mật khẩu thay đổi bởi root, ngư�i dùng %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "đang g�i setpwnam để đặt mật khẩu.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Mật khẩu *CHƯA* thay đổi.  Hãy thử lại sau.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Mật khẩu chưa thay đổi.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: phiên bản này biên dịch không có hỗ trợ cho `nfs'"
diff --git a/rescuept/README b/rescuept/README
deleted file mode 100644
index 9009bff59..000000000
--- a/rescuept/README
+++ /dev/null
@@ -1,107 +0,0 @@
-As far as I now know, there are four utilities that attempt to
-assist in recovering a lost partition table, or a partition
-that was deleted by mistake.
-
-(i) findsuper is a small utility that finds blocks with the ext2
-superblock signature, and prints out location and some info.
-It is in the non-installed part of the e2progs distribution.
-
-(ii) rescuept is a utility that recognizes ext2 superblocks,
-FAT partitions, swap partitions, and extended partition tables;
-it may also recognize BSD disklabels and Unixware 7 partitions.
-It prints out information that is suitable as input to sfdisk
-to reconstruct the partition table.
-It is in the non-installed part of the util-linux distribution.
-
-(iii) fixdisktable (http://bmrc.berkeley.edu/people/chaffee/fat32.html)
-is a utility that handles ext2, FAT, NTFS, ufs, BSD disklabels
-(but not yet old Linux swap partitions); it actually will rewrite
-the partition table, if you give it permission.
-
-(iv) gpart (http://home.pages.de/~michab/gpart/) is a utility
-that handles ext2, FAT, Linux swap, HPFS, NTFS, FreeBSD and
-Solaris/x86 disklabels, minix, reiser fs; it prints a proposed
-contents for the primary partition table, and is well-documented.
-
-
-
-The current directory contains rescuept.
-I would never have written it had I known about fixdisktable
-and gpart. However, now that it exists I find several situations
-that are handled by rescuept and not by any of the others,
-so let it be for the moment. 
-
-
-
-
-
-
-How do you get your partition table back?
-The easy way - if you had been smart you would have done
-	# sfdisk -d /dev/xxx > xxx.pt
-before the disaster, where xxx.pt lives on some other disk
-or is printed on a piece of paper and taped to the wall. Now
-	# sfdisk /dev/xxx < xxx.pt
-will restore the partition table.
-
-In the absence of such good information, try each of the above
-utilities to get an idea of where your partitions were.
-Since gpart is the most elaborate one, it may be your best bet.
-
-Note that if you in the course of history have deleted some partition
-and created something else on the same spot, then there will often
-be traces of both, and these utilities may easily retrieve outdated
-information.
-
-
-If you think you found a partition, make a primary partition entry
-in the partition table, and try to mount the partition.
-Note that some utilities count sectors the DOS way (starting with 1)
-while most do it right (starting with 0).
-
-
-Report successes and failures of rescuept or any of the others
-to aeb@cwi.nl. (It may well be that rescuept ought to be replaced
-by gpart.)
-
-
-
-Comments:
------
-From: Nix <nix-kernel@vger.rutgers.edu>
-Subject: Re: [OFFTOPIC] Searching for filesystem locator
-Date:   Sun, 9 May 1999 20:26:16 +0100 (BST)
-
-> (iii) fixdisktable
-
-I've just tried this but it appears to suffer from a 2^31-sectors problem.
-
-> (iv) gpart
-
-... but this proved a godsend.
------
-From: Chris L. Mason <cmason@unixzone.com>
-Subject: All hail rescuept!
-Date: Fri, 27 Aug 1999 22:58:24 -0400
-
-..rescuept got me out of a real jam!
-I tried fixdisktable without any luck.
------
-From: Osman <osman@Cable.EU.org>
-Subject: Re: rescuept
-Date: Thu, 26 Aug 1999 16:24:40 +0200 (CEST)
-
-Ok, This is what I tried:
-
-"./rescuept /dev/sdc > detection.txt"
-"cat detection.txt | sfdisk -f /dev/sdc"
-
-The "-f" was to force it because sfdisk didn't like the partitioning,
-whoehaha...
-After carefully looking at the data in "detection.txt",
-I remembered that I had created the table with the "dos compatibility"
-flag turned off. That gave me 31 sectors back at that time...
-Well after that I mounted the ext2 partition read-only and it looked
-recovered!
-Wowy !!!!
------
diff --git a/rescuept/rescuept.c b/rescuept/rescuept.c
deleted file mode 100644
index 95e5b9e92..000000000
--- a/rescuept/rescuept.c
+++ /dev/null
@@ -1,759 +0,0 @@
-/*
- * rescuept - Andries Brouwer - aeb@cwi.nl - 1999
- *
- * This may be distributed under the GPL.
- *
- * call: rescuept /dev/xxx
- *
- * The output is a proposed partition table, in the
- * form of input to sfdisk. Typical use:
- *
- *	./rescuept /dev/xxx > xxx.pt
- * now look at xxx.pt to see whether it resembles what
- * you expected, and possibly edit the partition types;
- * if you are satisfied, then
- *	sfdisk /dev/xxx < xxx.pt
- * will restore your partition table. If you are cautious, use
- *	sfdisk /dev/xxx -O xxx.old < xxx.pt
- * so that the original state can be retrieved using
- *	sfdisk /dev/xxx -I xxx.old
- *
- * Here xxx stands for hda or hdb or sda or sdb or ... 
- */
-#include <stdio.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-
-#ifndef BLKGETSIZE
-#define BLKGETSIZE _IO(0x12,96)
-#endif
-
-char *progname;
-char *device;
-
-#define MAXPARTITIONS	100
-
-#define MAXPAGESZ	65536
-
-#define BUFSZ	1024000
-#define BUFSECS	(BUFSZ/512)
-char buf[BUFSZ];
-int bufstart = -1;
-
-typedef unsigned int uint32;
-typedef int sint32;
-typedef unsigned short uint16;
-typedef short sint16;
-typedef unsigned char uchar;
-
-void read_sectors(int fd, char *buf, int sectornr, int sectorct) {
-	extern long long llseek(int fd, long long offset, int whence);
-	long long offset;
-	int n;
-
-	offset = sectornr;
-	offset *= 512;
-	if (llseek(fd, offset, SEEK_SET) != offset) {
-		fprintf(stderr, "%s: llseek error\n", progname);
-		exit(1);
-	}
-	n = read(fd, buf, sectorct*512);
-	if (n != sectorct*512) {
-		if (n == -1)
-			perror("read");
-		fprintf(stderr, "%s: error reading sectors %d-%d\n",
-			progname, sectornr, sectornr+sectorct-1);
-		exit(1);
-	}
-}
-
-
-/*
- * Partition table stuff
- */
-
-struct partition {
-    unsigned char bootable;		/* 0 or 0x80 */
-    uchar begin_chs[3];
-    unsigned char sys_type;
-    uchar end_chs[3];
-    unsigned int start_sect;		/* starting sector counting from 0 */
-    unsigned int nr_sects;		/* nr of sectors in partition */
-};
-
-int
-is_extended(unsigned char sys_type) {
-	return (sys_type == 0x5 || sys_type == 0xf || sys_type == 0x85);
-}
-
-/*
- * List of (extended) partition table sectors found
- */
-struct epts {
-	int secno;
-	char pt4[64];
-} epts[MAXPARTITIONS];
-int eptsct;
-
-void addepts(int secno, char *data) {
-	if (eptsct >= MAXPARTITIONS)
-		return;		/* ignore */
-	epts[eptsct].secno = secno;
-	memcpy(epts[eptsct].pt4, data+512-66, 64);
-	eptsct++;
-}
-
-/*
- * List of guessed partitions
- */
-struct pt {
-	int pno;
-	int start;
-	int size;
-	unsigned char type;
-} pts[MAXPARTITIONS];
-int partno;
-
-void addpart(int start, int size, unsigned char type) {
-	if (partno >= MAXPARTITIONS)
-		return;		/* ignore */
-	pts[partno].start = start;
-	pts[partno].size = size;
-	pts[partno].type = type;
-	partno++;
-}
-
-void outparts() {
-	int i;
-
-	for(i=0; i<partno; i++)
-		printf("%s%d : start=%9d, size=%8d, Id=%2x\n",
-		       device, pts[i].pno,
-		       pts[i].start, pts[i].size, pts[i].type);
-}
-
-void outmsg(char *msg, int start, int nextstart, unsigned char type) {
-	printf("# %5d MB %16s (type %2x): sectors %9d-%9d\n",
-	       ((nextstart-start)+1024)/2048, msg, type, start, nextstart-1);
-}
-
-int
-create_extended_partition(int fd, int secno, int size) {
-	int sec = secno;
-	int cursec = secno;
-	int pno = partno;	/* number of extd partition */
-	int ei = eptsct-1;
-	unsigned char type = 0x5;
-	int lastseen = secno;
-	int ok = 0;
-
-	if (epts[ei].secno != secno) {
-		fprintf(stderr, "%s: program bug\n", progname);
-		exit(1);
-	}
-
-	outmsg("candidate ext pt", secno, secno+1, type);
-	addpart(secno, 1, type);		/* size to be filled in later */
-	
-	while(1) {
-		char buf[512];
-		struct partition *p1, *p2, *pr, *pe;
-		p1 = (struct partition *)(& epts[ei].pt4[0]);
-		p2 = (struct partition *)(& epts[ei].pt4[16]);
-		/* for the time being we just ignore the rest */
-
-		if (is_extended(p1->sys_type)) {
-			pr = p2;
-			pe = p1;
-		} else if (is_extended(p2->sys_type)) {
-			pr = p1;
-			pe = p2;
-		} else if (p1->sys_type == 0) {
-			pr = p2;
-			pe = 0;
-		} else if (p2->sys_type == 0) {
-			pr = p1;
-			pe = 0;
-		} else
-			break;
-
-		/* first handle the real partition, if any */
-		if (pr->sys_type != 0) {
-			int ss = cursec + pr->start_sect;
-			int es = ss + pr->nr_sects;
-			outmsg("found in ept", ss, es, pr->sys_type);
-			addpart(ss, pr->nr_sects, pr->sys_type);
-			if (lastseen < es - 1)
-				lastseen = es - 1;
-			if (lastseen >= size)
-				break;
-		}
-
-
-		/* then the extended link */
-
-		if (!pe) {
-			ok = 1;
-			break;
-		}
-		type = pe->sys_type;
-		cursec = sec + pe->start_sect;
-		if (cursec >= size)
-			break;
-		read_sectors(fd, buf, cursec, 1);
-		addepts(cursec, buf);
-		ei = eptsct-1;
-	}
-
-	if (!ok || lastseen == secno) {
-		printf("# retracted\n");
-		partno = pno;
-		return 0;
-	}
-
-	pts[pno].type = type;
-	pts[pno].size = lastseen+1-secno;
-	outmsg("extended part ok", secno, lastseen+1, type);
-	return lastseen;
-}
-			
-		
-
-/*
- * Recognize an ext2 superblock
- */
-#define EXT2_SUPER_MAGIC	0xEF53
-
-struct ext2_super_block {
-	uint32  s_inodes_count;		 /* 0: Inodes count */
-	uint32  s_blocks_count;		 /* 4: Blocks count */
-	uint32  s_r_blocks_count;	 /* 8: Reserved blocks count */
-	uint32  s_free_blocks_count;	 /* 12: Free blocks count */
-	uint32  s_free_inodes_count;	 /* 16: Free inodes count */
-	uint32  s_first_data_block;	 /* 20: First Data Block */
-	uint32  s_log_block_size;	 /* 24: Block size */
-	sint32  s_log_frag_size;	 /* 28: Fragment size */
-	uint32  s_blocks_per_group;	 /* 32: # Blocks per group */
-	uint32  s_frags_per_group;	 /* 36: # Fragments per group */
-	uint32  s_inodes_per_group;	 /* 40: # Inodes per group */
-	uint32  s_mtime;		 /* 44: Mount time */
-	uint32  s_wtime;		 /* 48: Write time */
-	uint16  s_mnt_count;	   	 /* 52: Mount count */
-	sint16  s_max_mnt_count;	 /* 54: Maximal mount count */
-	uint16  s_magic;		 /* 56: Magic signature */
-	uint16  s_state;		 /* 58: File system state */
-	uint16  s_errors;	         /* 60: Behaviour when detecting errors */
-	uint16  s_minor_rev_level;	 /* 62: minor revision level */
-	uint32  s_lastcheck;	         /* 64: time of last check */
-	uint32  s_checkinterval;	 /* 68: max. time between checks */
-	uint32  s_creator_os;	         /* 72: OS */
-	uint32  s_rev_level;	         /* 76: Revision level */
-	uint16  s_def_resuid;	  	 /* 80: Default uid for reserved blocks */
-	uint16  s_def_resgid;	  	 /* 82: Default gid for reserved blocks */
-
-	/* more stuff in later versions - especially s_block_group_nr is useful */
-	uint32	s_first_ino;		 /* 84: First non-reserved inode */
-	uint16  s_inode_size;		 /* 88: size of inode structure */
-	uint16	s_block_group_nr;	 /* 90: block group # of this superblock */
-	uint32	s_feature_compat;	 /* 92: compatible feature set */
-	uint32	s_feature_incompat;	 /* 96: incompatible feature set */
-	uint32	s_feature_ro_compat;	 /* 100: readonly-compatible feature set */
-	uchar	s_uuid[16];		 /* 104: 128-bit uuid for volume */
-	char	s_volume_name[16];	 /* 120: volume name */
-	char	s_last_mounted[64];	 /* 136: directory where last mounted */
-	uint32	s_algorithm_usage_bitmap;/* 200: For compression */
-	uchar	s_prealloc_blocks;	 /* 204: Nr of blocks to try to preallocate*/
-	uchar	s_prealloc_dir_blocks;	 /* 205: Nr to preallocate for dirs */
-	uchar	s_reserved[818];	 /* 206-1023 */
-};
-
-/*
- * Heuristic to weed out false alarms for ext2 superblocks.
- * Recompile this after 2005, of if you destroy things that
- * have not been written the past ten years.
- */
-#define YEAR (60*60*24*365)
-#define LOWERLIMIT (1992-1970)*YEAR
-#define UPPERLIMIT (2005-1970)*YEAR
-int
-is_time(uint32 t) {
-	return (t >= LOWERLIMIT && t <= UPPERLIMIT);
-}
-
-int
-is_ztime(uint32 t) {
-	return (t == 0 || (t >= LOWERLIMIT && t <= UPPERLIMIT));
-}
-
-/*
- * Recognize a FAT filesystem
- */
-
-struct fat_boot_sector_start {
-	uchar   jump_code[3];   /* 0: Bootstrap short or near jump */
-				/* usually jump code (e.g. eb 3e or eb 58) + nop (0x90) */
-	uchar   system_id[8];   /* 3: OEM Name */
-				/* fat16: MSDOS5.0 or MSWIN4.0 or ... */
-				/* fat32: MSWIN4.1 (=W95 OSR2) */
-	/* BIOS Parameter Block (BPB) */
-	uchar   sector_size[2]; /* 11: bytes/sector (usually 512 or 2048) */
-	uchar   cluster_size;   /* 13: sectors/cluster (a power of two in 1..128) */
-	uint16  reserved;       /* 14: reserved sectors (I see 1 for FAT16, 17 for FAT32) */
-				/* The # of sectors preceding the first FAT,
-				   including the boot sector, so at least 1 */
-	uchar   fats;	  	/* 16: # of copies of FAT (usually 2) */
-	uchar   dir_entries[2]; /* 17: max # of root directory entries (n/a for FAT32) */
-				/* (usually 512; 0 for FAT32) */
-	uchar   sectors[2];     /* 19: total # of sectors (in <32MB partn) or 0 */
-	uchar   media;	 	/* 21: media code (0xf8 for hard disks) */
-	uint16  fat_length;     /* 22: sectors/FAT (n/a: 0 for FAT32) */
-	uint16  secs_track;     /* 24: S = # sectors/track (in 1..63) */
-	uint16  heads;	 	/* 26: H = # of heads (in 1..255) */
-	uint32  hidden;		/* 28: # of hidden sectors in partition, before boot sector */
-				/* (offset from cyl boundary - often equal to S) */
-	uint32  total_sect;     /* 32: # of sectors (if sectors == 0) */
-};
-
-/* Media descriptor byte:
-   f8	hard disk
-   Floppy types:
-   f0   3.5"	36/2/80 2880k
-   f0	3.5"	18/2/80	1440k
-   f9	3.5"	9/2/80	720k
-   f9	5.25"	15/2/80	1200k
-   fa	both	9/1/80	320k
-   fb	both	9/2/80	640k
-   fc	5.25"	9/1/40	180k
-   fd	5.25"	9/2/40	360k
-   fe	5.25"	8/1/40	160k
-   ff	5.25"	8/2/40	320k
-   Conclusion: this byte does not differentiate between 3.5" and 5.25",
-   it does not give the capacity or the number of sectors per track.
-   However, maybe C and H can be derived.
-*/
-
-struct fat_boot_sector_middle { /* offset 36-61 for FAT16, 64-89 for FAT32 */
-	/* Extended BIOS Parameter Block */
-	uchar   drive_number;	/* 0: logical drive number of partition */
-				/* (typically 0 for floppy, 0x80 for each disk) */
-	uchar   current_head;	/* Originally: track containing boot record. (Usually 0)
-				   For WNT: bit 0: dirty: chkdsk must be run
-					    bit 1: also run surface scan */
-	uchar   extd_signature;	/* 2: extended signature (0x29) */
-				/* WNT requires either 0x28 or 0x29 */
-	uchar   serial_nr[4];	/* 3: serial number of partition */
-	uchar   volume_name[11];/* 7: volume name of partition */
-				/* WNT stores the volume label as a special file
-				   in the root directory */
-	uchar   fs_name[8];	/* 18: filesystem name (FAT12, FAT16, FAT32) */
-};
-
-struct fat16_boot_sector {
-	struct fat_boot_sector_start s;		/* 0-35 */
-	struct fat_boot_sector_middle m;	/* 36-61 */
-	uchar  boot_code[448];			/* 62-509 */
-	uchar  signature[2];			/* 510-511: aa55 */
-};
-
-struct fat32_boot_sector {
-	struct fat_boot_sector_start s;		/* 0-35 */
-
-	uint32  fat32_length;   /* 36: sectors/FAT */
-	uint16  flags;		/* 40: bit 7: fat mirroring, low 4: active fat */
-				/* If mirroring is disabled (bit8 set) the FAT
-				   info is only written to the active FAT copy. */
-	uchar   version[2];     /* 42: major, minor filesystem version */
-	uint32  root_cluster;   /* 44: first cluster in root directory */
-	uint16  info_sector;    /* 48: filesystem info sector # relative
-				   to partition start (usually 1) */
-	uint16  backup_boot;    /* 50: backup boot sector # relat. to part. start */
-	uint16  reserved2[6];   /* 52-63: Unused */
-
-	struct fat_boot_sector_middle m;	/* 64-89 */
-	uchar  boot_code[420];			/* 90-509 */
-	uchar  signature[2];			/* 510-511: aa55 */
-};
-
-/*
- * The boot code contains message strings ("Invalid system disk")
- * but these are often localized ("Ongeldige diskette ").
- * After these messages one finds two or three filenames.
- * (MSDOS 6.2: "\r\nNon-System disk or disk error\r\n"
- * "Replace and press any key when ready\r\n", "IO      SYS", "MSDOS   SYS") 
- * (W95: "IO      SYS", "MSDOS   SYS", "WINBOOT SYS")
- * In all cases the sector seems to end with 0, 0, 55, aa.
- *
- * Random collection of messages (closed by \0377 or 0):
- * "\r\nInvalid system disk"
- * "\r\nOngeldige diskette "
- * "\r\nDisk I/O error"
- * "\r\nI/O-fout      "
- * "\r\nReplace the disk, and then press any key\r\n"
- * "\r\nVervang de diskette en druk op een toets\r\n"
- * This seems to suggest that the localized strings have the same length.
- *
- * "Non-System disk or disk error"
- * "Replace and press any key when ready"
- * "Disk Boot failure"
- *
- * "BOOT: Couldn't find NTLDR"
- * "I/O error reading disk"
- * "Please insert another disk"
- */
-
-struct fat32_boot_fsinfo {
-	uint32   signature1;     /* 41 61 52 52 */
-	uchar    unknown1[480];
-	uint32   signature2;     /* 61 41 72 72 0x61417272L */
-	uint32   free_clusters;  /* Free cluster count.  -1 if unknown */
-	uint32   next_cluster;   /* Most recently allocated cluster.
-				  * Unused under Linux. */
-	uchar    unknown2[14];
-	uchar    signature[2];	 /* 510-511: aa55 */
-};
-
-struct msdos_dir_entry {
-	uchar    name[8],ext[3]; /* name and extension */
-	uchar    attr;	  	 /* attribute bits */
-	uchar    lcase;	 	 /* Case for base and extension */
-	uchar    ctime_ms;       /* Creation time, milliseconds */
-	uint16   ctime;		 /* Creation time */
-	uint16   cdate;		 /* Creation date */
-	uint16   adate;		 /* Last access date */
-	uint16   starthi;	 /* High 16 bits of cluster in FAT32 */
-	uint16   time,date,start;/* time, date and first cluster */
-	uint32   size;		 /* file size (in bytes) */
-};
-
-/* New swap space */
-struct swap_header_v1 {
-        char         bootbits[1024];    /* Space for disklabel etc. */
-        unsigned int version;
-        unsigned int last_page;
-        unsigned int nr_badpages;
-        unsigned int padding[125];
-        unsigned int badpages[1];
-};
-
-struct unixware_slice {
-	unsigned short slice_type;
-	unsigned short slice_flags;
-	unsigned int start;
-	unsigned int size;
-};
-
-struct bsd_disklabel {
-	uchar	d_magic[4];
-	uchar	d_stuff1[4];
-	uchar	d_typename[16];		/* type name, e.g. "eagle" */
-	uchar	d_packname[16];		/* pack identifier */ 
-	uint32	d_secsize;		/* # of bytes per sector */
-	uint32	d_nsectors;		/* # of data sectors per track */
-	uint32	d_ntracks;		/* # of tracks per cylinder */
-	uint32	d_ncylinders;		/* # of data cylinders per unit */
-	uint32	d_secpercyl;		/* # of data sectors per cylinder */
-	uint32	d_secperunit;		/* # of data sectors per unit */
-	uchar	d_stuff2[68];
-	uchar	d_magic2[4];		/* the magic number (again) */
-	uint16	d_checksum;		/* xor of data incl. partitions */
-
-			/* filesystem and partition information: */
-	uint16	d_npartitions;		/* number of partitions in following */
-	uint32	d_bbsize;		/* size of boot area at sn0, bytes */
-	uint32	d_sbsize;		/* max size of fs superblock, bytes */
-	struct	bsd_partition {		/* the partition table */
-		uint32	p_size;		/* number of sectors in partition */
-		uint32	p_offset;	/* starting sector */
-		uchar	p_stuff[8];
-	} d_partitions[16];		/* 16 is for openbsd */
-};
-
-
-int
-main(int argc, char **argv){
-	int i,j,fd;
-	long size;
-	int pagesize, pagesecs;
-	unsigned char *bp;
-	struct ext2_super_block *e2bp;
-	struct fat16_boot_sector *fat16bs;
-	struct fat32_boot_sector *fat32bs;
-
-	progname = argv[0];
-
-	if (argc != 2) {
-		fprintf(stderr, "call: %s device\n", progname);
-		exit(1);
-	}
-
-	device = argv[1];
-
-	fd = open(device, O_RDONLY);
-	if (fd < 0) {
-		perror(device);
-		fprintf(stderr, "%s: could not open %s\n", progname, device);
-		exit(1);
-	}
-
-	if (ioctl(fd, BLKGETSIZE, &size)) {
-		struct stat s;
-		perror("BLKGETSIZE");
-		fprintf(stderr, "%s: could not get device size\n", progname);
-		if (stat(device, &s)) {
-			fprintf(stderr, "and also stat fails. Aborting.\n");
-			exit(1);
-		}
-		size = s.st_size / 512;
-	}
-
-	pagesize = getpagesize();
-	if (pagesize <= 0)
-		pagesize = 4096;
-	else if (pagesize > MAXPAGESZ) {
-		fprintf(stderr, "%s: ridiculous pagesize %d\n", progname, pagesize);
-		exit(1);
-	}
-	pagesecs = pagesize/512;
-
-	printf("# partition table of %s\n", device);
-	printf("# total size %ld sectors\n", size);
-	printf("unit: sectors\n");
-
-	for(i=0; i<size; i++) {
-		if (i/BUFSECS != bufstart) {
-			int len, secno;
-			bufstart = i/BUFSECS;
-			secno = bufstart*BUFSECS;
-			len = BUFSECS;
-			if (size - secno < len)
-				len = size - secno;
-			len = (len / 2)*2;	/* avoid reading the last (odd) sector */
-			read_sectors(fd, buf, secno, len);
-		}
-			
-		j = i % BUFSECS;
-
-		bp = buf + 512 * j;
-
-		if (bp[510] == 0x55 && bp[511] == 0xAA) {
-			char *cp = bp+512-2-64;
-			int j;
-
-			if (i==0)
-				continue; /* the MBR is supposed to be broken */
-
-			/* Unfortunately one finds extended partition table sectors
-			   that look just like a fat boot sector, except that the
-			   partition table bytes have been overwritten */
-			/* typical FAT32 end: "nd then press ...", followed by
-			   IO.SYS and MSDOS.SYS and WINBOOT.SYS directory entries.
-			   typical extd part tab end: 2 entries, 32 nul bytes */
-
-			for(j=0; j<32; j++)
-				if (cp[32+j])
-					goto nonzero;
-			addepts(i, bp);
-			if (i > 0) {
-				j = create_extended_partition(fd, i, size);
-				if (j && j > i)
-					i = j;	/* skip */
-			}
-			continue;
-		nonzero:
-			fat16bs = (struct fat16_boot_sector *) bp;
-			if (fat16bs->s.media == 0xf8 &&
-			    fat16bs->m.extd_signature == 0x29 &&
-			    !strncmp(fat16bs->m.fs_name, "FAT", 3)) {
-				int lth;
-				lth = fat16bs->s.sectors[0] +
-					fat16bs->s.sectors[1]*256;
-				if (lth) {
-					outmsg("small fat partition", i, i+lth, 0x1);
-					addpart(i, lth, 0x1);
-				} else {
-					lth = fat16bs->s.total_sect;
-					outmsg("fat partition", i, i+lth, 0x6);
-					addpart(i, lth, 0x6);
-				}
-				i = i+lth-1;	/* skip */
-				continue;
-			}
-
-			fat32bs = (struct fat32_boot_sector *) bp;
-			if (fat32bs->s.media == 0xf8 &&
-			    fat32bs->m.extd_signature == 0x29 &&
-			    !strncmp(fat32bs->m.fs_name, "FAT32   ", 8)) {
-				int lth = fat32bs->s.total_sect;
-				outmsg("fat32 partition", i, i+lth, 0xb); /* or 0xc */
-				addpart(i, lth, 0xb);
-				i = i+lth-1;	/* skip */
-				continue;
-			}
-		}
-
-		if (!strncmp(bp+502, "SWAP-SPACE", 10)) {
-			char *last;
-			int ct;
-			int ss = i-pagesecs+1;
-			int es;
-			char buf2[MAXPAGESZ];
-
-			read_sectors(fd, buf2, ss, pagesecs);
-			for (last = buf2+pagesize-10-1; last > buf2; last--)
-				if (*last)
-					break;
-			for (ct = 7; ct >= 0; ct--)
-				if (*last & (1<<ct))
-					break;
-			es = ((last - buf2)*8 + ct + 1)*pagesecs + ss;
-			if (es <= size) {
-				outmsg("old swap space", ss, es, 0x82);
-				addpart(ss, es-ss, 0x82);
-
-				i = es-1;	/* skip */
-				continue;
-			}
-		}
-
-		if (!strncmp(bp+502, "SWAPSPACE2", 10)) {
-			int ss = i-pagesecs+1;
-			int es, lth;
-			char buf2[MAXPAGESZ];
-			struct swap_header_v1 *p;
-
-			read_sectors(fd, buf2, ss, pagesecs);
-			p = (struct swap_header_v1 *) buf2;
-			lth = (p->last_page + 1)* pagesecs;
-			es = ss + lth;
-			if (es <= size) {
-				outmsg("new swap space", ss, es, 0x82);
-				addpart(ss, lth, 0x82);
-
-				i = es-1;       /* skip */
-				continue;
-			}
-		}
-
-		e2bp = (struct ext2_super_block *) bp;
-		if (e2bp->s_magic == EXT2_SUPER_MAGIC && is_time(e2bp->s_mtime)
-		    && is_time(e2bp->s_wtime) && is_ztime(e2bp->s_lastcheck)
-		    && e2bp->s_log_block_size <= 10 /* at most 1 MB blocks */) {
-			char buf[512];
-			struct ext2_super_block *bp2;
-			int ss, sz, es, gsz, j;
-
-			ss = i-2;
-			sz = (e2bp->s_blocks_count << (e2bp->s_log_block_size + 1));
-			gsz = (e2bp->s_blocks_per_group << (e2bp->s_log_block_size + 1));
-			if (e2bp->s_block_group_nr > 0)
-				ss -= gsz * e2bp->s_block_group_nr;
-			es = ss + sz;
-			if (ss > 0 && es > i && es <= size) {
-				if (e2bp->s_block_group_nr == 0) {
-					outmsg("ext2 partition", ss, es, 0x83);
-					addpart(ss, es-ss, 0x83);
-
-					i = es-1;	/* skip */
-					continue;
-				}
-
-				/* maybe we jumped into the middle of a partially
-				   obliterated ext2 partition? */
-
-				printf("# sector %d looks like an ext2 superblock copy #%d;\n"
-				       "# in a partition covering sectors %d-%d\n",
-				       i, e2bp->s_block_group_nr, ss, es-1);
-
-				for (j=1; j<=e2bp->s_block_group_nr; j++) {
-					read_sectors(fd, buf, i-j*gsz, 1);
-					bp2 = (struct ext2_super_block *) buf;
-					if (bp2->s_magic != EXT2_SUPER_MAGIC ||
-					    bp2->s_block_group_nr !=
-					      e2bp->s_block_group_nr - j)
-						break;
-				}
-				if (j == 1)
-					printf("# however, sector %d doesnt look like a sb.\n",
-					       i-gsz);
-				else if (j <= e2bp->s_block_group_nr)
-					printf("# also the preceding %d block groups seem OK\n"
-					       "# but before that things seem to be wrong.\n",
-					       j-1);
-				else {
-					printf("# found all preceding superblocks OK\n"
-					       "# Warning: overlapping partitions?\n");
-					outmsg("ext2 partition", ss, es, 0x83);
-					addpart(ss, es-ss, 0x83);
-					i = es-1;       /* skip */
-					continue;
-				}
-			}
-
-		}
-
-		if (bp[4] == 0x0d && bp[5] == 0x60 &&
-		    bp[6] == 0x5e && bp[7] == 0xca &&   /* CA5E600D */
-		    bp[156] == 0xee && bp[157] == 0xde &&
-		    bp[158] == 0x0d && bp[159] == 0x60) /* 600DDEEE */ {
-			int ss, es;
-			struct unixware_slice *u;
-			printf("# Unixware partition seen\n");
-			u = (struct unixware_slice *)(bp + 216);
-			if (u->slice_type == 5	/* entire disk */
-			    && (u->slice_flags & 0x200)) /* valid */ {
-				ss = u->start;
-				es = u->start + u->size;
-				outmsg("Unixware ptn", ss, es, 0x63);
-				addpart(ss, es-ss, 0x63);
-				i = es-1;
-				continue;
-			} else
-				printf("# Unrecognized details\n");
-		}
-
-		/* bsd disk magic 0x82564557UL */
-		if (bp[0] == 0x57 && bp[1] == 0x45 && bp[2] == 0x56 && bp[3] == 0x82) {
-			int ss, es, npts, j;
-			struct bsd_disklabel *l;
-			struct bsd_partition *p;
-			printf("# BSD magic seen in sector %d\n", i);
-			l = (struct bsd_disklabel *) bp;
-			if (l->d_magic2[0] != 0x57 || l->d_magic2[1] != 0x45 ||
-			    l->d_magic2[2] != 0x56 || l->d_magic2[3] != 0x82)
-				printf("# 2nd magic bad - ignored this sector\n");
-			else if ((npts = l->d_npartitions) > 16)
-				printf("# strange number (%d) of subpartitions - "
-				       "ignored this sector\n", npts);
-			else {
-				for (j=0; j<npts; j++) {
-					p = &(l->d_partitions[j]);
-					if (p->p_size)
-						printf("# part %c: size %9d, start %9d\n",
-						       'a'+j, p->p_size, p->p_offset);
-				}
-				ss = l->d_partitions[2].p_offset;
-				es = ss + l->d_partitions[2].p_size;
-				if (ss != i-1)
-					printf("# strange start of whole disk - "
-					       "ignored this sector\n");
-				else {
-					/* FreeBSD 0xa5, OpenBSD 0xa6, NetBSD 0xa9, BSDI 0xb7 */
-					/* How to distinguish? */
-					outmsg("BSD partition", ss, es, 0xa5);
-					addpart(ss, es-ss, 0xa5);
-					i = es-1;
-					continue;
-				}
-			}
-		}
-	}
-
-	outparts();
-	
-	exit(0);
-}
-
diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am
new file mode 100644
index 000000000..33235f2f2
--- /dev/null
+++ b/schedutils/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+if BUILD_SCHEDUTILS
+
+usrbin_PROGRAMS = chrt ionice taskset
+man_MANS = chrt.1 ionice.1 taskset.1
+
+endif
diff --git a/schedutils/Makefile.in b/schedutils/Makefile.in
new file mode 100644
index 000000000..8d6d468d2
--- /dev/null
+++ b/schedutils/Makefile.in
@@ -0,0 +1,609 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+@BUILD_SCHEDUTILS_TRUE@usrbin_PROGRAMS = chrt$(EXEEXT) ionice$(EXEEXT) \
+@BUILD_SCHEDUTILS_TRUE@	taskset$(EXEEXT)
+subdir = schedutils
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man1dir)"
+usrbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(usrbin_PROGRAMS)
+chrt_SOURCES = chrt.c
+chrt_OBJECTS = chrt.$(OBJEXT)
+chrt_LDADD = $(LDADD)
+ionice_SOURCES = ionice.c
+ionice_OBJECTS = ionice.$(OBJEXT)
+ionice_LDADD = $(LDADD)
+taskset_SOURCES = taskset.c
+taskset_OBJECTS = taskset.$(OBJEXT)
+taskset_LDADD = $(LDADD)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = chrt.c ionice.c taskset.c
+DIST_SOURCES = chrt.c ionice.c taskset.c
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+@BUILD_SCHEDUTILS_TRUE@man_MANS = chrt.1 ionice.1 taskset.1
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  schedutils/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  schedutils/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
+install-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	done
+
+clean-usrbinPROGRAMS:
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+chrt$(EXEEXT): $(chrt_OBJECTS) $(chrt_DEPENDENCIES) 
+	@rm -f chrt$(EXEEXT)
+	$(LINK) $(chrt_LDFLAGS) $(chrt_OBJECTS) $(chrt_LDADD) $(LIBS)
+ionice$(EXEEXT): $(ionice_OBJECTS) $(ionice_DEPENDENCIES) 
+	@rm -f ionice$(EXEEXT)
+	$(LINK) $(ionice_LDFLAGS) $(ionice_OBJECTS) $(ionice_LDADD) $(LIBS)
+taskset$(EXEEXT): $(taskset_OBJECTS) $(taskset_DEPENDENCIES) 
+	@rm -f taskset$(EXEEXT)
+	$(LINK) $(taskset_LDFLAGS) $(taskset_OBJECTS) $(taskset_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chrt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ionice.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/taskset.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man1dir)"; 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)
+
+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-libtool clean-usrbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man install-usrbinPROGRAMS
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man: install-man1
+
+installcheck-am: installcheck-usrbinPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-man uninstall-usrbinPROGRAMS
+
+uninstall-man: uninstall-man1
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-usrbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-man1 install-strip install-usrbinPROGRAMS installcheck \
+	installcheck-am installcheck-usrbinPROGRAMS installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am uninstall-man uninstall-man1 \
+	uninstall-usrbinPROGRAMS
+
+# 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 --git a/schedutils/chrt.1 b/schedutils/chrt.1
new file mode 100644
index 000000000..57e046ea9
--- /dev/null
+++ b/schedutils/chrt.1
@@ -0,0 +1,103 @@
+.\" chrt(1) manpage
+.\"
+.\" Copyright (C) 2004 Robert Love
+.\"
+.\" 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.\"
+.\" 2002-05-11 Robert Love <rml@tech9.net>
+.\" 	Initial version
+.\"
+.TH CHRT "1" "Apr 2003" "schedutils" "Linux User's Manual"
+.SH NAME
+chrt \- manipulate real-time attributes of a process
+.SH SYNOPSIS
+.B chrt
+[\fIoptions\fR] [\fIprio\fR] [\fIpid\fR | \fIcommand\fR [\fIarg\fR]...]
+.SH DESCRIPTION
+.PP
+.BR chrt (1)
+sets or retrieves the real-time scheduling attributes of an existing PID or
+runs COMMAND with the given attributes.  Both policy (one of
+.BR SCHED_FIFO ,
+.BR SCHED_RR ,
+or
+.BR SCHED_OTHER )
+and priority can be set and retrieved.
+.SH OPTIONS
+.TP
+.B -p, --pid
+operate on an existing PID and do not launch a new task
+.TP
+
+.TP
+.B -f, --fifo
+set scheduling policy to
+.BR SCHED_FIFO
+.TP
+.B -m, --max
+show minimum and maximum valid priorities, then exit
+.TP
+.B -o, --other
+set policy scheduling policy to
+.BR SCHED_OTHER
+.TP
+.B -r, --rr
+set scheduling policy to
+.BR SCHED_RR
+(the default)
+.TP
+.B -h, --help
+display usage information and exit
+.TP
+.B -v, --version
+output version information and exit
+.SH USAGE
+.TP
+The default behavior is to run a new command::
+chrt [prio] -- [command] [arguments]
+.TP
+You can also retrieve the real-time attributes of an existing task:
+chrt -p [pid]
+.TP
+Or set them:
+chrt -p [prio] [pid]
+.SH PERMISSIONS
+A user must possess
+.BR CAP_SYS_NICE
+to change the scheduling attributes of a process.  Any user can retrieve the
+scheduling information.
+.SH AUTHOR
+Written by Robert M. Love.
+.SH "REPORTING BUGS"
+Report bugs to <rml@tech9.net>.
+.SH COPYRIGHT
+Copyright \(co 2004 Robert M. Love
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+.BR taskset (1),
+.BR nice (1),
+.BR renice (1)
+.sp
+See
+.BR sched_setscheduler (2)
+for a description of the Linux scheduling scheme.
diff --git a/schedutils/chrt.c b/schedutils/chrt.c
new file mode 100644
index 000000000..b61ed52ad
--- /dev/null
+++ b/schedutils/chrt.c
@@ -0,0 +1,223 @@
+/*
+ * chrt.c - chrt
+ * Command-line utility for manipulating a task's real-time attributes 
+ *
+ * Robert Love <rml@tech9.net>
+ * 27-Apr-2002: initial version
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, v2, as
+ * published by the Free Software Foundation
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Copyright (C) 2004 Robert Love
+ */
+
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sched.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <errno.h>
+
+static void show_usage(const char *cmd)
+{
+	fprintf(stderr, "chrt version " VERSION "\n");
+	fprintf(stderr, "usage: %s [options] [prio] [pid | cmd [args...]]\n",
+			cmd);
+	fprintf(stderr, "manipulate real-time attributes of a process\n");
+	fprintf(stderr, "  -f, --fifo                         "
+			"set policy to SCHED_FF\n");
+	fprintf(stderr, "  -p, --pid                          "
+			"operate on existing given pid\n");
+	fprintf(stderr, "  -m, --max                          "
+			"show min and max valid priorities\n");
+	fprintf(stderr, "  -o, --other                        "
+			"set policy to SCHED_OTHER\n");
+	fprintf(stderr, "  -r, --rr                           "
+			"set policy to SCHED_RR (default)\n");
+	fprintf(stderr, "  -h, --help                         "
+			"display this help\n");
+	fprintf(stderr, "  -v, --verbose                      "
+			"display status information\n");
+	fprintf(stderr, "  -V, --version                      "
+			"output version information\n\n");
+	fprintf(stderr, "You must give a priority if changing policy.\n\n");
+	fprintf(stderr, "Report bugs and send patches to <rml@tech9.net>\n");
+}
+
+static void show_rt_info(const char *what, pid_t pid)
+{
+	struct sched_param sp;
+	int policy;
+
+	/* don't display "pid 0" as that is confusing */
+	if (!pid)
+		pid = getpid();
+
+	policy = sched_getscheduler(pid);
+	if (policy == -1) {
+		perror("sched_getscheduler");
+		fprintf(stderr, "failed to get pid %d's policy\n", pid);
+		exit(1);
+	}
+
+	printf("pid %d's %s scheduling policy: ", pid, what);
+	switch (policy) {
+	case SCHED_OTHER:
+		printf("SCHED_OTHER\n");
+		break;
+	case SCHED_FIFO:
+		printf("SCHED_FIFO\n");
+		break;
+	case SCHED_RR:
+		printf("SCHED_RR\n");
+		break;
+	default:
+		printf("unknown\n");
+	}
+
+	if (sched_getparam(pid, &sp)) {
+		perror("sched_getparam");
+		fprintf(stderr, "failed to get pid %d's attributes\n", pid);
+		exit(1);
+	}
+
+	printf("pid %d's %s scheduling priority: %d\n",
+		pid, what, sp.sched_priority);
+}
+
+static void show_min_max(void)
+{
+	int max, min;
+
+	max = sched_get_priority_max(SCHED_FIFO);
+	min = sched_get_priority_min(SCHED_FIFO);
+	if (max >= 0 && min >= 0)
+		printf("SCHED_FIFO min/max priority\t: %d/%d\n", min, max);
+	else
+		printf("SCHED_FIFO not supported?\n");
+
+	max = sched_get_priority_max(SCHED_RR);
+	min = sched_get_priority_min(SCHED_RR);
+	if (max >= 0 && min >= 0)
+		printf("SCHED_RR min/max priority\t: %d/%d\n", min, max);
+	else
+		printf("SCHED_RR not supported?\n");
+
+	max = sched_get_priority_max(SCHED_OTHER);
+	min = sched_get_priority_min(SCHED_OTHER);
+	if (max >= 0 && min >= 0)
+		printf("SCHED_OTHER min/max priority\t: %d/%d\n", min, max);
+	else
+		printf("SCHED_OTHER not supported?\n");
+}
+
+int main(int argc, char *argv[])
+{
+	int i, policy = SCHED_RR, priority = 0, verbose = 0;
+	struct sched_param sp;
+	pid_t pid = 0;
+
+	struct option longopts[] = {
+		{ "fifo",	0, NULL, 'f' },
+		{ "pid",	0, NULL, 'p' },
+		{ "help",	0, NULL, 'h' },
+		{ "max",        0, NULL, 'm' },
+		{ "other",	0, NULL, 'o' },
+		{ "rr",		0, NULL, 'r' },
+		{ "verbose",	0, NULL, 'v' },
+		{ "version",	0, NULL, 'V' },
+		{ NULL,		0, NULL, 0 }
+	};
+
+	while((i = getopt_long(argc, argv, "+fphmorvV", longopts, NULL)) != -1)
+	{
+		int ret = 1;
+
+		switch (i) {
+		case 'f':
+			policy = SCHED_FIFO;
+			break;
+		case 'm':
+			show_min_max();
+			return 0;
+		case 'o':
+			policy = SCHED_OTHER;
+			break;
+		case 'p':
+			errno = 0;
+			pid = strtol(argv[argc - 1], NULL, 10);
+			if (errno) {
+				perror("strtol");
+				fprintf(stderr, "failed to parse pid!\n");
+				return 1;
+			}
+			break;
+		case 'r':
+			policy = SCHED_RR;
+			break;
+		case 'v':
+			verbose = 1;
+			break;
+		case 'V':
+			printf("chrt version " VERSION "\n");
+			return 0;
+		case 'h':
+			ret = 0;
+		default:
+			show_usage(argv[0]);
+			return ret;
+		}
+		
+	}
+
+	if ((pid && argc - optind < 1) || (!pid && argc - optind < 2)) {
+		show_usage(argv[0]);
+		return 1;
+	}
+
+	if (pid && (verbose || argc - optind == 1)) {
+		show_rt_info("current", pid);
+		if (argc - optind == 1)
+			return 0;
+	}
+
+	errno = 0;
+	priority = strtol(argv[optind], NULL, 10);
+	if (errno) {
+		perror("strtol");
+		fprintf(stderr, "failed to parse priority!\n");
+		return 1;
+	}
+
+	sp.sched_priority = priority;
+	if (sched_setscheduler(pid, policy, &sp) == -1) {
+		perror("sched_setscheduler");
+		fprintf(stderr, "failed to set pid %d's policy\n", pid);
+		return 1;
+	}
+
+	if (verbose)
+		show_rt_info("new", pid);
+
+	if (!pid) {
+		argv += optind + 1;
+		execvp(argv[0], argv);
+		perror("execvp");
+		fprintf(stderr, "failed to execute %s\n", argv[0]);
+		return 1;
+	}
+
+	return 0;
+}
diff --git a/schedutils/ionice.1 b/schedutils/ionice.1
new file mode 100644
index 000000000..b0c68c930
--- /dev/null
+++ b/schedutils/ionice.1
@@ -0,0 +1,71 @@
+.TH ionice "1" "August 2005" ionice
+.SH NAME
+ionice \- get/set program io scheduling class and priority
+.SH SYNOPSIS
+.B ionice
+[\fI-c\fR] \fI[-n\fR] [\fI-p\fR] [COMMAND [ARG...]]
+
+.SH DESCRIPTION
+This program sets the io scheduling class and priority for a program. As of
+this writing, Linux supports 3 scheduling classes:
+
+\fBIdle\fR.
+A program running with idle io priority will only get disk time when no other
+program has asked for disk io for a defined grace period. The impact of idle
+io processes on normal system activity should be zero. This scheduling
+class does not take a priority argument.
+
+\fBBest effort\fR.
+This is the default scheduling class for any process that hasn't asked for
+a specific io priority. Programs inherit the CPU nice setting for io
+priorities. This class takes a priority argument from \fI0-7\fR, with lower
+number being higher priority. Programs running at the same best effort
+priority are served in a round-robin fashion.
+
+\fBReal time\fR.
+The RT scheduling class is given first access to the disk, regardless of
+what else is going on in the system. Thus the RT class needs to be used with
+some care, as it can starve other processes. As with the best effort class,
+8 priority levels are defined denoting how big a time slice a given process
+will receive on each scheduling window.
+
+If no arguments or just \fI-p\fR is given, \fIionice\fR will query the
+current io scheduling class and priority for that process.
+
+.SH OPTIONS
+.LP
+.TP 7
+\fB-c\fP
+The scheduling class. 1 for real time, 2 for best-effort, 3 for idle.
+.TP 7
+\fB-n\fP
+The scheduling class data. This defines the class data, if the class
+accepts an argument. For real time and best-effort, \fI0-7\fR is valid
+data.
+.TP 7
+\fB-p\fP
+Pass in a process pid to change an already running process. If this argument
+is not given, \fBionice\fP will run the listed program with the given
+parameters.
+
+.SH EXAMPLES
+.LP
+.TP 7
+# \fBionice\fP -c3 -p89
+.TP 7
+Sets process with PID 89 as an idle io process.
+.TP 7
+# \fBionice\fP -c2 -n0 bash
+.TP 7
+Runs 'bash' as a best-effort program with highest priority.
+.TP 7
+# \fBionice\fP -p89
+.TP 7
+Returns the class and priority of the process with PID 89.
+
+.SH NOTES
+Linux supports io scheduling priorities and classes since 2.6.13 with the CFQ
+io scheduler.
+
+.SH AUTHORS
+Jens Axboe <axboe@suse.de>
diff --git a/schedutils/ionice.c b/schedutils/ionice.c
new file mode 100644
index 000000000..b3b3383a8
--- /dev/null
+++ b/schedutils/ionice.c
@@ -0,0 +1,143 @@
+/*
+ * ionice: set or get process io scheduling class and priority
+ *
+ * Copyright (C) 2005 Jens Axboe <axboe@suse.de> SUSE Labs
+ *
+ * Released under the terms of the GNU General Public License version 2
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <sys/ptrace.h>
+#include <sys/syscall.h>
+#include <asm/unistd.h>
+
+#if defined(__i386__)
+#define __NR_ioprio_set		289
+#define __NR_ioprio_get		290
+#elif defined(__powerpc__) || defined(__powerpc64__)
+#define __NR_ioprio_set		273
+#define __NR_ioprio_get		274
+#elif defined(__x86_64__)
+#define __NR_ioprio_set		251
+#define __NR_ioprio_get		252
+#elif defined(__ia64__)
+#define __NR_ioprio_set		1274
+#define __NR_ioprio_get		1275
+#elif defined(__alpha__)
+#define __NR_ioprio_set		442
+#define __NR_ioprio_get		443
+#elif defined(__s390x__) || defined(__s390__)
+#define __NR_ioprio_set		282
+#define __NR_ioprio_get		283
+#else
+#error "Unsupported arch"
+#endif
+
+static inline int ioprio_set(int which, int who, int ioprio)
+{
+	return syscall(__NR_ioprio_set, which, who, ioprio);
+}
+
+static inline int ioprio_get(int which, int who)
+{
+	return syscall(__NR_ioprio_get, which, who);
+}
+
+enum {
+	IOPRIO_CLASS_NONE,
+	IOPRIO_CLASS_RT,
+	IOPRIO_CLASS_BE,
+	IOPRIO_CLASS_IDLE,
+};
+
+enum {
+	IOPRIO_WHO_PROCESS = 1,
+	IOPRIO_WHO_PGRP,
+	IOPRIO_WHO_USER,
+};
+
+#define IOPRIO_CLASS_SHIFT	13
+
+const char *to_prio[] = { "none", "realtime", "best-effort", "idle", };
+
+static void usage(void)
+{
+	printf("Usage: ionice [OPTIONS] [COMMAND [ARG]...]\n");
+	printf("Sets or gets process io scheduling class and priority.\n");
+	printf("\n\t-n\tClass data (typically 0-7, lower being higher prio)\n");
+	printf("\t-c\tScheduling class\n");
+	printf("\t\t\t1: realtime, 2: best-effort, 3: idle\n");
+	printf("\t-p\tProcess pid\n");
+	printf("\t-h\tThis help page\n");
+	printf("\nJens Axboe <axboe@suse.de> (C) 2005\n");
+}
+
+int main(int argc, char *argv[])
+{
+	int ioprio = 4, set = 0, ioprio_class = IOPRIO_CLASS_BE;
+	int c, pid = 0;
+
+	while ((c = getopt(argc, argv, "+n:c:p:h")) != EOF) {
+		switch (c) {
+		case 'n':
+			ioprio = strtol(optarg, NULL, 10);
+			set = 1;
+			break;
+		case 'c':
+			ioprio_class = strtol(optarg, NULL, 10);
+			set = 1;
+			break;
+		case 'p':
+			pid = strtol(optarg, NULL, 10);
+			break;
+		case 'h':
+		default:
+			usage();
+			exit(0);
+		}
+	}
+
+	switch (ioprio_class) {
+		case IOPRIO_CLASS_NONE:
+			ioprio_class = IOPRIO_CLASS_BE;
+			break;
+		case IOPRIO_CLASS_RT:
+		case IOPRIO_CLASS_BE:
+			break;
+		case IOPRIO_CLASS_IDLE:
+			ioprio = 7;
+			break;
+		default:
+			printf("bad prio class %d\n", ioprio_class);
+			return 1;
+	}
+
+	if (!set) {
+		if (!pid && argv[optind])
+			pid = strtol(argv[optind], NULL, 10);
+
+		ioprio = ioprio_get(IOPRIO_WHO_PROCESS, pid);
+
+		if (ioprio == -1)
+			perror("ioprio_get");
+		else {
+			ioprio_class = ioprio >> IOPRIO_CLASS_SHIFT;
+			ioprio = ioprio & 0xff;
+			printf("%s: prio %d\n", to_prio[ioprio_class], ioprio);
+		}
+	} else {
+		if (ioprio_set(IOPRIO_WHO_PROCESS, pid, ioprio | ioprio_class << IOPRIO_CLASS_SHIFT) == -1) {
+			perror("ioprio_set");
+			return 1;
+		}
+
+		if (argv[optind])
+			execvp(argv[optind], &argv[optind]);
+	}
+
+	return 0;
+}
diff --git a/schedutils/taskset.1 b/schedutils/taskset.1
new file mode 100644
index 000000000..5847a1891
--- /dev/null
+++ b/schedutils/taskset.1
@@ -0,0 +1,115 @@
+.\" taskset(1) manpage
+.\"
+.\" Copyright (C) 2004 Robert Love
+.\"
+.\" 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.\"
+.\" 2002-05-11 Robert Love <rml@tech9.net>
+.\" 	Initial version
+.\"
+.TH TASKSET "1" "Apr 2003" "schedutils" "Linux User's Manual"
+.SH NAME
+taskset \- retrieve or set a processes's CPU affinity
+.SH SYNOPSIS
+.B taskset
+[\fIoptions\fR] [\fImask\fR | \fIlist\fI ] [\fIpid\fR | \fIcommand\fR [\fIarg\fR]...]
+.SH DESCRIPTION
+.PP
+.BR taskset
+is used to set or retrieve the CPU affinity of a running process given its PID
+or to launch a new COMMAND with a given CPU affinity.  CPU affinity is a
+scheduler property that "bonds" a process to a given set of CPUs on the system.
+The Linux scheduler will honor the given CPU affinity and the process will not
+run on any other CPUs.  Note that the Linux scheduler also supports natural
+CPU affinity: the scheduler attempts to keep processes on the same CPU as long
+as practical for performance reasons.  Therefore, forcing a specific CPU
+affinity is useful only in certain applications.
+.sp
+The CPU affinity is represented as a bitmask, with the lowest order bit
+corresponding to the first logical CPU and the highest order bit corresponding
+to the last logical CPU.  Not all CPUs may exist on a given system but a mask
+may specify more CPUs than are present.  A retrieved mask will reflect only the
+bits that correspond to CPUs physically on the system.  If an invalid mask is
+given (i.e., one that corresponds to no valid CPUs on the current system) an
+error is returned.  The masks are typically given in hexadecimal.  For example,
+.TP
+.BR 0x00000001
+is processor #0
+.TP
+.BR 0x00000003
+is processors #0 and #1
+.TP
+.BR 0xFFFFFFFF
+is all processors (#0 through #31)
+.PP
+When
+.BR taskset
+returns, it is guaranteed that the given program has been scheduled to a legal
+CPU.
+.SH OPTIONS
+.TP
+.B -p, --pid
+operate on an existing PID and not launch a new task
+.TP
+.B -c, --cpu-list
+specifiy a numerical list of processors instead of a bitmask.  The list may
+contain multiple items, separated by comma, and ranges.  For example,
+.BR 0,5,7,9-11 .
+.TP
+.B -h, --help
+display usage information and exit
+.TP
+.B -V, --version
+output version information and exit
+.SH USAGE
+.TP
+The default behavior is to run a new command with a given affinity mask:
+taskset [mask] -- [command] [arguments]
+.TP
+You can also retrieve the CPU affinity of an existing task:
+taskset -p [pid]
+.TP
+Or set it:
+taskset -p [mask] [pid]
+.SH PERMISSIONS
+A user must possess
+.BR CAP_SYS_NICE
+to change the CPU affinity of a process.  Any user can retrieve the affinity
+mask.
+.SH AUTHOR
+Written by Robert M. Love.
+.SH "REPORTING BUGS"
+Report bugs to <rml@tech9.net>.
+.SH COPYRIGHT
+Copyright \(co 2004 Robert M. Love
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+.BR chrt (1),
+.BR nice (1),
+.BR renice (1),
+.BR sched_setaffinity (2),
+.BR sched_getaffinity (2)
+.sp
+See
+.BR sched_setscheduler (2)
+for a description of the Linux scheduling scheme.
diff --git a/schedutils/taskset.c b/schedutils/taskset.c
new file mode 100644
index 000000000..5932620ef
--- /dev/null
+++ b/schedutils/taskset.c
@@ -0,0 +1,334 @@
+/*
+ * taskset.c - taskset
+ * Command-line utility for setting and retrieving a task's CPU affinity
+ *
+ * Robert Love <rml@tech9.net>		25 April 2002
+ *
+ * Linux kernels as of 2.5.8 provide the needed syscalls for
+ * working with a task's cpu affinity.  Currently 2.4 does not
+ * support these syscalls, but patches are available at:
+ *
+ * 	http://www.kernel.org/pub/linux/kernel/people/rml/cpu-affinity/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, v2, as
+ * published by the Free Software Foundation
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Copyright (C) 2004 Robert Love
+ */
+
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sched.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+
+static void show_usage(const char *cmd)
+{
+	fprintf(stderr, "taskset version " VERSION "\n");
+	fprintf(stderr, "usage: %s [options] [mask | cpu-list] [pid |"\
+		" cmd [args...]]\n", cmd);
+	fprintf(stderr, "set or get the affinity of a process\n\n");
+	fprintf(stderr, "  -p, --pid                  "
+		"operate on existing given pid\n");
+        fprintf(stderr, "  -c, --cpu-list             "\
+		"display and specify cpus in list format\n");
+	fprintf(stderr, "  -h, --help                 display this help\n");
+	fprintf(stderr, "  -v, --version              "\
+		"output version information\n\n");
+	fprintf(stderr, "The default behavior is to run a new command:\n");
+	fprintf(stderr, "  %s 03 sshd -b 1024\n", cmd);
+	fprintf(stderr, "You can retrieve the mask of an existing task:\n");
+	fprintf(stderr, "  %s -p 700\n", cmd);
+	fprintf(stderr, "Or set it:\n");
+	fprintf(stderr, "  %s -p 03 700\n", cmd);
+	fprintf(stderr, "List format uses a comma-separated list instead"\
+			" of a mask:\n");
+	fprintf(stderr, "  %s -pc 0,3,7-11 700\n", cmd);
+	fprintf(stderr, "Ranges in list format can take a stride argument:\n");
+	fprintf(stderr, "  e.g. 0-31:2 is equivalent to mask 0x55555555\n\n");
+}
+
+static inline int val_to_char(int v)
+{
+	if (v >= 0 && v < 10)
+		return '0' + v;
+	else if (v >= 10 && v < 16)
+		return ('a' - 10) + v;
+	else 
+		return -1;
+}
+
+static char * cpuset_to_str(cpu_set_t *mask, char *str)
+{
+	int base;
+	char *ptr = str;
+	char *ret = 0;
+
+	for (base = CPU_SETSIZE - 4; base >= 0; base -= 4) {
+		char val = 0;
+		if (CPU_ISSET(base, mask))
+			val |= 1;
+		if (CPU_ISSET(base + 1, mask))
+			val |= 2;
+		if (CPU_ISSET(base + 2, mask))
+			val |= 4;
+		if (CPU_ISSET(base + 3, mask))
+			val |= 8;
+		if (!ret && val)
+			ret = ptr;
+		*ptr++ = val_to_char(val);
+	}
+	*ptr = 0;
+	return ret ? ret : ptr - 1;
+}
+
+static char * cpuset_to_cstr(cpu_set_t *mask, char *str)
+{
+	int i;
+	char *ptr = str;
+	int entry_made = 0;
+
+	for (i = 0; i < CPU_SETSIZE; i++) {
+		if (CPU_ISSET(i, mask)) {
+			int j;
+			int run = 0;
+			entry_made = 1;
+			for (j = i + 1; j < CPU_SETSIZE; j++) {
+				if (CPU_ISSET(j, mask))
+					run++;
+				else
+					break;
+			}
+			if (!run)
+				sprintf(ptr, "%d,", i);
+			else if (run == 1) {
+				sprintf(ptr, "%d,%d,", i, i + 1);
+				i++;
+			} else {
+				sprintf(ptr, "%d-%d,", i, i + run);
+				i += run;
+			}
+			while (*ptr != 0)
+				ptr++;
+		}
+	}
+	ptr -= entry_made;
+	*ptr = 0;
+
+	return str;
+}
+
+static inline int char_to_val(int c)
+{
+	int cl;
+
+	cl = tolower(c);
+	if (c >= '0' && c <= '9')
+		return c - '0';
+	else if (cl >= 'a' && cl <= 'f')
+		return cl + (10 - 'a');
+	else
+		return -1;
+}
+
+static int str_to_cpuset(cpu_set_t *mask, const char* str)
+{
+	int len = strlen(str);
+	const char *ptr = str + len - 1;
+	int base = 0;
+
+	/* skip 0x, it's all hex anyway */
+	if (len > 1 && !memcmp(str, "0x", 2L))
+		str += 2;
+
+	CPU_ZERO(mask);
+	while (ptr >= str) {
+		char val = char_to_val(*ptr);
+		if (val == (char) -1)
+			return -1;
+		if (val & 1)
+			CPU_SET(base, mask);
+		if (val & 2)
+			CPU_SET(base + 1, mask);
+		if (val & 4)
+			CPU_SET(base + 2, mask);
+		if (val & 8)
+			CPU_SET(base + 3, mask);
+		len--;
+		ptr--;
+		base += 4;
+	}
+
+	return 0;
+}
+
+static const char *nexttoken(const char *q,  int sep)
+{
+	if (q)
+		q = strchr(q, sep);
+	if (q)
+		q++;
+	return q;
+}
+
+static int cstr_to_cpuset(cpu_set_t *mask, const char* str)
+{
+	const char *p, *q;
+	q = str;
+	CPU_ZERO(mask);
+
+	while (p = q, q = nexttoken(q, ','), p) {
+		unsigned int a;	/* beginning of range */
+		unsigned int b;	/* end of range */
+		unsigned int s;	/* stride */
+		const char *c1, *c2;
+
+		if (sscanf(p, "%u", &a) < 1)
+			return 1;
+		b = a;
+		s = 1;
+
+		c1 = nexttoken(p, '-');
+		c2 = nexttoken(p, ',');
+		if (c1 != NULL && (c2 == NULL || c1 < c2)) {
+			if (sscanf(c1, "%u", &b) < 1)
+				return 1;
+			c1 = nexttoken(c1, ':');
+			if (c1 != NULL && (c2 == NULL || c1 < c2))
+				if (sscanf(c1, "%u", &s) < 1) {
+					return 1;
+			}
+		}
+
+		if (!(a <= b))
+			return 1;
+		while (a <= b) {
+			CPU_SET(a, mask);			
+			a += s;
+		}
+	}
+
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	cpu_set_t new_mask, cur_mask;
+	pid_t pid = 0;
+	int opt, err;
+	char mstr[1 + CPU_SETSIZE / 4];
+	char cstr[7 * CPU_SETSIZE];
+	int c_opt = 0;
+
+	struct option longopts[] = {
+		{ "pid",	0, NULL, 'p' },
+		{ "cpu-list",	0, NULL, 'c' },
+		{ "help",	0, NULL, 'h' },
+		{ "version",	0, NULL, 'V' },
+		{ NULL,		0, NULL, 0 }
+	};
+
+	while ((opt = getopt_long(argc, argv, "+pchV", longopts, NULL)) != -1) {
+		int ret = 1;
+
+		switch (opt) {
+		case 'p':
+			pid = atoi(argv[argc - 1]);
+			break;
+		case 'c':
+			c_opt = 1;
+			break;
+		case 'V':
+			printf("taskset version " VERSION "\n");
+			return 0;
+		case 'h':
+			ret = 0;
+		default:
+			show_usage(argv[0]);
+			return ret;
+		}
+	}
+
+	if ((!pid && argc - optind < 2)
+			|| (pid && (argc - optind < 1 || argc - optind > 2))) {
+		show_usage(argv[0]);
+		return 1;
+	}
+
+	if (pid) {
+		if (sched_getaffinity(pid, sizeof (cur_mask), &cur_mask) < 0) {
+			perror("sched_getaffinity");
+			fprintf(stderr, "failed to get pid %d's affinity\n",
+				pid);
+			return 1;
+		}
+		if (c_opt)
+			printf("pid %d's current affinity list: %s\n", pid,
+				cpuset_to_cstr(&cur_mask, cstr));
+		else
+			printf("pid %d's current affinity mask: %s\n", pid,
+				cpuset_to_str(&cur_mask, mstr));
+
+		if (argc - optind == 1)
+			return 0;
+	}
+
+	if (c_opt)
+		err = cstr_to_cpuset(&new_mask, argv[optind]);
+	else
+		err = str_to_cpuset(&new_mask, argv[optind]);
+
+	if (err) {
+		if (c_opt)
+			fprintf(stderr, "failed to parse CPU list %s\n",
+				argv[optind]);
+		else
+			fprintf(stderr, "failed to parse CPU mask %s\n",
+				argv[optind]);
+		return 1;
+	}
+
+	if (sched_setaffinity(pid, sizeof (new_mask), &new_mask)) {
+		perror("sched_setaffinity");
+		fprintf(stderr, "failed to set pid %d's affinity.\n", pid);
+		return 1;
+	}
+
+	if (sched_getaffinity(pid, sizeof (cur_mask), &cur_mask) < 0) {
+		perror("sched_getaffinity");
+		fprintf(stderr, "failed to get pid %d's affinity.\n", pid);
+		return 1;
+	}
+
+	if (pid) {
+		if (c_opt)
+			printf("pid %d's new affinity list: %s\n", pid, 
+		               cpuset_to_cstr(&cur_mask, cstr));
+		else
+			printf("pid %d's new affinity mask: %s\n", pid, 
+		               cpuset_to_str(&cur_mask, mstr));
+	} else {
+		argv += optind + 1;
+		execvp(argv[0], argv);
+		perror("execvp");
+		fprintf(stderr, "failed to execute %s\n", argv[0]);
+		return 1;
+	}
+
+	return 0;
+}
diff --git a/sys-utils/Makefile b/sys-utils/Makefile
deleted file mode 100644
index c61ed7772..000000000
--- a/sys-utils/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-# Created: Sat Dec 26 20:09:40 1992
-# Revised: Mon Aug 19 20:12:33 1996 by faith@cs.unc.edu
-# Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu)
-#
-include ../make_include
-include ../MCONFIG
-
-# Where to put man pages?
-
-MAN1=		arch.1 flock.1 readprofile.1
-
-MAN8= 		ctrlaltdel.8 cytune.8 dmesg.8 \
-		ipcrm.8 ipcs.8 renice.8 \
-		setsid.8 sln.8 tunelp.8
-
-# Where to put binaries?
-# See the "install" rule for the links. . .
-
-BIN=            arch dmesg
-
-USRBIN=		cytune flock ipcrm ipcs renice setsid
-
-USRSBIN=	readprofile tunelp
-
-SBIN= 		ctrlaltdel
-
-NOTMADE=
-
-CWFLAGS := $(subst -Wmissing-prototypes,,$(CFLAGS))
-
-ifeq "$(HAVE_SLN)" "no"
-ifeq "$(CAN_DO_STATIC)" "no"
-NOTMADE=nosln
-else
-SBIN:=$(SBIN) sln
-endif
-endif
-
-ifeq "$(ARCH)" "intel"
-MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 vidmode.8
-USRSBIN:=$(USRSBIN) rdev
-endif
-
-# Where to put datebase files?
-
-USRINFO=        ipc.info
-
-all: $(SBIN) $(BIN) $(USRBIN) $(USRSBIN) $(NOTMADE)
-
-# Sometimes indirectly include <asm/bitops.h>
-cytune.o: cytune.c
-	$(CC) $(CWFLAGS) -c $< -o $@
-
-ipcs.o: ipcs.c
-	$(CC) $(CWFLAGS) -c $< -o $@
-
-ipcrm.o: ipcrm.c
-	$(CC) $(CWFLAGS) -c $< -o $@
-
-sln: sln.c
-	$(CC) -static $(CFLAGS) $(LDFLAGS) $< -o $@
-
-nosln:
-	@echo sln not made since static compilation fails here
-
-# Rules for everything else
-
-arch: arch.o
-ctrlaltdel.o: ctrlaltdel.c $(LIB)/linux_reboot.h
-ctrlaltdel: ctrlaltdel.o $(LIB)/my_reboot.o
-cytune.o: cytune.c cyclades.h
-cytune: cytune.o
-ipcrm: ipcrm.o
-ipcs: ipcs.o
-rdev: rdev.o
-renice: renice.o
-readprofile: readprofile.o
-setsid: setsid.o
-
-ipc.info: ipc.texi
-	makeinfo ipc.texi
-
-install: all
-	$(INSTALLDIR) $(SBINDIR) $(BINDIR) $(USRBINDIR) $(USRSBINDIR)
-	$(INSTALLBIN) $(SBIN) $(SBINDIR)
-	$(INSTALLBIN) $(BIN) $(BINDIR)
-	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
-	$(INSTALLBIN) $(USRSBIN) $(USRSBINDIR)
-ifeq "$(ARCH)" "intel"
-	(cd $(USRSBINDIR); ln -sf rdev ramsize)
-	(cd $(USRSBINDIR); ln -sf rdev vidmode)
-	(cd $(USRSBINDIR); ln -sf rdev rootflags)
-endif
-	$(INSTALLDIR) $(MAN1DIR) $(MAN8DIR) $(INFODIR)
-	$(INSTALLMAN) $(MAN1) $(MAN1DIR)
-	$(INSTALLMAN) $(MAN8) $(MAN8DIR)
-	$(INSTALLMAN) $(USRINFO) $(INFODIR)
-
-clean:
-	-rm -f *.o *~ core $(SBIN) $(BIN) $(USRBIN) $(USRSBIN)
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
new file mode 100644
index 000000000..bd531ca1b
--- /dev/null
+++ b/sys-utils/Makefile.am
@@ -0,0 +1,32 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+bin_PROGRAMS = dmesg
+
+usrbin_PROGRAMS = cytune flock ipcrm ipcs renice setsid
+
+sbin_PROGRAMS = ctrlaltdel
+
+usrsbin_PROGRAMS = readprofile tunelp
+
+man_MANS = flock.1 readprofile.1 \
+	ctrlaltdel.8 cytune.8 dmesg.8 ipcrm.8 ipcs.8 renice.8 \
+	setsid.8 tunelp.8
+
+info_TEXINFOS = ipc.texi
+
+
+if BUILD_RDEV
+
+if INTEL
+
+usrsbin_PROGRAMS += rdev
+man_MANS += rdev.8 ramsize.8 rootflags.8 vidmode.8
+
+install-exec-hook:
+	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev ramsize
+	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev vidmode
+	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev rootflags
+
+endif
+
+endif
diff --git a/sys-utils/Makefile.in b/sys-utils/Makefile.in
new file mode 100644
index 000000000..44da35210
--- /dev/null
+++ b/sys-utils/Makefile.in
@@ -0,0 +1,1032 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+bin_PROGRAMS = dmesg$(EXEEXT)
+usrbin_PROGRAMS = cytune$(EXEEXT) flock$(EXEEXT) ipcrm$(EXEEXT) \
+	ipcs$(EXEEXT) renice$(EXEEXT) setsid$(EXEEXT)
+sbin_PROGRAMS = ctrlaltdel$(EXEEXT)
+usrsbin_PROGRAMS = readprofile$(EXEEXT) tunelp$(EXEEXT) \
+	$(am__EXEEXT_1)
+@BUILD_RDEV_TRUE@@INTEL_TRUE@am__append_1 = rdev
+@BUILD_RDEV_TRUE@@INTEL_TRUE@am__append_2 = rdev.8 ramsize.8 rootflags.8 vidmode.8
+subdir = sys-utils
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
+	"$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(usrsbindir)" \
+	"$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
+	"$(DESTDIR)$(man8dir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+usrbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@BUILD_RDEV_TRUE@@INTEL_TRUE@am__EXEEXT_1 = rdev$(EXEEXT)
+usrsbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) $(usrbin_PROGRAMS) \
+	$(usrsbin_PROGRAMS)
+ctrlaltdel_SOURCES = ctrlaltdel.c
+ctrlaltdel_OBJECTS = ctrlaltdel.$(OBJEXT)
+ctrlaltdel_LDADD = $(LDADD)
+cytune_SOURCES = cytune.c
+cytune_OBJECTS = cytune.$(OBJEXT)
+cytune_LDADD = $(LDADD)
+dmesg_SOURCES = dmesg.c
+dmesg_OBJECTS = dmesg.$(OBJEXT)
+dmesg_LDADD = $(LDADD)
+flock_SOURCES = flock.c
+flock_OBJECTS = flock.$(OBJEXT)
+flock_LDADD = $(LDADD)
+ipcrm_SOURCES = ipcrm.c
+ipcrm_OBJECTS = ipcrm.$(OBJEXT)
+ipcrm_LDADD = $(LDADD)
+ipcs_SOURCES = ipcs.c
+ipcs_OBJECTS = ipcs.$(OBJEXT)
+ipcs_LDADD = $(LDADD)
+rdev_SOURCES = rdev.c
+rdev_OBJECTS = rdev.$(OBJEXT)
+rdev_LDADD = $(LDADD)
+readprofile_SOURCES = readprofile.c
+readprofile_OBJECTS = readprofile.$(OBJEXT)
+readprofile_LDADD = $(LDADD)
+renice_SOURCES = renice.c
+renice_OBJECTS = renice.$(OBJEXT)
+renice_LDADD = $(LDADD)
+setsid_SOURCES = setsid.c
+setsid_OBJECTS = setsid.$(OBJEXT)
+setsid_LDADD = $(LDADD)
+tunelp_SOURCES = tunelp.c
+tunelp_OBJECTS = tunelp.$(OBJEXT)
+tunelp_LDADD = $(LDADD)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = ctrlaltdel.c cytune.c dmesg.c flock.c ipcrm.c ipcs.c rdev.c \
+	readprofile.c renice.c setsid.c tunelp.c
+DIST_SOURCES = ctrlaltdel.c cytune.c dmesg.c flock.c ipcrm.c ipcs.c \
+	rdev.c readprofile.c renice.c setsid.c tunelp.c
+INFO_DEPS = $(srcdir)/ipc.info
+TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
+am__TEXINFO_TEX_DIR = $(top_srcdir)/config
+DVIS = ipc.dvi
+PDFS = ipc.pdf
+PSS = ipc.ps
+HTMLS = ipc.html
+TEXINFOS = ipc.texi
+TEXI2DVI = texi2dvi
+TEXI2PDF = $(TEXI2DVI) --pdf --batch
+MAKEINFOHTML = $(MAKEINFO) --html
+AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
+DVIPS = dvips
+man1dir = $(mandir)/man1
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+man_MANS = flock.1 readprofile.1 ctrlaltdel.8 cytune.8 dmesg.8 ipcrm.8 \
+	ipcs.8 renice.8 setsid.8 tunelp.8 $(am__append_2)
+info_TEXINFOS = ipc.texi
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texi
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  sys-utils/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  sys-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
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-binPROGRAMS: $(bin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	done
+
+clean-usrbinPROGRAMS:
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-usrsbinPROGRAMS: $(usrsbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrsbindir)" || $(mkdir_p) "$(DESTDIR)$(usrsbindir)"
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrsbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrsbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrsbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrsbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrsbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrsbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrsbindir)/$$f"; \
+	done
+
+clean-usrsbinPROGRAMS:
+	@list='$(usrsbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrsbinPROGRAMS: $(usrsbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrsbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrsbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+ctrlaltdel$(EXEEXT): $(ctrlaltdel_OBJECTS) $(ctrlaltdel_DEPENDENCIES) 
+	@rm -f ctrlaltdel$(EXEEXT)
+	$(LINK) $(ctrlaltdel_LDFLAGS) $(ctrlaltdel_OBJECTS) $(ctrlaltdel_LDADD) $(LIBS)
+cytune$(EXEEXT): $(cytune_OBJECTS) $(cytune_DEPENDENCIES) 
+	@rm -f cytune$(EXEEXT)
+	$(LINK) $(cytune_LDFLAGS) $(cytune_OBJECTS) $(cytune_LDADD) $(LIBS)
+dmesg$(EXEEXT): $(dmesg_OBJECTS) $(dmesg_DEPENDENCIES) 
+	@rm -f dmesg$(EXEEXT)
+	$(LINK) $(dmesg_LDFLAGS) $(dmesg_OBJECTS) $(dmesg_LDADD) $(LIBS)
+flock$(EXEEXT): $(flock_OBJECTS) $(flock_DEPENDENCIES) 
+	@rm -f flock$(EXEEXT)
+	$(LINK) $(flock_LDFLAGS) $(flock_OBJECTS) $(flock_LDADD) $(LIBS)
+ipcrm$(EXEEXT): $(ipcrm_OBJECTS) $(ipcrm_DEPENDENCIES) 
+	@rm -f ipcrm$(EXEEXT)
+	$(LINK) $(ipcrm_LDFLAGS) $(ipcrm_OBJECTS) $(ipcrm_LDADD) $(LIBS)
+ipcs$(EXEEXT): $(ipcs_OBJECTS) $(ipcs_DEPENDENCIES) 
+	@rm -f ipcs$(EXEEXT)
+	$(LINK) $(ipcs_LDFLAGS) $(ipcs_OBJECTS) $(ipcs_LDADD) $(LIBS)
+rdev$(EXEEXT): $(rdev_OBJECTS) $(rdev_DEPENDENCIES) 
+	@rm -f rdev$(EXEEXT)
+	$(LINK) $(rdev_LDFLAGS) $(rdev_OBJECTS) $(rdev_LDADD) $(LIBS)
+readprofile$(EXEEXT): $(readprofile_OBJECTS) $(readprofile_DEPENDENCIES) 
+	@rm -f readprofile$(EXEEXT)
+	$(LINK) $(readprofile_LDFLAGS) $(readprofile_OBJECTS) $(readprofile_LDADD) $(LIBS)
+renice$(EXEEXT): $(renice_OBJECTS) $(renice_DEPENDENCIES) 
+	@rm -f renice$(EXEEXT)
+	$(LINK) $(renice_LDFLAGS) $(renice_OBJECTS) $(renice_LDADD) $(LIBS)
+setsid$(EXEEXT): $(setsid_OBJECTS) $(setsid_DEPENDENCIES) 
+	@rm -f setsid$(EXEEXT)
+	$(LINK) $(setsid_LDFLAGS) $(setsid_OBJECTS) $(setsid_LDADD) $(LIBS)
+tunelp$(EXEEXT): $(tunelp_OBJECTS) $(tunelp_DEPENDENCIES) 
+	@rm -f tunelp$(EXEEXT)
+	$(LINK) $(tunelp_LDFLAGS) $(tunelp_OBJECTS) $(tunelp_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctrlaltdel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cytune.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmesg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcrm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readprofile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renice.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setsid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tunelp.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+
+.texi.info:
+	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	am__cwd=`pwd` && cd $(srcdir) && \
+	rm -rf $$backupdir && mkdir $$backupdir && \
+	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
+	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
+	  done; \
+	else :; fi && \
+	cd "$$am__cwd"; \
+	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	 -o $@ $<; \
+	then \
+	  rc=0; \
+	  cd $(srcdir); \
+	else \
+	  rc=$$?; \
+	  cd $(srcdir) && \
+	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+	fi; \
+	rm -rf $$backupdir; exit $$rc
+
+.texi.dvi:
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+	$(TEXI2DVI) $<
+
+.texi.pdf:
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+	$(TEXI2PDF) $<
+
+.texi.html:
+	rm -rf $(@:.html=.htp)
+	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	 -o $(@:.html=.htp) $<; \
+	then \
+	  rm -rf $@; \
+	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+	else \
+	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
+	  exit 1; \
+	fi
+$(srcdir)/ipc.info: ipc.texi 
+ipc.dvi: ipc.texi 
+ipc.pdf: ipc.texi 
+ipc.html: ipc.texi 
+.dvi.ps:
+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(DVIPS) -o $@ $<
+
+uninstall-info-am:
+	@$(PRE_UNINSTALL)
+	@if (install-info --version && \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
+	    install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
+	  done; \
+	else :; fi
+	@$(NORMAL_UNINSTALL)
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
+	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  (if cd "$(DESTDIR)$(infodir)"; then \
+	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
+	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
+	   else :; fi); \
+	done
+
+dist-info: $(INFO_DEPS)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	list='$(INFO_DEPS)'; \
+	for base in $$list; do \
+	  case $$base in \
+	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
+	  esac; \
+	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
+	  for file in $$d/$$base*; do \
+	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
+	    test -f $(distdir)/$$relfile || \
+	      cp -p $$file $(distdir)/$$relfile; \
+	  done; \
+	done
+
+mostlyclean-aminfo:
+	-rm -rf ipc.aux ipc.cp ipc.cps ipc.fn ipc.fns ipc.ky ipc.kys ipc.log ipc.pg \
+	  ipc.pgs ipc.tmp ipc.toc ipc.tp ipc.tps ipc.vr ipc.vrs \
+	  ipc.dvi ipc.pdf ipc.ps ipc.html
+
+maintainer-clean-aminfo:
+	@list='$(INFO_DEPS)'; for i in $$list; do \
+	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
+	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
+	done
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+	done
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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-info
+check-am: all-am
+check: check-am
+all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(usrsbindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(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)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+@BUILD_RDEV_FALSE@install-exec-hook:
+@INTEL_FALSE@install-exec-hook:
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-sbinPROGRAMS clean-usrbinPROGRAMS clean-usrsbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am: $(DVIS)
+
+html: html-am
+
+html-am: $(HTMLS)
+
+info: info-am
+
+info-am: $(INFO_DEPS)
+
+install-data-am: install-info-am install-man install-usrbinPROGRAMS \
+	install-usrsbinPROGRAMS
+
+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
+install-info: install-info-am
+
+install-info-am: $(INFO_DEPS)
+	@$(NORMAL_INSTALL)
+	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  esac; \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
+                       $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+	    if test -f $$ifile; then \
+	      relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
+	      echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
+	      $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
+	    else : ; fi; \
+	  done; \
+	done
+	@$(POST_INSTALL)
+	@if (install-info --version && \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
+	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
+	  done; \
+	else : ; fi
+install-man: install-man1 install-man8
+
+installcheck-am: installcheck-binPROGRAMS installcheck-sbinPROGRAMS \
+	installcheck-usrbinPROGRAMS installcheck-usrsbinPROGRAMS
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+	maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am: $(PDFS)
+
+ps: ps-am
+
+ps-am: $(PSS)
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+	uninstall-sbinPROGRAMS uninstall-usrbinPROGRAMS \
+	uninstall-usrsbinPROGRAMS
+
+uninstall-man: uninstall-man1 uninstall-man8
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-sbinPROGRAMS \
+	clean-usrbinPROGRAMS clean-usrsbinPROGRAMS ctags dist-info \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-exec-hook install-info install-info-am install-man \
+	install-man1 install-man8 install-sbinPROGRAMS install-strip \
+	install-usrbinPROGRAMS install-usrsbinPROGRAMS installcheck \
+	installcheck-am installcheck-binPROGRAMS \
+	installcheck-sbinPROGRAMS installcheck-usrbinPROGRAMS \
+	installcheck-usrsbinPROGRAMS installdirs maintainer-clean \
+	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
+	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+	uninstall-man uninstall-man1 uninstall-man8 \
+	uninstall-sbinPROGRAMS uninstall-usrbinPROGRAMS \
+	uninstall-usrsbinPROGRAMS
+
+
+@BUILD_RDEV_TRUE@@INTEL_TRUE@install-exec-hook:
+@BUILD_RDEV_TRUE@@INTEL_TRUE@	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev ramsize
+@BUILD_RDEV_TRUE@@INTEL_TRUE@	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev vidmode
+@BUILD_RDEV_TRUE@@INTEL_TRUE@	cd $(DESTDIR)$(usrsbindir) && ln -sf rdev rootflags
+# 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 --git a/sys-utils/arch.1 b/sys-utils/arch.1
deleted file mode 100644
index 3eaf4f380..000000000
--- a/sys-utils/arch.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.\" arch.1 -- 
-.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
-.\" Public domain: may be freely distributed.
-.TH ARCH 1 "4 July 1997" "Linux 2.0" "Linux Programmer's Manual"
-.SH NAME
-arch \- print machine architecture
-.SH SYNOPSIS
-.B arch
-.SH DESCRIPTION
-.B arch
-is equivalent to
-.BR "uname -m" .
-
-On current Linux systems,
-.B arch
-prints things such as "i386", "i486", "i586", "alpha", "sparc",
-"arm", "m68k", "mips", "ppc".
-.SH SEE ALSO
-.BR uname (1),
-.BR uname (2)
-.\"
-.\" Details:
-.\" arch prints the machine part of the system_utsname struct
-.\" This struct is defined in version.c, and this field is
-.\" initialized with UTS_MACHINE, which is defined as $ARCH
-.\" in the main Makefile.
-.\" That gives the possibilities 
-.\" alpha    arm      i386     m68k     mips     ppc      sparc    sparc64
-.\"
-.\" If Makefile is not edited, ARCH is guessed by
-.\" ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/)
-.\" Then how come we get these i586 values?
-.\" Well, the routine check_bugs() does system_utsname.machine[1] = '0' + x86;
-.\" (called in init/main.c, defined in ./include/asm-i386/bugs.h)
diff --git a/sys-utils/arch.c b/sys-utils/arch.c
deleted file mode 100644
index 33dff304b..000000000
--- a/sys-utils/arch.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* arch -- print machine architecture information
- * Created: Mon Dec 20 12:27:15 1993 by faith@cs.unc.edu
- * Revised: Mon Dec 20 12:29:23 1993 by faith@cs.unc.edu
- * Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
-
- * 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, 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.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <stdio.h>
-#include <sys/utsname.h>
-
-int main (void)
-{
-  struct utsname utsbuf;
-
-  if (uname( &utsbuf )) {
-     perror( "arch" );
-     return 1;
-  }
-
-  printf( "%s\n", utsbuf.machine );
-
-  return 0;
-}
diff --git a/sys-utils/flock.1 b/sys-utils/flock.1
index dda0a0cfc..e9cdb979a 100644
--- a/sys-utils/flock.1
+++ b/sys-utils/flock.1
@@ -3,7 +3,9 @@
 flock \- acquire a file lock and then execute a command with the lock held
 .SH SYNOPSIS
 .BR flock
-[ \fB\-\-shared\fR | \fB\-\-timeout=\fR\fIseconds\fR ] lockfile command ..
+.RB [ \-\-shared ]
+.RB [ \-\-timeout=\fP\fIseconds\fP ]
+.I lockfile command ...
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 524d28a64..27d78d43c 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 
 	if (argc < 2) {
 		fprintf(stderr,
-			_("Usage flock [--shared | --timeout=seconds] "
+			_("Usage flock [--shared] [--timeout=seconds] "
 			  "filename command {arg arg...}\n"));
 		exit(2);
 	}
diff --git a/sys-utils/ipc.info b/sys-utils/ipc.info
index 5bb1a5383..a1fe498e5 100644
--- a/sys-utils/ipc.info
+++ b/sys-utils/ipc.info
@@ -1,4 +1,4 @@
-This is ipc.info, produced by makeinfo version 4.0 from ipc.texi.
+This is ipc.info, produced by makeinfo version 4.7 from ipc.texi.
 
    This file documents the System V style inter process communication
 primitives available under linux.
@@ -16,13 +16,12 @@ END-INFO-DIR-ENTRY
 
 File: ipc.info,  Node: Top,  Next: Overview,  Prev: Notes,  Up: (dir)
 
-System V IPC.
-*************
+1 System V IPC.
+***************
 
-   These facilities are provided to maintain compatibility with
-programs developed on system V unix systems and others that rely on
-these system V mechanisms to accomplish inter process communication
-(IPC).
+These facilities are provided to maintain compatibility with programs
+developed on system V unix systems and others that rely on these system
+V mechanisms to accomplish inter process communication (IPC).
 
    The specifics described here are applicable to the Linux
 implementation.  Other implementations may do things slightly
@@ -39,8 +38,8 @@ differently.
 
 File: ipc.info,  Node: Overview,  Next: example,  Prev: Top,  Up: Top
 
-Overview
-========
+1.1 Overview
+============
 
 System V IPC consists of three mechanisms:
 
@@ -87,11 +86,11 @@ detailed in the following sections.
 
 File: ipc.info,  Node: example,  Next: perms,  Prev: Overview,  Up: Overview
 
-example
-=======
+1.2 example
+===========
 
-   Here is a code fragment with pointers on how to use shared memory.
-The same methods are applicable to other resources.
+Here is a code fragment with pointers on how to use shared memory. The
+same methods are applicable to other resources.
 
    In a typical access sequence the creator allocates a new instance of
 the resource with the `get' system call using the IPC_CREAT flag.
@@ -103,7 +102,7 @@ creator process:
      char proc_id = 'C';
      int size = 0x5000;	/* 20 K */
      int flags = 0664 | IPC_CREAT;		/* read-only for others */
-     
+
      key = ftok ("~creator/ipckey", proc_id);
      id = shmget (key, size, flags);
      exit (0);	/* quit leaving resource allocated */
@@ -115,19 +114,19 @@ Client process:
      int id;
      key_t key;
      char proc_id = 'C';
-     
+
      key = ftok ("~creator/ipckey", proc_id);
-     
+
      id = shmget (key, 0, 004);		/* default size   */
      if (id == -1)
            perror ("shmget ...");
-     
+
      shmaddr = shmat (id, 0, SHM_RDONLY); /* attach segment for reading */
      if (shmaddr == (char *) -1)
            perror ("shmat ...");
-     
+
      local_var = *(shmaddr + 3); 	/* read segment etc. */
-     
+
      shmdt (shmaddr);		/* detach segment */
 
 When the resource is no longer needed the creator should remove it.
@@ -139,10 +138,10 @@ Creator/owner process 2:
 
 File: ipc.info,  Node: perms,  Next: syscalls,  Prev: example,  Up: Overview
 
-Permissions
-===========
+1.3 Permissions
+===============
 
-   Each resource has an associated `ipc_perm' struct which defines the
+Each resource has an associated `ipc_perm' struct which defines the
 creator, owner and access perms for the resource.
 
      struct ipc_perm
@@ -179,10 +178,10 @@ user.
 
 File: ipc.info,  Node: syscalls,  Next: Messages,  Prev: perms,  Up: Overview
 
-IPC system calls
-================
+1.4 IPC system calls
+====================
 
-   This section provides an overview of the IPC system calls. See the
+This section provides an overview of the IPC system calls. See the
 specific sections on each type of resource for details.
 
    Each type of mechanism provides a "get", "ctl" and one or more "op"
@@ -190,13 +189,13 @@ system calls that allow the user to create or procure the resource
 (get), define its behaviour or destroy it (ctl) and manipulate the
 resources (op).
 
-The "get" system calls
-----------------------
+1.4.1 The "get" system calls
+----------------------------
 
-   The `get' call typically takes a KEY and returns a numeric ID that
-is used for further access.  The ID is an index into the resource
-table. A sequence number is maintained and incremented when a resource
-is destroyed so that access using an obsolete ID is likely to fail.
+The `get' call typically takes a KEY and returns a numeric ID that is
+used for further access.  The ID is an index into the resource table. A
+sequence number is maintained and incremented when a resource is
+destroyed so that access using an obsolete ID is likely to fail.
 
    The user also specifies the permissions and other behaviour
 charecteristics for the current access. The flags are or-ed with the
@@ -226,10 +225,10 @@ resource was initialized. It does not imply exclusive access.
 
 See Also : *Note msgget::, *Note semget::, *Note shmget::.
 
-The "ctl" system calls
-----------------------
+1.4.2 The "ctl" system calls
+----------------------------
 
-   Provides or alters the information stored in the structure that
+Provides or alters the information stored in the structure that
 describes the resource indexed by ID.
 
      #include <sys/msg.h>
@@ -260,10 +259,10 @@ the user to determine or set the values of the semaphores in an array.
 
 See Also: *Note msgctl::, *Note semctl::, *Note shmctl::.
 
-The "op" system calls
----------------------
+1.4.3 The "op" system calls
+---------------------------
 
-   Used to send or receive messages, read or alter semaphore values,
+Used to send or receive messages, read or alter semaphore values,
 attach or detach shared memory segments.  The IPC_NOWAIT flag will
 cause the operation to fail with error EAGAIN if the process has to
 wait on the call.
@@ -276,10 +275,10 @@ See Also: *Note msgsnd::,*Note msgrcv::,*Note semop::,*Note shmat::,
 
 File: ipc.info,  Node: Messages,  Next: msgget,  Prev: syscalls,  Up: Top
 
-Messages
-========
+1.5 Messages
+============
 
-   A message resource is described by a struct `msqid_ds' which is
+A message resource is described by a struct `msqid_ds' which is
 allocated and initialized when the resource is created. Some fields in
 `msqid_ds' can then be altered (if desired) by invoking `msgctl'.  The
 memory used by the resource is released when it is destroyed by a
@@ -328,8 +327,8 @@ this message and free the associated struct `msg'.
 
 File: ipc.info,  Node: msgget,  Next: msgsnd,  Prev: Messages,  Up: Messages
 
-msgget
-------
+1.5.1 msgget
+------------
 
 A message queue is allocated by a msgget system call :
 
@@ -367,8 +366,8 @@ ENOMEM : A new `msqid_ds' was to be created but ... nomem.
 
 File: ipc.info,  Node: msgsnd,  Next: msgrcv,  Prev: msgget,  Up: Messages
 
-msgsnd
-------
+1.5.2 msgsnd
+------------
 
      int msgsnd (int msqid, struct msgbuf *msgp, int msgsz, int msgflg);
 
@@ -397,8 +396,8 @@ ENOMEM : Could not allocate space for header and text.
 
 File: ipc.info,  Node: msgrcv,  Next: msgctl,  Prev: msgsnd,  Up: Messages
 
-msgrcv
-------
+1.5.3 msgrcv
+------------
 
      int msgrcv (int msqid, struct msgbuf *msgp, int msgsz, long msgtyp,
      			int msgflg);
@@ -450,8 +449,8 @@ ENOMSG : msg of requested type not found and IPC_NOWAIT specified.
 
 File: ipc.info,  Node: msgctl,  Next: msglimits,  Prev: msgrcv,  Up: Messages
 
-msgctl
-------
+1.5.4 msgctl
+------------
 
      int msgctl (int msqid, int cmd, struct msqid_ds *buf);
 
@@ -475,10 +474,8 @@ message queue beyond MSGMNB.
 incremented and all waiting readers and writers are awakened.  These
 processes will then return with `errno' set to EIDRM.
 
-Errors:
-
-EPERM  : Insufficient privilege to increase the size of the queue
-(IPC_SET) or remove it (IPC_RMID).
+Errors: EPERM  : Insufficient privilege to increase the size of the
+queue (IPC_SET) or remove it (IPC_RMID).
 EACCES : Do not have permission for reading the queue (IPC_STAT).
 EFAULT : buf not accessible (IPC_STAT, IPC_SET).
 EIDRM  : msg queue was removed.
@@ -487,8 +484,8 @@ EINVAL : invalid cmd, msqid < 0 or unused.
 
 File: ipc.info,  Node: msglimits,  Next: Semaphores,  Prev: msgctl,  Up: Messages
 
-Limis on Message Resources
---------------------------
+1.5.5 Limis on Message Resources
+--------------------------------
 
 Sizeof various structures:
      msqid_ds        52   /* 1 per message  queue .. dynamic */
@@ -515,11 +512,11 @@ MSGPOOL total size in bytes of msg pool.
 
 File: ipc.info,  Node: Semaphores,  Next: semget,  Prev: msglimits,  Up: Top
 
-Semaphores
-==========
+1.6 Semaphores
+==============
 
-   Each semaphore has a value >= 0. An id provides access to an array
-of `nsems' semaphores. Operations such as read, increment or decrement
+Each semaphore has a value >= 0. An id provides access to an array of
+`nsems' semaphores. Operations such as read, increment or decrement
 semaphores in a set are performed by the `semop' call which processes
 `nsops' operations at a time. Each operation is specified in a struct
 `sembuf' described below. The operations are applied only if all of
@@ -565,8 +562,8 @@ Each semaphore is described internally by :
 
 File: ipc.info,  Node: semget,  Next: semop,  Prev: Semaphores,  Up: Semaphores
 
-semget
-------
+1.6.1 semget
+------------
 
 A semaphore array is allocated by a semget system call:
 
@@ -611,8 +608,8 @@ EACCES : (procure) do not have permission for specified access.
 
 File: ipc.info,  Node: semop,  Next: semctl,  Prev: semget,  Up: Semaphores
 
-semop
------
+1.6.2 semop
+-----------
 
 Operations on semaphore arrays are performed by calling semop :
 
@@ -676,8 +673,8 @@ ERANGE : sem_op + semval > SEMVMX for some operation.
 
 File: ipc.info,  Node: semctl,  Next: semlimits,  Prev: semop,  Up: Semaphores
 
-semctl
-------
+1.6.3 semctl
+------------
 
      int semctl (int semid, int semnum, int cmd, union semun arg);
 
@@ -721,9 +718,7 @@ The last two operate on all semaphores in the set.
    * IPC_SET : sem_perm.uid, sem_perm.gid, sem_perm.mode are updated
      from user supplied values.
 
-Errors:
-
-EACCES : do not have permission for specified access.
+Errors: EACCES : do not have permission for specified access.
 EFAULT : arg is not accessible.
 EIDRM  : The resource was removed.
 EINVAL : semid < 0 or semnum < 0 or semnum >= nsems.
@@ -733,8 +728,8 @@ ERANGE : arg.array[i].semval > SEMVMX or < 0 for some i.
 
 File: ipc.info,  Node: semlimits,  Next: Shared Memory,  Prev: semctl,  Up: Semaphores
 
-Limits on Semaphore Resources
------------------------------
+1.6.4 Limits on Semaphore Resources
+-----------------------------------
 
 Sizeof various structures:
      semid_ds    44   /* 1 per semaphore array .. dynamic */
@@ -767,10 +762,10 @@ SEMUME  maximum number of undo entries per process.
 
 File: ipc.info,  Node: Shared Memory,  Next: shmget,  Prev: semlimits,  Up: Top
 
-Shared Memory
-=============
+1.7 Shared Memory
+=================
 
-   Shared memory is distinct from the sharing of read-only code pages or
+Shared memory is distinct from the sharing of read-only code pages or
 the sharing of unaltered data pages that is available due to the
 copy-on-write mechanism. The essential difference is that the shared
 pages are dirty (in the case of Shared memory) and can be made to
@@ -805,8 +800,8 @@ calling shmctl with IPC_RMID.
 
 File: ipc.info,  Node: shmget,  Next: shmat,  Prev: Shared Memory,  Up: Shared Memory
 
-shmget
-------
+1.7.1 shmget
+------------
 
 A shared memory segment is allocated by a shmget system call:
 
@@ -853,8 +848,8 @@ ENOMEM : (allocate) Could not allocate memory for shmid_ds or pg_table.
 
 File: ipc.info,  Node: shmat,  Next: shmdt,  Prev: shmget,  Up: Shared Memory
 
-shmat
------
+1.7.2 shmat
+-----------
 
 Maps a shared segment into the process' address space.
 
@@ -905,8 +900,8 @@ ENOMEM : Could not allocate memory for descriptor or page tables.
 
 File: ipc.info,  Node: shmdt,  Next: shmctl,  Prev: shmat,  Up: Shared Memory
 
-shmdt
------
+1.7.3 shmdt
+-----------
 
      int shmdt (char *shmaddr);
 
@@ -925,8 +920,8 @@ EINVAL : No shared memory segment attached at shmaddr.
 
 File: ipc.info,  Node: shmctl,  Next: shmlimits,  Prev: shmdt,  Up: Shared Memory
 
-shmctl
-------
+1.7.4 shmctl
+------------
 
 Destroys allocated segments. Reads/Writes the control structures.
 
@@ -962,8 +957,8 @@ EPERM  : not creator, owner or super-user (IPC_SET, IPC_RMID).
 
 File: ipc.info,  Node: shmlimits,  Next: Notes,  Prev: shmctl,  Up: Shared Memory
 
-Limits on Shared Memory Resources
----------------------------------
+1.7.5 Limits on Shared Memory Resources
+---------------------------------------
 
 Limits:
    * SHMMNI  max num of shared segments system wide ... 4096.
@@ -977,23 +972,22 @@ Limits:
 
    * SHMLBA  segment low boundary address multiple.  Must be page
      aligned. SHMLBA = PAGE_SIZE.
-
-Unused or unimplemented:
+   Unused or unimplemented:
 SHMSEG : maximum number of shared segments per process.
 
 
 File: ipc.info,  Node: Notes,  Next: Top,  Prev: shmlimits,  Up: Top
 
-Miscellaneous Notes
-===================
+1.8 Miscellaneous Notes
+=======================
 
-   The system calls are mapped into one - `sys_ipc'. This should be
+The system calls are mapped into one - `sys_ipc'. This should be
 transparent to the user.
 
-Semaphore `undo' requests
--------------------------
+1.8.1 Semaphore `undo' requests
+-------------------------------
 
-   There is one sem_undo structure associated with a process for each
+There is one sem_undo structure associated with a process for each
 semaphore which was altered (with an undo request) by the process.
 `sem_undo' structures are freed only when the process exits.
 
@@ -1008,13 +1002,12 @@ applied with the IPC_NOWAIT flag in effect?  Currently  those undo
 operations which go through immediately are applied and those that
 require a wait are ignored silently.
 
-Shared memory, `malloc' and the `brk'.
---------------------------------------
+1.8.2 Shared memory, `malloc' and the `brk'.
+--------------------------------------------
 
-   Note that since this section was written the implementation was
-changed so that non-specific attaches are done in the region 1G - 1.5G.
-However much of the following is still worth thinking about so I left
-it in.
+Note that since this section was written the implementation was changed
+so that non-specific attaches are done in the region 1G - 1.5G. However
+much of the following is still worth thinking about so I left it in.
 
    On many systems, the shared memory is allocated in a special region
 of the address space ... way up somewhere. As mentioned earlier, this
@@ -1048,11 +1041,11 @@ what is really a shared memory region. For example in the case of a
 read-only attach, you will not be able to write to the overlapped
 portion.
 
-Fork, exec and exit
--------------------
+1.8.3 Fork, exec and exit
+-------------------------
 
-   On a fork, the child inherits attached shared memory segments but
-not the semaphore undo information.
+On a fork, the child inherits attached shared memory segments but not
+the semaphore undo information.
 
    In the case of an exec, the attached shared segments are detached.
 The sem undo information however remains intact.
@@ -1061,11 +1054,11 @@ The sem undo information however remains intact.
 adjust values in the undo structures are added to the relevant semvals
 if the operations are permitted. Disallowed operations are ignored.
 
-Other Features
---------------
+1.8.4 Other Features
+--------------------
 
-   These features of the current implementation are likely to be
-modified in the future.
+These features of the current implementation are likely to be modified
+in the future.
 
    The SHM_LOCK and SHM_UNLOCK flag are available (super-user) for use
 with the `shmctl' call to prevent swapping of a shared segment. The user
@@ -1088,27 +1081,27 @@ And more thanks to Bruno.
 
 Tag Table:
 Node: Top469
-Node: Overview1170
-Node: example3004
-Node: perms4506
-Node: syscalls6066
-Node: Messages9519
-Node: msgget11554
-Node: msgsnd12938
-Node: msgrcv13906
-Node: msgctl15605
-Node: msglimits16814
-Node: Semaphores17691
-Node: semget19650
-Node: semop21203
-Node: semctl23767
-Node: semlimits25526
-Node: Shared Memory26668
-Node: shmget28153
-Node: shmat29948
-Node: shmdt31985
-Node: shmctl32518
-Node: shmlimits33649
-Node: Notes34298
+Node: Overview1171
+Node: example3013
+Node: perms4490
+Node: syscalls6055
+Node: Messages9540
+Node: msgget11580
+Node: msgsnd12976
+Node: msgrcv13956
+Node: msgctl15667
+Node: msglimits16887
+Node: Semaphores17776
+Node: semget19740
+Node: semop21305
+Node: semctl23881
+Node: semlimits25651
+Node: Shared Memory26805
+Node: shmget28295
+Node: shmat30102
+Node: shmdt32151
+Node: shmctl32696
+Node: shmlimits33839
+Node: Notes34502
 
 End Tag Table
diff --git a/sys-utils/ipcs.8 b/sys-utils/ipcs.8
index 97fddf51c..03c86aa4e 100644
--- a/sys-utils/ipcs.8
+++ b/sys-utils/ipcs.8
@@ -12,7 +12,7 @@ ipcs \- provide information on ipc facilities
 .SH DESCRIPTION
 .B ipcs
 provides information on the ipc facilities for which the calling process
-has read acccess.
+has read access.
 
 The
 .B \-i
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index d70eb7339..6e1c3fcf0 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -195,7 +195,7 @@ main(int argc, char **argv) {
 			break;
 		case 'V':
 			printf(_("%s version %s\n"), prgname,
-			       UTIL_LINUX_VERSION);
+			       VERSION);
 			exit(0);
 		default:
 			usage();
diff --git a/sys-utils/renice.8 b/sys-utils/renice.8
index 7c1222cd2..2a30f6e97 100644
--- a/sys-utils/renice.8
+++ b/sys-utils/renice.8
@@ -126,7 +126,7 @@ Non super-users can not increase scheduling priorities of their own processes,
 even if they were the ones that decreased the priorities in the first place.
 .br
 The Linux kernel (at least version 2.0.0) and linux libc (at least
-version 5.2.18) does not agree entierly on what the specifics of the
+version 5.2.18) does not agree entirely on what the specifics of the
 systemcall interface to set nice values is.  Thus causes renice to
 report bogus previous nice values.
 .Sh HISTORY
diff --git a/sys-utils/sln.8 b/sys-utils/sln.8
deleted file mode 100644
index f97683d47..000000000
--- a/sys-utils/sln.8
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" Nicolai Langfeldt (janl@math.uio.no)
-.\" In the public domain.
-.TH SLN 8 "20 June 1997" "Linux 2.0" "Linux Programmer's Manual"
-.SH NAME
-sln \- static ln
-.SH SYNOPSIS
-.BI sln " source dest"
-.SH DESCRIPTION
-.B sln
-symbolically links 
-.I dest
-to
-.IR source .
-It is statically linked, needing no dynamic linking at all.  Thus
-.B sln
-is useful to make symbolic links to dynamic libraries if the
-dynamic linking system for some reason is nonfunctional.
-.SH "SEE ALSO"
-.BR ln(1)
-.BR ldconfig(8)
-.BR ld.so(8)
-.\" .SH AUTHOR
-.\" Mike Parker and David MacKenzie.
diff --git a/sys-utils/sln.c b/sys-utils/sln.c
deleted file mode 100644
index 8c70114a4..000000000
--- a/sys-utils/sln.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* `sln' program to create links between files.
-   Copyright (C) 1986, 1989, 1990, 1991, 1993 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
-   the Free Software Foundation; either version 2, 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* Written by Mike Parker and David MacKenzie. */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define	S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
-int
-main (int argc, char **argv) {
-  struct stat stats;
-
-  if (argc != 3) return 1;
-
-  /* Destination must not be a directory. */
-#if 0
-  if (stat (argv [2], &stats) == 0 && S_ISDIR (stats.st_mode))
-    {
-      return 1;
-    }
-#endif
-
-  if (lstat (argv [2], &stats) == 0)
-    {
-      if (S_ISDIR (stats.st_mode))
-	{
-	  return 1;
-	}
-      else if (unlink (argv [2]) && errno != ENOENT)
-	{
-	  return 1;
-	}
-    }
-  else if (errno != ENOENT)
-    {
-      return 1;
-    }
-       
-#ifdef S_ISLNK
-  if (symlink (argv [1], argv [2]) == 0)
-#else
-  if (link (argv [1], argv [2]) == 0)
-#endif
-    {
-      return 0;
-    }
-
-  return 1;
-}
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 90105dcb4..168a7c6a0 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -81,7 +81,7 @@ print_usage(char *progname) {
 
 static void
 print_version(char *progname) {
-  printf("%s %s\n", progname, UTIL_LINUX_VERSION);
+  printf("%s %s\n", progname, VERSION);
 }
 
 static void *
diff --git a/testincl b/testincl
deleted file mode 100755
index e1f9bb450..000000000
--- a/testincl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# call:
-#	COMPILE=...; export COMPILE
-#	if ./testincl [-q] "foo.h" ...
-#
-echo=echo
-case $1 in -q)
-    echo=":"
-    shift
-    ;;
-esac
-IFILE="<$1>"
-
-echo "
-#include $IFILE
-main(){ exit(0); }
-" > conftest.c
-eval $COMPILE
-# Brian Murphy asks not to run conftest since that fails on cross-compilation.
-# Maybe just testing for the existence of conftest suffices.
-# if test -s conftest && ./conftest 2>/dev/null; then
-if test -s conftest 2>/dev/null; then
-	res=0
-	$echo "You have $IFILE"
-else
-        res=1
-	$echo "You don't have $IFILE"
-fi
-rm -f conftest conftest.c
-exit $res
diff --git a/text-utils/Makefile b/text-utils/Makefile
deleted file mode 100644
index cbe3a5ad2..000000000
--- a/text-utils/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-# Created: Sat Dec 26 20:09:40 1992
-# Revised: Mon Aug 19 20:11:15 1996 by faith@cs.unc.edu
-# Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu)
-#
-include ../make_include
-include ../MCONFIG
-
-MAN1= 		col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
-
-USRBIN=		col colcrt colrm column hexdump rev line tailf
-
-BIN=
-
-MAYBE=		more pg ul
-
-ifeq "$(HAVE_NCURSES)" "yes"
-BIN:=$(BIN) more
-USRBIN:=$(USRBIN) ul pg
-MAN1:=$(MAN1) ul.1 more.1 pg.1
-else
-ifeq "$(HAVE_TERMCAP)" "yes"
-BIN:=$(BIN) more
-MAN1:=$(MAN1) more.1
-endif
-endif
-
-# Is pg silent?
-ifeq "$(SILENT_PG)" "yes"
-CFLAGS:=$(CFLAGS) -DPGNOBELL
-endif
-
-all: $(BIN) $(USRBIN)
-
-# more and pg and ul use curses - maybe we can't compile them
-ifeq "$(HAVE_NCURSES)" "yes"
-# Have ncurses - make more and pg and ul
-more pg ul:
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
-more: more.o $(LIB)/xstrncpy.o
-pg: pg.o
-ul: ul.o
-else
-# Do not have ncurses - give up on pg and ul
-pg ul:
-	@echo $@ not made since it requires ncurses
-# For more we can also try termcap
-ifeq "$(HAVE_TERMCAP)" "yes"
-more: more.o $(LIB)/xstrncpy.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP)
-else
-more:
-	@echo $@ not made since it requires ncurses or termcap
-endif
-endif
-
-# Rules for hexdump
-hexdump: hexdump.o conv.o display.o hexsyntax.o odsyntax.o parse.o
-hexdump.o: hexdump.c hexdump.h
-conv.o: conv.c hexdump.h
-display.o: display.c hexdump.h
-hexsyntax.o: hexsyntax.c hexdump.h
-odsyntax.o: odsyntax.c hexdump.h
-parse.o: parse.c hexdump.h
-
-# Rules for everything else
-col: col.o
-colcrt: colcrt.o
-colrm: colrm.o
-column.o: $(LIB)/errs.h
-column: column.o $(ERR_O)
-more.o: more.c $(LIB)/pathnames.h
-rev: rev.o
-line: line.o
-tailf: tailf.o
-
-colcrt.o colrm.o column.o rev.o ul.o: $(LIB)/widechar.h
-
-install install.shadow install.text-utils: all
-	$(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(MAN1DIR)
-ifneq "$(BIN)" ""
-	$(INSTALLBIN) $(BIN) $(BINDIR)
-endif
-	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
-	$(INSTALLMAN) $(MAN1) $(MAN1DIR)
-
-.PHONY: clean distclean
-clean:
-	-rm -f *.o *~ core $(BIN) $(USRBIN) $(MAYBE)
-
-distclean: clean
diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am
new file mode 100644
index 000000000..3248a0948
--- /dev/null
+++ b/text-utils/Makefile.am
@@ -0,0 +1,22 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+usrbin_PROGRAMS = col colcrt colrm column hexdump rev line tailf
+
+hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c odsyntax.c parse.c
+
+man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
+
+if HAVE_NCURSES
+bin_PROGRAMS = more
+usrbin_PROGRAMS += ul pg
+more_LDADD = -lncurses
+pg_LDADD = -lncurses
+ul_LDADD = -lncurses
+man_MANS += ul.1 more.1 pg.1
+else
+if HAVE_TERMCAP
+bin_PROGRAMS = more
+more_LDADD = -ltermcap
+man_MANS += more.1
+endif
+endif
\ No newline at end of file
diff --git a/text-utils/Makefile.in b/text-utils/Makefile.in
new file mode 100644
index 000000000..5c0e31293
--- /dev/null
+++ b/text-utils/Makefile.in
@@ -0,0 +1,736 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+usrbin_PROGRAMS = col$(EXEEXT) colcrt$(EXEEXT) colrm$(EXEEXT) \
+	column$(EXEEXT) hexdump$(EXEEXT) rev$(EXEEXT) line$(EXEEXT) \
+	tailf$(EXEEXT) $(am__EXEEXT_1)
+@HAVE_NCURSES_FALSE@@HAVE_TERMCAP_TRUE@bin_PROGRAMS = more$(EXEEXT)
+@HAVE_NCURSES_TRUE@bin_PROGRAMS = more$(EXEEXT)
+@HAVE_NCURSES_TRUE@am__append_1 = ul pg
+@HAVE_NCURSES_TRUE@am__append_2 = ul.1 more.1 pg.1
+@HAVE_NCURSES_FALSE@@HAVE_TERMCAP_TRUE@am__append_3 = more.1
+subdir = text-utils
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.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 = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(usrbindir)" \
+	"$(DESTDIR)$(man1dir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@HAVE_NCURSES_TRUE@am__EXEEXT_1 = ul$(EXEEXT) pg$(EXEEXT)
+usrbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(usrbin_PROGRAMS)
+col_SOURCES = col.c
+col_OBJECTS = col.$(OBJEXT)
+col_LDADD = $(LDADD)
+colcrt_SOURCES = colcrt.c
+colcrt_OBJECTS = colcrt.$(OBJEXT)
+colcrt_LDADD = $(LDADD)
+colrm_SOURCES = colrm.c
+colrm_OBJECTS = colrm.$(OBJEXT)
+colrm_LDADD = $(LDADD)
+column_SOURCES = column.c
+column_OBJECTS = column.$(OBJEXT)
+column_LDADD = $(LDADD)
+am_hexdump_OBJECTS = hexdump.$(OBJEXT) conv.$(OBJEXT) \
+	display.$(OBJEXT) hexsyntax.$(OBJEXT) odsyntax.$(OBJEXT) \
+	parse.$(OBJEXT)
+hexdump_OBJECTS = $(am_hexdump_OBJECTS)
+hexdump_LDADD = $(LDADD)
+line_SOURCES = line.c
+line_OBJECTS = line.$(OBJEXT)
+line_LDADD = $(LDADD)
+more_SOURCES = more.c
+more_OBJECTS = more.$(OBJEXT)
+more_DEPENDENCIES =
+pg_SOURCES = pg.c
+pg_OBJECTS = pg.$(OBJEXT)
+pg_DEPENDENCIES =
+rev_SOURCES = rev.c
+rev_OBJECTS = rev.$(OBJEXT)
+rev_LDADD = $(LDADD)
+tailf_SOURCES = tailf.c
+tailf_OBJECTS = tailf.$(OBJEXT)
+tailf_LDADD = $(LDADD)
+ul_SOURCES = ul.c
+ul_OBJECTS = ul.$(OBJEXT)
+ul_DEPENDENCIES =
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = col.c colcrt.c colrm.c column.c $(hexdump_SOURCES) line.c \
+	more.c pg.c rev.c tailf.c ul.c
+DIST_SOURCES = col.c colcrt.c colrm.c column.c $(hexdump_SOURCES) \
+	line.c more.c pg.c rev.c tailf.c ul.c
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+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@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c odsyntax.c parse.c
+man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 \
+	tailf.1 $(am__append_2) $(am__append_3)
+@HAVE_NCURSES_FALSE@@HAVE_TERMCAP_TRUE@more_LDADD = -ltermcap
+@HAVE_NCURSES_TRUE@more_LDADD = -lncurses
+@HAVE_NCURSES_TRUE@pg_LDADD = -lncurses
+@HAVE_NCURSES_TRUE@ul_LDADD = -lncurses
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  text-utils/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  text-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
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-binPROGRAMS: $(bin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+install-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-usrbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	done
+
+clean-usrbinPROGRAMS:
+	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+installcheck-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	bad=0; pid=$$$$; list="$(usrbin_PROGRAMS)"; for p in $$list; do \
+	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+	  esac; \
+	  f=`echo "$$p" | \
+	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  for opt in --help --version; do \
+	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
+		 && test -n "`cat c$${pid}_.out`" \
+		 && test -z "`cat c$${pid}_.err`"; then :; \
+	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+	  done; \
+	done; rm -f c$${pid}_.???; exit $$bad
+col$(EXEEXT): $(col_OBJECTS) $(col_DEPENDENCIES) 
+	@rm -f col$(EXEEXT)
+	$(LINK) $(col_LDFLAGS) $(col_OBJECTS) $(col_LDADD) $(LIBS)
+colcrt$(EXEEXT): $(colcrt_OBJECTS) $(colcrt_DEPENDENCIES) 
+	@rm -f colcrt$(EXEEXT)
+	$(LINK) $(colcrt_LDFLAGS) $(colcrt_OBJECTS) $(colcrt_LDADD) $(LIBS)
+colrm$(EXEEXT): $(colrm_OBJECTS) $(colrm_DEPENDENCIES) 
+	@rm -f colrm$(EXEEXT)
+	$(LINK) $(colrm_LDFLAGS) $(colrm_OBJECTS) $(colrm_LDADD) $(LIBS)
+column$(EXEEXT): $(column_OBJECTS) $(column_DEPENDENCIES) 
+	@rm -f column$(EXEEXT)
+	$(LINK) $(column_LDFLAGS) $(column_OBJECTS) $(column_LDADD) $(LIBS)
+hexdump$(EXEEXT): $(hexdump_OBJECTS) $(hexdump_DEPENDENCIES) 
+	@rm -f hexdump$(EXEEXT)
+	$(LINK) $(hexdump_LDFLAGS) $(hexdump_OBJECTS) $(hexdump_LDADD) $(LIBS)
+line$(EXEEXT): $(line_OBJECTS) $(line_DEPENDENCIES) 
+	@rm -f line$(EXEEXT)
+	$(LINK) $(line_LDFLAGS) $(line_OBJECTS) $(line_LDADD) $(LIBS)
+more$(EXEEXT): $(more_OBJECTS) $(more_DEPENDENCIES) 
+	@rm -f more$(EXEEXT)
+	$(LINK) $(more_LDFLAGS) $(more_OBJECTS) $(more_LDADD) $(LIBS)
+pg$(EXEEXT): $(pg_OBJECTS) $(pg_DEPENDENCIES) 
+	@rm -f pg$(EXEEXT)
+	$(LINK) $(pg_LDFLAGS) $(pg_OBJECTS) $(pg_LDADD) $(LIBS)
+rev$(EXEEXT): $(rev_OBJECTS) $(rev_DEPENDENCIES) 
+	@rm -f rev$(EXEEXT)
+	$(LINK) $(rev_LDFLAGS) $(rev_OBJECTS) $(rev_LDADD) $(LIBS)
+tailf$(EXEEXT): $(tailf_OBJECTS) $(tailf_DEPENDENCIES) 
+	@rm -f tailf$(EXEEXT)
+	$(LINK) $(tailf_LDFLAGS) $(tailf_OBJECTS) $(tailf_LDADD) $(LIBS)
+ul$(EXEEXT): $(ul_OBJECTS) $(ul_DEPENDENCIES) 
+	@rm -f ul$(EXEEXT)
+	$(LINK) $(ul_LDFLAGS) $(ul_OBJECTS) $(ul_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/col.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colcrt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colrm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/column.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hexdump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hexsyntax.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/more.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/odsyntax.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tailf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ul.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$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) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man1dir)"; 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)
+
+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-libtool \
+	clean-usrbinPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man install-usrbinPROGRAMS
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man: install-man1
+
+installcheck-am: installcheck-binPROGRAMS installcheck-usrbinPROGRAMS
+
+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 \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+	uninstall-usrbinPROGRAMS
+
+uninstall-man: uninstall-man1
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-usrbinPROGRAMS ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-man1 \
+	install-strip install-usrbinPROGRAMS installcheck \
+	installcheck-am installcheck-binPROGRAMS \
+	installcheck-usrbinPROGRAMS installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-info-am uninstall-man uninstall-man1 \
+	uninstall-usrbinPROGRAMS
+
+# 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 --git a/text-utils/more.1 b/text-utils/more.1
index 0142d8ce4..145cba01b 100644
--- a/text-utils/more.1
+++ b/text-utils/more.1
@@ -53,7 +53,7 @@
 .Sh DESCRIPTION
 .Nm More
 is a filter for paging through text one screenful at a time.  This version
-is especially primitve.  Users should realize that
+is especially primitive.  Users should realize that
 .Xr less 1
 provides
 .Xr more 1
diff --git a/text-utils/more.c b/text-utils/more.c
index 5b2f5733b..2b4fceb92 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -165,17 +165,12 @@ struct {
 } context, screen_start;
 extern char	PC;		/* pad character */
 
-#ifndef HAVE_termcap
-#define USE_CURSES
-#endif
-
-#ifdef USE_CURSES
-
-#if NCH
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
-#else
-#include <curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
 #endif
+
 #include <term.h>			/* include after <curses.h> */
 
 static void
@@ -208,46 +203,6 @@ my_tgoto(const char *cap, int col, int row) {
      return tparm(cap, col, row);
 }
 
-#else /* no CURSES */
-#include <termcap.h>
-
-char termbuffer[4096];
-char tcbuffer[4096];
-char *strbuf = termbuffer;
-
-static void
-my_putstring(char *s) {
-     tputs (s, 1, putchar);
-}
-
-static void
-my_setupterm(const char *term, int fildes, int *errret) {
-     *errret = tgetent(tcbuffer, term);
-}
-
-static int
-my_tgetnum(char *s, char *ss) {
-     return tgetnum(s);
-}
-
-static int
-my_tgetflag(char *s, char *ss) {
-     return tgetflag(s);
-}
-
-static char *
-my_tgetstr(char *s, char *ss) {
-     return tgetstr(s, &strbuf);
-}
-
-static char *
-my_tgoto(const char *cap, int col, int row) {
-     return tgoto(cap, col, row);
-}
-
-
-#endif /* USE_CURSES */
-
 static void
 idummy(int *kk) {}
 
diff --git a/text-utils/pg.1 b/text-utils/pg.1
index 056be06cf..acb5aa74c 100644
--- a/text-utils/pg.1
+++ b/text-utils/pg.1
@@ -76,7 +76,7 @@ If
 .I string
 contains
 .I %d
-, its first occurence is replaced by the number of the current page.
+, its first occurrence is replaced by the number of the current page.
 .TP
 .B \-r
 Disallow the shell escape.
@@ -95,7 +95,7 @@ Start at the line containing the Basic Regular Expression
 .I pattern
 given.
 .SH USAGE
-The following commands may be entered at the prompt. Commands preceeded by
+The following commands may be entered at the prompt. Commands preceded by
 .I i
 in this document accept a number as argument, positive or negative.
 If this argument starts with
@@ -137,7 +137,7 @@ Advance to the last line of the input file.
 .TP
 .IB i / pattern /
 Search forward until the first or the \fIi\fR-th
-occurence of the Basic Regular Expression 
+occurrence of the Basic Regular Expression 
 .I pattern
 is found. The search starts
 after the current page and stops at the end of the file. No wrap-around is
@@ -147,7 +147,7 @@ must be a positive number.
 .TP
 \fIi\fR\fB?\fR\fIpattern\fR\fB?\fR or \fIi\fR\fB^\fR\fIpattern\fR\fB^\fR
 Search backward until the first or the \fIi\fR-th
-occurence of the Basic Regular Expression
+occurrence of the Basic Regular Expression
 .I pattern
 is found. The search starts
 before the current page and stops at the beginning of the file.
diff --git a/text-utils/pg.c b/text-utils/pg.c
index a595fa448..eac12756c 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -31,15 +31,6 @@
 
 /* Sccsid @(#)pg.c 1.44 (gritter) 2/8/02 - modified for util-linux */
 
-/*
- * #define _XOPEN_SOURCE  500L
- *
- * Adding this define gives us the correct prototypes for fseeko, ftello,
- * but (for some glibc versions) conflicting prototype for wcwidth.
- * So, avoid defining _XOPEN_SOURCE, and give prototypes for fseeko, ftello
- * by hand.
- */
-
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -61,16 +52,17 @@
 #include <locale.h>
 #include <nl_types.h>
 #include <libgen.h>
-#if NCH
+
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
-#else
-#include <curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
 #endif
+
 #include <term.h>
 
 #include "nls.h"
 #include "widechar.h"
-#include "../defines.h"		/* for HAVE_fseeko */
 
 #define	READBUF		LINE_MAX	/* size of input buffer */
 #define CMDBUF		255		/* size of command buffer */
@@ -176,23 +168,11 @@ Many commands accept preceding numbers, for example:\n\
 See pg(1) for more information.\n\
 -------------------------------------------------------\n";
 
-#ifdef HAVE_fseeko
-#if defined (_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS) == 64
-  extern int fseeko64(FILE *f, off_t off, int whence);
-  extern off_t ftello64(FILE *f);
-  #define      my_fseeko       fseeko64
-  #define      my_ftello       ftello64
-#else
-  extern int fseeko(FILE *f, off_t off, int whence);
-  extern off_t ftello(FILE *f);
-  #define	my_fseeko	fseeko
-  #define	my_ftello	ftello
-#endif
-#else
-  static int my_fseeko(FILE *f, off_t off, int whence) {
+#ifndef HAVE_FSEEKO
+  static int fseeko(FILE *f, off_t off, int whence) {
 	return fseek(f, (long) off, whence);
   }
-  static off_t my_ftello(FILE *f) {
+  static off_t ftello(FILE *f) {
 	return (off_t) ftell(f);
   }
 #endif
@@ -599,10 +579,10 @@ getstate(int c)
 	case 'm': case 'b': case 't':
 		return ADDON_FIN;
 	default:
-#ifndef	PGNOBELL
+#ifdef PG_BELL
 		if (bell)
 			tputs(bell, 1, outcap);
-#endif	/* PGNOBELL */
+#endif  /*  PG_BELL  */
 		return INVALID;
 	}
 }
@@ -1042,7 +1022,7 @@ pgfile(FILE *f, char *name)
 		}
 		return;
 	}
-	if ((fpos = my_fseeko(f, (off_t)0, SEEK_SET)) == -1)
+	if ((fpos = fseeko(f, (off_t)0, SEEK_SET)) == -1)
 		fbuf = tmpfile();
 	else {
 		fbuf = f;
@@ -1072,36 +1052,36 @@ pgfile(FILE *f, char *name)
 		 * Get a line from input file or buffer.
 		 */
 		if (line < bline) {
-			my_fseeko(find, line * sizeof pos, SEEK_SET);
+			fseeko(find, line * sizeof pos, SEEK_SET);
 			if (fread(&pos, sizeof pos, 1, find) == 0)
 				tmperr(find, "index");
-			my_fseeko(find, (off_t)0, SEEK_END);
-			my_fseeko(fbuf, pos, SEEK_SET);
+			fseeko(find, (off_t)0, SEEK_END);
+			fseeko(fbuf, pos, SEEK_SET);
 			if (fgets(b, READBUF, fbuf) == NULL)
 				tmperr(fbuf, "buffer");
 		} else if (eofline == 0) {
-			my_fseeko(find, (off_t)0, SEEK_END);
+			fseeko(find, (off_t)0, SEEK_END);
 			do {
 				if (!nobuf)
-					my_fseeko(fbuf, (off_t)0, SEEK_END);
-				pos = my_ftello(fbuf);
+					fseeko(fbuf, (off_t)0, SEEK_END);
+				pos = ftello(fbuf);
 				if ((sig = setjmp(jmpenv)) != 0) {
 					/*
 					 * We got a signal.
 					 */
 					canjump = 0;
 					my_sigrelse(sig);
-					my_fseeko(fbuf, pos, SEEK_SET);
+					fseeko(fbuf, pos, SEEK_SET);
 					*b = '\0';
 					dline = pagelen;
 					break;
 				} else {
 					if (nobuf)
-						my_fseeko(f, fpos, SEEK_SET);
+						fseeko(f, fpos, SEEK_SET);
 					canjump = 1;
 					p = fgets(b, READBUF, f);
 					if (nobuf)
-						if ((fpos = my_ftello(f)) == -1)
+						if ((fpos = ftello(f)) == -1)
 							pgerror(errno, name);
 					canjump = 0;
 				}
@@ -1276,12 +1256,12 @@ newcmd:
 				if (line <= 0)
 					goto notfound_bw;
 				while (line) {
-					my_fseeko(find, --line * sizeof pos,
+					fseeko(find, --line * sizeof pos,
 							SEEK_SET);
 					if(fread(&pos, sizeof pos, 1,find)==0)
 						tmperr(find, "index");
-					my_fseeko(find, (off_t)0, SEEK_END);
-					my_fseeko(fbuf, pos, SEEK_SET);
+					fseeko(find, (off_t)0, SEEK_END);
+					fseeko(fbuf, pos, SEEK_SET);
 					if (fgets(b, READBUF, fbuf) == NULL)
 						tmperr(fbuf, "buffer");
 					colb(b);
@@ -1334,11 +1314,11 @@ found_bw:
 				/*
 				 * Advance to EOF.
 				 */
-				my_fseeko(find, (off_t)0, SEEK_END);
+				fseeko(find, (off_t)0, SEEK_END);
 				for (;;) {
 					if (!nobuf)
-						my_fseeko(fbuf,(off_t)0,SEEK_END);
-					pos = my_ftello(fbuf);
+						fseeko(fbuf,(off_t)0,SEEK_END);
+					pos = ftello(fbuf);
 					if (fgets(b, READBUF, f) == NULL) {
 						eofline = fline;
 						break;
@@ -1363,7 +1343,7 @@ found_bw:
 					fline++;
 					bline++;
 				}
-				my_fseeko(fbuf, (off_t)0, SEEK_SET);
+				fseeko(fbuf, (off_t)0, SEEK_SET);
 				while ((sz = fread(b, sizeof *b, READBUF,
 							fbuf)) != 0) {
 					/*
@@ -1372,7 +1352,7 @@ found_bw:
 					fwrite(b, sizeof *b, sz, save);
 				}
 				fclose(save);
-				my_fseeko(fbuf, (off_t)0, SEEK_END);
+				fseeko(fbuf, (off_t)0, SEEK_END);
 				mesg(_("saved"));
 				goto newcmd;
 			case 'l':